(no commit message)

[utils] / system / spring / src / test / java / org / wamblee / system / spring / SpringComponentTest.java

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 97e0417e9ec9f7db9a6d55455c2cae9b28d1b790..43902d430c12f8130321bebf5eeb2a30d6f808fb 100644 (file)
--- 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 {
 
@@ -46,8 +46,8 @@ public class SpringComponentTest extends TestCase {
                                new String[] { HELLO_SERVICE_SPRING_XML },
                                new HashMap<String, ProvidedInterface>(),
                                new HashMap<RequiredInterface, String>());
-               system.start("Hello");
-               ProvidedInterface[] services = system.getRunningServices();
+               system.start();
+               ProvidedInterface[] services = system.getRunningInterfaces();
                assertEquals(0, services.length);
                
                system.stop();
@@ -61,8 +61,8 @@ public class SpringComponentTest extends TestCase {
                SpringComponent system = new SpringComponent("system", 
                                new String[] { HELLO_SERVICE_SPRING_XML }, provided,
                                new HashMap<RequiredInterface, String>());
-               system.start("Hello");
-               ProvidedInterface[] services = system.getRunningServices();
+               system.start();
+               ProvidedInterface[] services = system.getRunningInterfaces();
                assertEquals(1, services.length);
                assertTrue(services[0].getImplementation() instanceof HelloService);
                assertEquals("Hello world!", ((HelloService)services[0].getImplementation())
@@ -82,8 +82,8 @@ public class SpringComponentTest extends TestCase {
                props.load(new ClassPathResource(PROPERTY_FILE).getInputStream());
                system.addProperties(props);
                
-               system.start("Hello");
-               ProvidedInterface[] services = system.getRunningServices();
+               system.start();
+               ProvidedInterface[] services = system.getRunningInterfaces();
                assertEquals("Property Value", 
                                ((HelloService)services[0].getImplementation()).say());
        }
@@ -94,7 +94,7 @@ public class SpringComponentTest extends TestCase {
                                        new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML },
                                        new HashMap<String, ProvidedInterface>(),
                                        new HashMap<RequiredInterface, String>());
-                       system.start("Bla");
+                       system.start();
                } catch (SystemAssemblyException e) {
                        //e.printStackTrace();
                        return;
@@ -113,9 +113,9 @@ 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("Bla");
+               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.start("Bla");
-               ProvidedInterface started = system.getProvidedServices()[0];
+               system.getRequiredInterfaces()[0].setProvider(helloService);
+               system.start();
+               ProvidedInterface started = system.getProvidedInterfaces()[0];
                
            assertNotNull(started.getImplementation());
            assertTrue(started.getImplementation() instanceof BlaService);