X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcontainer%2FContainerTest.java;h=a7589fe46250eff9561c11ec987e1a52071e0f56;hb=e1975449f1bf16ccb441632d68e440f3e3704a79;hp=e61c023ca0e35ae66908b04259a0d99bee520a28;hpb=2d4a478a1f03e7e8c4a3c10a96a8f83c2ee570ea;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java b/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
index e61c023c..a7589fe4 100644
--- a/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
+++ b/system/general/src/test/java/org/wamblee/system/container/ContainerTest.java
@@ -21,9 +21,6 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.easymock.classextension.ConstructorArgs;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
 import org.wamblee.general.Pair;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.DefaultProvidedInterface;
@@ -36,7 +33,6 @@ import org.wamblee.system.core.Scope;
 import org.wamblee.system.core.StringComponent;
 import org.wamblee.system.core.SystemAssemblyException;
 import org.wamblee.test.AssertionUtils;
-import org.wamblee.test.EasyMockMatchers;
 import org.wamblee.test.EventTracker;
 
 public class ContainerTest extends TestCase {
@@ -280,17 +276,14 @@ public class ContainerTest extends TestCase {
 
 	public void testEnvironmentApplicationRollbackOnException()
 			throws Exception {
-		IMocksControl control = EasyMock.createStrictControl();
-
 		Environment environment = new Environment(_tracker);
-		Application application = control.createMock(Application.class,
-				new ConstructorArgs(Application.class.getConstructor()),
-				Application.class.getDeclaredMethod("doStart", Scope.class));
-
-		application.doStart(EasyMockMatchers.anyObject(Scope.class));
-		EasyMock.expectLastCall().andThrow(new RuntimeException());
-		control.replay();
-
+		Application application = new Application() { 
+			@Override
+			public Object doStart(Scope aScope) {
+				throw new RuntimeException();
+			}
+		};
+		
 		try {
 			Container container = new Container("root", new Component[] {
 					environment, application }, new ProvidedInterface[0],
@@ -308,27 +301,22 @@ public class ContainerTest extends TestCase {
 
 	public void testEnvironmentApplicationRollbackOnExceptionWithExceptionOnStop()
 			throws Exception {
-		IMocksControl control = EasyMock.createControl();
 
 		Environment environment = new Environment(_tracker);
 		// Application 1 will throw an exception while stopping.
-		Application application1 = control.createMock(Application.class,
-				new ConstructorArgs(Application.class.getConstructor()),
-				Application.class.getDeclaredMethod("doStop", Object.class));
-
-		application1.doStop(EasyMock.anyObject());
-		EasyMock.expectLastCall().andThrow(new RuntimeException());
+		Application application1 = new Application("app1")  {
+			@Override
+			public void doStop(Object aRuntime) {
+				throw new RuntimeException();
+			}
+		};
 
 		// application 2 will throw an exception while starting
-		Application application2 = control.createMock(Application.class,
-				new ConstructorArgs(Application.class
-						.getConstructor(String.class), "application2"),
-				Application.class.getDeclaredMethod("doStart", Scope.class));
-
-		application2.doStart(EasyMockMatchers.anyObject(Scope.class));
-		EasyMock.expectLastCall().andThrow(new RuntimeException());
-
-		control.replay();
+		Application application2 = new Application("app2") {
+			public Object doStart(Scope aScope) { 
+				throw new RuntimeException();
+			}
+		};
 
 		try {
 			Container container = new Container("root", new Component[] {