onami-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marcospera...@apache.org
Subject svn commit: r1428009 - in /incubator/onami/trunk/test: ./ src/main/java/org/apache/onami/test/mock/framework/ src/test/java/org/apache/onami/test/ src/test/java/org/apache/onami/test/data/ src/test/java/org/apache/onami/test/guice/
Date Wed, 02 Jan 2013 20:37:12 GMT
Author: marcosperanza
Date: Wed Jan  2 20:37:11 2013
New Revision: 1428009

URL: http://svn.apache.org/viewvc?rev=1428009&view=rev
Log:
[ONAMI-32] Upgrade dependency EasyMock-classextention 2.1 to EasyMock 3.1

Fixed deprecation warning.

Modified:
    incubator/onami/trunk/test/pom.xml
    incubator/onami/trunk/test/src/main/java/org/apache/onami/test/mock/framework/EasyMockFramework.java
    incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractMockTestCase.java
    incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java
    incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java
    incubator/onami/trunk/test/src/test/java/org/apache/onami/test/data/ServiceMockProvider.java
    incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java
    incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java

Modified: incubator/onami/trunk/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/pom.xml?rev=1428009&r1=1428008&r2=1428009&view=diff
==============================================================================
--- incubator/onami/trunk/test/pom.xml (original)
+++ incubator/onami/trunk/test/pom.xml Wed Jan  2 20:37:11 2013
@@ -81,8 +81,8 @@
 
     <dependency>
       <groupId>org.easymock</groupId>
-      <artifactId>easymockclassextension</artifactId>
-      <version>2.4</version>
+      <artifactId>easymock</artifactId>
+      <version>3.1</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

Modified: incubator/onami/trunk/test/src/main/java/org/apache/onami/test/mock/framework/EasyMockFramework.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/main/java/org/apache/onami/test/mock/framework/EasyMockFramework.java?rev=1428009&r1=1428008&r2=1428009&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/main/java/org/apache/onami/test/mock/framework/EasyMockFramework.java
(original)
+++ incubator/onami/trunk/test/src/main/java/org/apache/onami/test/mock/framework/EasyMockFramework.java
Wed Jan  2 20:37:11 2013
@@ -21,7 +21,7 @@ package org.apache.onami.test.mock.frame
 
 import org.apache.onami.test.annotation.MockObjType;
 import org.apache.onami.test.mock.MockEngine;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 
 /**
  * Specifies the Easy-Mock Framework.

Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractMockTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractMockTestCase.java?rev=1428009&r1=1428008&r2=1428009&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractMockTestCase.java
(original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/AbstractMockTestCase.java
Wed Jan  2 20:37:11 2013
@@ -21,7 +21,7 @@ package org.apache.onami.test;
 
 import org.apache.onami.test.annotation.Mock;
 import org.apache.onami.test.data.Service;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 
 abstract public class AbstractMockTestCase
     extends AbstractEmptyTestCase

Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java?rev=1428009&r1=1428008&r2=1428009&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java
(original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectDependingMockObjectTestCase.java
Wed Jan  2 20:37:11 2013
@@ -26,7 +26,7 @@ import org.apache.onami.test.OnamiRunner
 import org.apache.onami.test.annotation.Mock;
 import org.apache.onami.test.data.HelloWorld;
 import org.apache.onami.test.data.Service;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java?rev=1428009&r1=1428008&r2=1428009&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java
(original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/InjectMockObjectTestCase.java
Wed Jan  2 20:37:11 2013
@@ -25,7 +25,7 @@ import org.apache.onami.test.annotation.
 import org.apache.onami.test.data.HelloWorld;
 import org.apache.onami.test.data.SimpleModule;
 import org.apache.onami.test.data.TelephonService;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/data/ServiceMockProvider.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/data/ServiceMockProvider.java?rev=1428009&r1=1428008&r2=1428009&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/data/ServiceMockProvider.java
(original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/data/ServiceMockProvider.java
Wed Jan  2 20:37:11 2013
@@ -19,7 +19,7 @@ package org.apache.onami.test.data;
  * under the License.
  */
 
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 
 public class ServiceMockProvider
 {

Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java?rev=1428009&r1=1428008&r2=1428009&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java
(original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/MockAnnotatedWithTestCase.java
Wed Jan  2 20:37:11 2013
@@ -24,7 +24,7 @@ import org.apache.onami.test.annotation.
 import org.apache.onami.test.data.HelloWordAnnotated;
 import org.apache.onami.test.data.Service;
 import org.apache.onami.test.data.TestAnnotation;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java?rev=1428009&r1=1428008&r2=1428009&view=diff
==============================================================================
--- incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java
(original)
+++ incubator/onami/trunk/test/src/test/java/org/apache/onami/test/guice/TestCustomInjectionTest.java
Wed Jan  2 20:37:11 2013
@@ -26,7 +26,7 @@ import org.apache.onami.test.data.HelloW
 import org.apache.onami.test.data.Service;
 import org.apache.onami.test.data.ServiceModule;
 import org.apache.onami.test.data.TelephonService;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;



Mime
View raw message