X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2FSystemAssemblerTest.java;h=d862b15e3eb4d08fbe2f1a64b89ebc60fa7b8425;hb=98856488516fbc8ba95bf0fd2fb739575da9ac5a;hp=c372bf045b13c236f7923c25f6afd4525ee02dae;hpb=0af4854898104bd6322c0f22feb6dc285859f420;p=utils diff --git a/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java b/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java index c372bf04..d862b15e 100644 --- a/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java +++ b/system/general/src/test/java/org/wamblee/system/SystemAssemblerTest.java @@ -11,12 +11,9 @@ import junit.framework.TestCase; public class SystemAssemblerTest extends TestCase { - private ServiceRegistry _registry; - @Override protected void setUp() throws Exception { super.setUp(); - _registry = new DefaultServiceRegistry(); } private static class MyMultiple implements Serializable, Runnable { @@ -27,69 +24,61 @@ public class SystemAssemblerTest extends TestCase { } public void testFilterProvided() { - RequiredInterface req1 = new DefaultRequiredInterfaceDescriptor( - "name", Runnable.class); - RequiredInterface req2 = new DefaultRequiredInterfaceDescriptor( - "name", Serializable.class); - ProvidedInterface prov1 = new DefaultProvidedInterfaceDescriptor( + RequiredInterface req1 = new DefaultRequiredInterface("name", + Runnable.class); + RequiredInterface req2 = new DefaultRequiredInterface("name", + Serializable.class); + ProvidedInterface prov1 = new DefaultProvidedInterface( "name", Runnable.class); - ProvidedInterface prov2 = new DefaultProvidedInterfaceDescriptor( + ProvidedInterface prov2 = new DefaultProvidedInterface( "name", Serializable.class); - ProvidedInterface prov3 = new DefaultProvidedInterfaceDescriptor( + ProvidedInterface prov3 = new DefaultProvidedInterface( "name", MyMultiple.class); AssertionUtils.assertEquals(new RequiredInterface[] { req1 }, SystemAssembler.filterRequiredServices(prov1, Arrays .asList(new RequiredInterface[] { req1 }))); AssertionUtils.assertEquals(new RequiredInterface[] { req1 }, - SystemAssembler.filterRequiredServices(prov1, - Arrays.asList(new RequiredInterface[] { req1, - req2 }))); - AssertionUtils.assertEquals(new RequiredInterface[] { req1, - req2 }, SystemAssembler.filterRequiredServices(prov3, Arrays - .asList(new RequiredInterface[] { req1, req2 }))); - - AssertionUtils.assertEquals( - new ProvidedInterface[] { prov1 }, + SystemAssembler.filterRequiredServices(prov1, Arrays + .asList(new RequiredInterface[] { req1, req2 }))); + AssertionUtils.assertEquals(new RequiredInterface[] { req1, req2 }, + SystemAssembler.filterRequiredServices(prov3, Arrays + .asList(new RequiredInterface[] { req1, req2 }))); + + AssertionUtils.assertEquals(new ProvidedInterface[] { prov1 }, SystemAssembler.filterProvidedServices(req1, Arrays .asList(new ProvidedInterface[] { prov1 }))); - AssertionUtils.assertEquals( - new ProvidedInterface[] { prov1 }, SystemAssembler - .filterProvidedServices(req1, Arrays - .asList(new ProvidedInterface[] { - prov1, prov2 }))); - AssertionUtils.assertEquals(new ProvidedInterface[] { prov1, - prov3 }, SystemAssembler.filterProvidedServices(req1, Arrays - .asList(new ProvidedInterface[] { prov1, prov3 }))); + AssertionUtils.assertEquals(new ProvidedInterface[] { prov1 }, + SystemAssembler.filterProvidedServices(req1, Arrays + .asList(new ProvidedInterface[] { prov1, prov2 }))); + AssertionUtils.assertEquals(new ProvidedInterface[] { prov1, prov3 }, + SystemAssembler.filterProvidedServices(req1, Arrays + .asList(new ProvidedInterface[] { prov1, prov3 }))); } public void testEnvironmentApplication() { - Component environment = new Environment(_registry); - Component application = new Application(_registry); + Component environment = new Environment(); + Component application = new Application(); SystemAssembler assembler = new SystemAssembler(new Component[] { environment, application }, new ProvidedInterface[0]); - assembler.start(_registry, new Service[0]); - Service[] envServices = environment.getRunningServices(); + assembler.start(); + ProvidedInterface[] envServices = environment.getRunningServices(); assertEquals(2, envServices.length); - Service[] appServices = environment.getRunningServices(); + ProvidedInterface[] appServices = environment.getRunningServices(); assertEquals(2, appServices.length); - assertEquals(2, _registry.listAllServices().length); + // TODO test stopping!!!!!! environment.stop(); - assertEquals(0, _registry.listAllServices().length); - application.stop(); - assertEquals(0, _registry.listAllServices().length); } public void testApplicationEnvironment() { try { - Component environment = new Environment(_registry); - Component application = new Application(_registry); + Component environment = new Environment(); + Component application = new Application(); SystemAssembler assembler = new SystemAssembler(new Component[] { - application, environment }, - new ProvidedInterface[0]); - assembler.start(_registry, new Service[0]); + application, environment }, new ProvidedInterface[0]); + assembler.start(); } catch (SystemAssemblyException e) { // e.printStackTrace(); return; @@ -98,15 +87,15 @@ public class SystemAssemblerTest extends TestCase { } public void testComposite() { - Component environment = new Environment(_registry); - Component application = new Application(_registry); + Component environment = new Environment(); + Component application = new Application(); assertEquals(Status.NOT_STARTED, environment.getStatus()); assertEquals(Status.NOT_STARTED, application.getStatus()); - Container system = new Container("all", _registry, new Component[] { - environment, application }, new ProvidedInterface[0], + Container system = new Container("all", new Component[] { environment, + application }, new ProvidedInterface[0], new RequiredInterface[0]); assertEquals(Status.NOT_STARTED, system.getStatus()); - system.start("root", new Service[0]); + system.start("root"); RequiredInterface[] required = system.getRequiredServices(); assertEquals(0, required.length); ProvidedInterface[] provided = system.getProvidedServices(); @@ -123,15 +112,31 @@ public class SystemAssemblerTest extends TestCase { public void testCompositeWithWrongProvidedInfo() { try { - Component environment = new Environment(_registry); - Component application = new Application(_registry); + Component environment = new Environment(); + Component application = new Application(); Container system = new Container( "all", - _registry, new Component[] { environment, application }, - new ProvidedInterface[] { new DefaultProvidedInterfaceDescriptor( + new ProvidedInterface[] { new DefaultProvidedInterface( "string", String.class) }, - new DefaultRequiredInterfaceDescriptor[0]); + new DefaultRequiredInterface[0]); + } catch (SystemAssemblyException e) { + return; + } + fail(); + } + + public void testCompositeRequiredInterfaceNotProvided() { + try { + Component environment = new Environment(); + Component application = new Application(); + Container system = new Container( + "all", + new Component[] { environment, application }, + new ProvidedInterface[0], + new RequiredInterface[] { new DefaultRequiredInterface( + "string", String.class) }); + system.start("root"); } catch (SystemAssemblyException e) { return; } @@ -139,16 +144,17 @@ public class SystemAssemblerTest extends TestCase { } public void testCompositeWithSuperfluousRequiredInfo() { - Component environment = new Environment(_registry); - Component application = new Application(_registry); + Component environment = new Environment(); + Component application = new Application(); Container system = new Container( "all", - _registry, new Component[] { environment, application }, new ProvidedInterface[0], - new RequiredInterface[] { new DefaultRequiredInterfaceDescriptor( + new RequiredInterface[] { new DefaultRequiredInterface( "string", String.class) }); - system.start("root", new Service[0]); + system.getRequiredServices()[0].setProvider( + new DefaultProvidedInterface("hallo", String.class)); + system.start("root"); RequiredInterface[] required = system.getRequiredServices(); assertEquals(1, required.length); ProvidedInterface[] provided = system.getProvidedServices(); @@ -157,13 +163,12 @@ public class SystemAssemblerTest extends TestCase { public void testCompositeWithExternalDependencesNotProvided() { try { - Component environment = new Environment(_registry); - Component application = new Application(_registry); - Container system = new Container("all", _registry, - new Component[] { application }, - new ProvidedInterface[0], application - .getRequiredServices()); - system.start("root", new Service[0]); + Component environment = new Environment(); + Component application = new Application(); + Container system = new Container("all", + new Component[] { application }, new ProvidedInterface[0], + application.getRequiredServices()); + system.start("root"); } catch (SystemAssemblyException e) { return; } @@ -173,14 +178,16 @@ public class SystemAssemblerTest extends TestCase { public void testCompositeWithExternalDependencesProvided() { - Component environment = new Environment(_registry); - Component application = new Application(_registry); - Container system = new Container("all", _registry, - new Component[] { application }, - new ProvidedInterface[0], application - .getRequiredServices()); - Service[] envServices = environment.start("env", new Service[0]); - system.start("root", envServices); + Component environment = new Environment(); + Component application = new Application(); + Container system = new Container("all", + new Component[] { application }, new ProvidedInterface[0], + application.getRequiredServices()); + environment.start("env"); + system.getRequiredServices()[0].setProvider(environment.getProvidedServices()[0]); + system.getRequiredServices()[1].setProvider(environment.getProvidedServices()[1]); + + system.start("root"); RequiredInterface[] required = system.getRequiredServices(); assertEquals(2, required.length); ProvidedInterface[] provided = system.getProvidedServices(); @@ -190,13 +197,13 @@ public class SystemAssemblerTest extends TestCase { public void testAmbiguousInterfaces() { try { - Component environment1 = new Environment(_registry); - Component environment2 = new Environment(_registry); - Component application = new Application(_registry); + Component environment1 = new Environment(); + Component environment2 = new Environment(); + Component application = new Application(); SystemAssembler assembler = new SystemAssembler(new Component[] { environment1, environment2, application }, new ProvidedInterface[0]); - assembler.start(_registry, new Service[0]); + assembler.start(); } catch (SystemAssemblyException e) { return; @@ -206,12 +213,11 @@ public class SystemAssemblerTest extends TestCase { public void testIncompleteRequirements() { try { - Component application = new Application(_registry); - Container system = new Container("all", _registry, - new Component[] { application }, - new ProvidedInterface[0], + Component application = new Application(); + Container system = new Container("all", + new Component[] { application }, new ProvidedInterface[0], new RequiredInterface[0]); - system.start("root", new Service[0]); + system.start("root"); } catch (SystemAssemblyException e) { return; }