X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fspring%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2FSpringComponentTest.java;fp=system%2Fspring%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2FSpringComponentTest.java;h=10e2ca8eb8a277b3319c9b712b48b53f3ac9a2d9;hb=296ef6728606ccf316ba9b60af8b8a6585fb8835;hp=3e63c7eaba4ee1b18b5399d9c3a7dca40bda7df4;hpb=e5106fcf4d35e746dc9eaecea220df3131aab4e4;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 3e63c7ea..10e2ca8e 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
@@ -34,79 +34,84 @@ import org.wamblee.test.EventTracker;
 
 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 HELLO_SERVICE_SPRING_WITH_PROPERTIES_XML2 = "test.org.wamblee.system.springWithProperties2.xml";
-	    
-	private static final String PROPERTY_FILE = "test.org.wamblee.system.spring.properties";
-	
-	public static EventTracker<String> EVENT_TRACKER;
-	
-	private Scope _externalScope; 
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		EVENT_TRACKER = new EventTracker<String>();
-		_externalScope = new DefaultScope(new ProvidedInterface[0]);
-	}
-
-	public void testBlackboxSystem() {
-		SpringComponent system = new SpringComponent("system",
-				new String[] { HELLO_SERVICE_SPRING_XML },
-				new HashMap<String, ProvidedInterface>(),
-				new HashMap<RequiredInterface, String>());
-		
-		Scope runtime = system.start(_externalScope);
-		assertEquals(0, _externalScope.getProvidedInterfaces().length);
-
-		system.stop(runtime);
-	}
-
-	public void testOneProvidedService() {
-		Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
-		provided.put("helloService", new DefaultProvidedInterface("hello",
-				HelloService.class));
-
-		SpringComponent system = new SpringComponent("system",
-				new String[] { HELLO_SERVICE_SPRING_XML }, provided,
-				new HashMap<RequiredInterface, String>());
-		Scope runtime = system.start(_externalScope);
-		ProvidedInterface[] services = runtime.getProvidedInterfaces();
-	
-		assertEquals(1, services.length);
-		Object service = runtime.getInterfaceImplementation(services[0], Object.class);
-		assertTrue(service instanceof HelloService);
-		
-		// BUG; Provided services should be made available in the external scope. 
-		Object service2 = _externalScope.getInterfaceImplementation(provided.get("helloService"), Object.class);
-		assertSame(service, service2);
-		
-		assertEquals("Hello world!", ((HelloService) service).say());
-		system.stop(runtime);
-	}
-
-	public void testWithProperties() throws IOException {
-		Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
-		provided.put("helloService", new DefaultProvidedInterface("hello",
-				HelloService.class));
-		SpringComponent system = new SpringComponent("system",
-				new String[] { HELLO_SERVICE_SPRING_WITH_PROPERTIES_XML },
-				provided, new HashMap<RequiredInterface, String>());
-		Properties props = new Properties();
-		props.load(new ClassPathResource(PROPERTY_FILE).getInputStream());
-		system.addProperties(props);
-
-		Scope scope = system.start(_externalScope);
-		// BUG: Hello service was constructed multiple times. Once with the unprocessed property
-		// and another time with the processed property. 
-		assertEquals(1, EVENT_TRACKER.getEventCount());
-		ProvidedInterface[] services = scope.getProvidedInterfaces();
-		assertEquals("Property Value", scope.getInterfaceImplementation(services[0], HelloService.class).say());
-	}
-	
-	public void testWithPropertiesAsBean() throws IOException {
+    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 HELLO_SERVICE_SPRING_WITH_PROPERTIES_XML2 = "test.org.wamblee.system.springWithProperties2.xml";
+
+    private static final String PROPERTY_FILE = "test.org.wamblee.system.spring.properties";
+
+    public static EventTracker<String> EVENT_TRACKER;
+
+    private Scope _externalScope;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        EVENT_TRACKER = new EventTracker<String>();
+        _externalScope = new DefaultScope(new ProvidedInterface[0]);
+    }
+
+    public void testBlackboxSystem() {
+        SpringComponent system = new SpringComponent("system",
+                new String[] { HELLO_SERVICE_SPRING_XML },
+                new HashMap<String, ProvidedInterface>(),
+                new HashMap<RequiredInterface, String>());
+
+        Scope runtime = system.start(_externalScope);
+        assertEquals(0, _externalScope.getProvidedInterfaces().length);
+
+        system.stop(runtime);
+    }
+
+    public void testOneProvidedService() {
+        Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
+        provided.put("helloService", new DefaultProvidedInterface("hello",
+                HelloService.class));
+
+        SpringComponent system = new SpringComponent("system",
+                new String[] { HELLO_SERVICE_SPRING_XML }, provided,
+                new HashMap<RequiredInterface, String>());
+        Scope runtime = system.start(_externalScope);
+        ProvidedInterface[] services = runtime.getProvidedInterfaces();
+
+        assertEquals(1, services.length);
+        Object service = runtime.getInterfaceImplementation(services[0],
+                Object.class);
+        assertTrue(service instanceof HelloService);
+
+        // BUG; Provided services should be made available in the external
+        // scope.
+        Object service2 = _externalScope.getInterfaceImplementation(provided
+                .get("helloService"), Object.class);
+        assertSame(service, service2);
+
+        assertEquals("Hello world!", ((HelloService) service).say());
+        system.stop(runtime);
+    }
+
+    public void testWithProperties() throws IOException {
+        Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
+        provided.put("helloService", new DefaultProvidedInterface("hello",
+                HelloService.class));
+        SpringComponent system = new SpringComponent("system",
+                new String[] { HELLO_SERVICE_SPRING_WITH_PROPERTIES_XML },
+                provided, new HashMap<RequiredInterface, String>());
+        Properties props = new Properties();
+        props.load(new ClassPathResource(PROPERTY_FILE).getInputStream());
+        system.addProperties(props);
+
+        Scope scope = system.start(_externalScope);
+        // BUG: Hello service was constructed multiple times. Once with the
+        // unprocessed property
+        // and another time with the processed property.
+        assertEquals(1, EVENT_TRACKER.getEventCount());
+        ProvidedInterface[] services = scope.getProvidedInterfaces();
+        assertEquals("Property Value", scope.getInterfaceImplementation(
+                services[0], HelloService.class).say());
+    }
+
+    public void testWithPropertiesAsBean() throws IOException {
         Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
         provided.put("helloService", new DefaultProvidedInterface("hello",
                 HelloService2.class));
@@ -118,72 +123,141 @@ public class SpringComponentTest extends TestCase {
         system.addProperties("properties", props);
 
         Scope scope = system.start(_externalScope);
-        
+
         ProvidedInterface[] services = scope.getProvidedInterfaces();
-        
-        Properties props2 = scope.getInterfaceImplementation(services[0], HelloService2.class).getProperties();
+
+        Properties props2 = scope.getInterfaceImplementation(services[0],
+                HelloService2.class).getProperties();
         assertEquals(props, props2);
     }
 
-	public void testWithMissingRequirement() {
-		try {
-			SpringComponent system = new SpringComponent("system",
-					new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML },
-					new HashMap<String, ProvidedInterface>(),
-					new HashMap<RequiredInterface, String>());
-			system.start(_externalScope);
-		} catch (SystemAssemblyException e) {
-			// e.printStackTrace();
-			return;
-		}
-		fail();
-	}
-
-	public void testWithRequirement() {
-		Map<RequiredInterface, String> required = new HashMap<RequiredInterface, String>();
-		required.put(new DefaultRequiredInterface("hello", HelloService.class),
-				"helloService");
-		SpringComponent system = new SpringComponent("system",
-				new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML },
-				new HashMap<String, ProvidedInterface>(), 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);
-		system.stop(runtime);
-	}
-
-	public void testWithRequirementAndProvidedService() {
-		Map<RequiredInterface, String> required = new HashMap<RequiredInterface, String>();
-		required.put(new DefaultRequiredInterface("hello", HelloService.class),
-				"helloService");
-		Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
-		provided.put("blaService", new DefaultProvidedInterface("bla",
-				BlaService.class));
-
-		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);
-	}
+    public void testWithMissingRequirement() {
+        try {
+            SpringComponent system = new SpringComponent("system",
+                    new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML },
+                    new HashMap<String, ProvidedInterface>(),
+                    new HashMap<RequiredInterface, String>());
+            system.start(_externalScope);
+        } catch (SystemAssemblyException e) {
+            // e.printStackTrace();
+            return;
+        }
+        fail();
+    }
+
+    public void testWithRequirement() {
+        Map<RequiredInterface, String> required = new HashMap<RequiredInterface, String>();
+        required.put(new DefaultRequiredInterface("hello", HelloService.class),
+                "helloService");
+        SpringComponent system = new SpringComponent("system",
+                new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML },
+                new HashMap<String, ProvidedInterface>(), 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);
+        system.stop(runtime);
+    }
+
+    public void testWithRequirementAndProvidedService() {
+        Map<RequiredInterface, String> required = new HashMap<RequiredInterface, String>();
+        required.put(new DefaultRequiredInterface("hello", HelloService.class),
+                "helloService");
+        Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
+        provided.put("blaService", new DefaultProvidedInterface("bla",
+                BlaService.class));
+
+        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);
+    }
+
+    /**
+     * Tests a scenario where a subclass of SpringComponent adds a new provided
+     * interface where the interface is provided by the subclass itself and not
+     * by the spring configs inside.
+     */
+    public void testWithProvidedFromSubClassNotFromConfig() {
+        Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
+        provided.put("helloService", new DefaultProvidedInterface("hello",
+                HelloService.class));
+
+        SubSpringComponent system = new SubSpringComponent("system",
+                new String[] { HELLO_SERVICE_SPRING_XML }, provided,
+                new HashMap<RequiredInterface, String>());
+
+        Scope runtime = system.start(_externalScope);
+        ProvidedInterface[] services = runtime.getProvidedInterfaces();
+
+        assertEquals(2, services.length);
+        Object service = runtime.getInterfaceImplementation(services[0],
+                Object.class);
+        assertTrue(service instanceof HelloService);
+
+        // BUG; Provided services should be made available in the external
+        // scope.
+        Object service2 = _externalScope.getInterfaceImplementation(provided
+                .get("helloService"), Object.class);
+        assertSame(service, service2);
+
+        Object floatsvc = _externalScope.getInterfaceImplementation(system
+                .getProvidedInterfaces()[1], Object.class);
+        assertTrue(floatsvc instanceof Float);
+        assertTrue((((Float) floatsvc).floatValue() - 100.345f) < 0.00001);
+
+        assertEquals("Hello world!", ((HelloService) service).say());
+        system.stop(runtime);
+    }
+
+    /**
+     * Tests the spring component with an additional requirement from the subclass 
+     * which is not required by the spring config files inside. 
+     */
+    public void testWithRequirementFromSubClass() {
+        Map<RequiredInterface, String> required = new HashMap<RequiredInterface, String>();
+        required.put(new DefaultRequiredInterface("hello", HelloService.class),
+                "helloService");
+        SpringComponent system = new SubSpringComponent2("system",
+                new String[] { HELLO_SERVICE_SPRING_WITH_REQS_XML },
+                new HashMap<String, ProvidedInterface>(), required);
+
+        HelloService helloObject = new HelloService("ladida");
+        ProvidedInterface helloService = new DefaultProvidedInterface("hello",
+                HelloService.class);
+        
+        ProvidedInterface floatService = new DefaultProvidedInterface("float", Float.class);
+        
+        Scope scope = new DefaultScope(new ProvidedInterface[] { helloService });
+        scope.publishInterface(helloService, helloObject);
+        scope.publishInterface(floatService, 100.234f);
+        system.getRequiredInterfaces()[0].setProvider(helloService);
+        system.getRequiredInterfaces()[1].setProvider(floatService);
+
+        Scope runtime = system.start(scope);
+        system.stop(runtime);
+        
+        assertEquals(100.234f, ((Float)runtime.get("floatValue")).floatValue(), 0.0001f);
+    }
 
 }