X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fspring%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2FSpringComponentTest.java;h=43902d430c12f8130321bebf5eeb2a30d6f808fb;hb=d89a08c127770dfe9b25e88495c7545bbcc938fa;hp=72912fe9fa32e9b68a1244e70341f2a6cada7933;hpb=963892fd6b2c913c413eff7d86822417af563465;p=utils

diff --git a/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java b/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java
index 72912fe9..43902d43 100644
--- a/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java
+++ b/system/spring/src/test/java/org/wamblee/system/spring/SpringComponentTest.java
@@ -23,11 +23,11 @@ import java.util.Properties;
 import junit.framework.TestCase;
 
 import org.wamblee.io.ClassPathResource;
-import org.wamblee.system.DefaultProvidedInterface;
-import org.wamblee.system.DefaultRequiredInterface;
-import org.wamblee.system.ProvidedInterface;
-import org.wamblee.system.RequiredInterface;
-import org.wamblee.system.SystemAssemblyException;
+import org.wamblee.system.core.DefaultProvidedInterface;
+import org.wamblee.system.core.DefaultRequiredInterface;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.SystemAssemblyException;
 
 public class SpringComponentTest extends TestCase {
 
@@ -47,7 +47,7 @@ public class SpringComponentTest extends TestCase {
 				new HashMap<String, ProvidedInterface>(),
 				new HashMap<RequiredInterface, String>());
 		system.start();
-		ProvidedInterface[] services = system.getRunningServices();
+		ProvidedInterface[] services = system.getRunningInterfaces();
 		assertEquals(0, services.length);
 		
 		system.stop();
@@ -62,7 +62,7 @@ public class SpringComponentTest extends TestCase {
 				new String[] { HELLO_SERVICE_SPRING_XML }, provided,
 				new HashMap<RequiredInterface, String>());
 		system.start();
-		ProvidedInterface[] services = system.getRunningServices();
+		ProvidedInterface[] services = system.getRunningInterfaces();
 		assertEquals(1, services.length);
 		assertTrue(services[0].getImplementation() instanceof HelloService);
 		assertEquals("Hello world!", ((HelloService)services[0].getImplementation())
@@ -83,7 +83,7 @@ public class SpringComponentTest extends TestCase {
 		system.addProperties(props);
 		
 		system.start();
-		ProvidedInterface[] services = system.getRunningServices();
+		ProvidedInterface[] services = system.getRunningInterfaces();
 		assertEquals("Property Value", 
 				((HelloService)services[0].getImplementation()).say());
 	}
@@ -113,7 +113,7 @@ public class SpringComponentTest extends TestCase {
 		HelloService helloObject = new HelloService("ladida"); 
 		ProvidedInterface helloService = new DefaultProvidedInterface("hello", HelloService.class);
 		helloService.publish(helloObject);
-		system.getRequiredServices()[0].setProvider(helloService);
+		system.getRequiredInterfaces()[0].setProvider(helloService);
 		
 		system.start();
 		system.stop();
@@ -135,9 +135,9 @@ public class SpringComponentTest extends TestCase {
 		ProvidedInterface helloService = 
 			new DefaultProvidedInterface("hello", HelloService.class);
 		helloService.publish(helloObject);
-		system.getRequiredServices()[0].setProvider(helloService);
+		system.getRequiredInterfaces()[0].setProvider(helloService);
 		system.start();
-		ProvidedInterface started = system.getProvidedServices()[0];
+		ProvidedInterface started = system.getProvidedInterfaces()[0];
 		
 	    assertNotNull(started.getImplementation());
 	    assertTrue(started.getImplementation() instanceof BlaService);