X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fspring%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2FSpringComponentTest.java;h=c63916f5d68946a6c3d0baa5a004d11b8d3322b8;hb=7273d083a2f03cd3d2061d3c6628a46b679e718b;hp=b0f7f8abd82734244288475825599f7c98523a90;hpb=0af4854898104bd6322c0f22feb6dc285859f420;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 b0f7f8ab..c63916f5 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 @@ -1,3 +1,18 @@ +/* + * Copyright 2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.wamblee.system.spring; import java.io.IOException; @@ -8,85 +23,79 @@ import java.util.Properties; import junit.framework.TestCase; import org.wamblee.io.ClassPathResource; -import org.wamblee.system.DefaultProvidedInterfaceDescriptor; -import org.wamblee.system.DefaultRequiredInterfaceDescriptor; -import org.wamblee.system.DefaultServiceRegistry; -import org.wamblee.system.ProvidedInterface; -import org.wamblee.system.RequiredInterface; -import org.wamblee.system.Service; -import org.wamblee.system.ServiceRegistry; -import org.wamblee.system.SystemAssemblyException; +import org.wamblee.system.core.DefaultProvidedInterface; +import org.wamblee.system.core.DefaultRequiredInterface; +import org.wamblee.system.core.DefaultScope; +import org.wamblee.system.core.ProvidedInterface; +import org.wamblee.system.core.RequiredInterface; +import org.wamblee.system.core.Scope; +import org.wamblee.system.core.SystemAssemblyException; public class SpringComponentTest extends TestCase { private static final String HELLO_SERVICE_SPRING_XML = "test.org.wamblee.system.spring.xml"; private static final String HELLO_SERVICE_SPRING_WITH_REQS_XML = "test.org.wamblee.system.springWithRequirements.xml"; private static final String HELLO_SERVICE_SPRING_WITH_PROPERTIES_XML = "test.org.wamblee.system.springWithProperties.xml"; - private static final String PROPERTY_FILE = "test.org.wamblee.system.spring.properties"; - - private ServiceRegistry _registry; + private static final String PROPERTY_FILE = "test.org.wamblee.system.spring.properties"; @Override protected void setUp() throws Exception { super.setUp(); - _registry = new DefaultServiceRegistry(); } public void testBlackboxSystem() { - SpringComponent system = new SpringComponent("system", _registry, + SpringComponent system = new SpringComponent("system", new String[] { HELLO_SERVICE_SPRING_XML }, new HashMap(), new HashMap()); - system.start("Hello", new Service[0]); - Service[] services = system.getRunningServices(); - assertEquals(0, services.length); - - system.stop(); + Scope runtime = system.start(); + assertEquals(0, runtime.getProvidedInterfaces().length); + + system.stop(runtime); } public void testOneProvidedService() { Map provided = new HashMap(); - provided.put("helloService", new DefaultProvidedInterfaceDescriptor( - "hello", HelloService.class)); + provided.put("helloService", new DefaultProvidedInterface("hello", + HelloService.class)); - SpringComponent system = new SpringComponent("system", _registry, + SpringComponent system = new SpringComponent("system", new String[] { HELLO_SERVICE_SPRING_XML }, provided, new HashMap()); - system.start("Hello", new Service[0]); - Service[] services = system.getRunningServices(); + Scope runtime = system.start(); + ProvidedInterface[] services = runtime.getProvidedInterfaces(); assertEquals(1, services.length); - assertTrue(services[0].reference(HelloService.class) instanceof HelloService); - assertEquals("Hello world!", services[0].reference(HelloService.class) - .say()); - system.stop(); + Object service = runtime.getInterfaceImplementation(services[0], Object.class); + assertTrue(service instanceof HelloService); + assertEquals("Hello world!", ((HelloService) service).say()); + system.stop(runtime); } - + public void testWithProperties() throws IOException { Map provided = new HashMap(); - provided.put("helloService", new DefaultProvidedInterfaceDescriptor( - "hello", HelloService.class)); - SpringComponent system = new SpringComponent("system", _registry, + provided.put("helloService", new DefaultProvidedInterface("hello", + HelloService.class)); + SpringComponent system = new SpringComponent("system", new String[] { HELLO_SERVICE_SPRING_WITH_PROPERTIES_XML }, - provided, - new HashMap()); + provided, new HashMap()); Properties props = new Properties(); props.load(new ClassPathResource(PROPERTY_FILE).getInputStream()); system.addProperties(props); - - system.start("Hello", new Service[0]); - Service[] services = system.getRunningServices(); - assertEquals("Property Value", services[0].reference(HelloService.class).say()); + + Scope scope = system.start(); + ProvidedInterface[] services = scope.getProvidedInterfaces(); + assertEquals("Property Value", scope.getInterfaceImplementation(services[0], HelloService.class).say()); } public void testWithMissingRequirement() { try { - SpringComponent system = new SpringComponent("system", _registry, + SpringComponent system = new SpringComponent("system", new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML }, new HashMap(), new HashMap()); - system.start("Bla", new Service[0]); + system.start(); } catch (SystemAssemblyException e) { - //e.printStackTrace(); + // e.printStackTrace(); return; } fail(); @@ -94,39 +103,49 @@ public class SpringComponentTest extends TestCase { public void testWithRequirement() { Map required = new HashMap(); - required.put(new DefaultRequiredInterfaceDescriptor("hello", HelloService.class), + required.put(new DefaultRequiredInterface("hello", HelloService.class), "helloService"); - SpringComponent system = new SpringComponent("system", _registry, + SpringComponent system = new SpringComponent("system", new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML }, new HashMap(), required); - - HelloService helloObject = new HelloService("ladida"); - Service helloService = _registry.register(new DefaultProvidedInterfaceDescriptor("hello", HelloService.class), helloObject); - system.start("Bla", new Service[] { helloService } ); - system.stop(); + + HelloService helloObject = new HelloService("ladida"); + ProvidedInterface helloService = new DefaultProvidedInterface("hello", + HelloService.class); + Scope scope = new DefaultScope(new ProvidedInterface[]{ helloService }); + scope.publishInterface(helloService, helloObject); + system.getRequiredInterfaces()[0].setProvider(helloService); + + Scope runtime = system.start(scope); + system.stop(runtime); } - + public void testWithRequirementAndProvidedService() { Map required = new HashMap(); - required.put(new DefaultRequiredInterfaceDescriptor("hello", HelloService.class), + required.put(new DefaultRequiredInterface("hello", HelloService.class), "helloService"); - Map provided = new HashMap(); - provided.put("blaService", new DefaultProvidedInterfaceDescriptor("bla", + Map provided = new HashMap(); + provided.put("blaService", new DefaultProvidedInterface("bla", BlaService.class)); - SpringComponent system = new SpringComponent("system", _registry, - new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML }, - provided, required); - - HelloService helloObject = new HelloService("ladida"); - Service helloService = _registry.register(new DefaultProvidedInterfaceDescriptor("hello", HelloService.class), helloObject); - Service[] services = system.start("Bla", new Service[] { helloService } ); - assertEquals(1, services.length); - - assertTrue(services[0].reference(BlaService.class) instanceof BlaService); - assertEquals("ladida", services[0].reference(BlaService.class) - .execute()); - system.stop(); + SpringComponent system = new SpringComponent("system", + new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML }, provided, + required); + + HelloService helloObject = new HelloService("ladida"); + ProvidedInterface helloService = new DefaultProvidedInterface("hello", + HelloService.class); + Scope scope = new DefaultScope(new ProvidedInterface[] { helloService }); + scope.publishInterface(helloService, helloObject); + system.getRequiredInterfaces()[0].setProvider(helloService); + Scope runtime = system.start(scope); + ProvidedInterface started = runtime.getProvidedInterfaces()[0]; + + Object impl = runtime.getInterfaceImplementation(started, BlaService.class); + assertNotNull(impl); + assertTrue(impl instanceof BlaService); + assertEquals("ladida", ((BlaService)impl).execute()); + system.stop(runtime); } }