X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fspring%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2FSpringComponentTest.java;h=bbbda99925d5ea48c42c2d7cc11082da198b0e6b;hb=4845c677310814de4c98e22aad483e49b9dfc594;hp=0b4ffb08a9f83eb497f3cf4a73ded1bcb4de1906;hpb=2aa6c38d06e981a4a6c240e2d371638205c3fb54;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 0b4ffb08..bbbda999 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,13 +23,11 @@ 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.DefaultService;
-import org.wamblee.system.ProvidedInterface;
-import org.wamblee.system.RequiredInterface;
-import org.wamblee.system.Service;
-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 {
 
@@ -33,7 +46,7 @@ public class SpringComponentTest extends TestCase {
 				new String[] { HELLO_SERVICE_SPRING_XML },
 				new HashMap<String, ProvidedInterface>(),
 				new HashMap<RequiredInterface, String>());
-		system.start("Hello");
+		system.start();
 		ProvidedInterface[] services = system.getRunningServices();
 		assertEquals(0, services.length);
 		
@@ -42,13 +55,13 @@ public class SpringComponentTest extends TestCase {
 
 	public void testOneProvidedService() {
 		Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
-		provided.put("helloService", new DefaultProvidedInterfaceDescriptor(
+		provided.put("helloService", new DefaultProvidedInterface(
 				"hello", HelloService.class));
 
 		SpringComponent system = new SpringComponent("system", 
 				new String[] { HELLO_SERVICE_SPRING_XML }, provided,
 				new HashMap<RequiredInterface, String>());
-		system.start("Hello");
+		system.start();
 		ProvidedInterface[] services = system.getRunningServices();
 		assertEquals(1, services.length);
 		assertTrue(services[0].getImplementation() instanceof HelloService);
@@ -59,7 +72,7 @@ public class SpringComponentTest extends TestCase {
 	
 	public void testWithProperties() throws IOException {
 		Map<String, ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
-		provided.put("helloService", new DefaultProvidedInterfaceDescriptor(
+		provided.put("helloService", new DefaultProvidedInterface(
 				"hello", HelloService.class));
 		SpringComponent system = new SpringComponent("system", 
 				new String[] { HELLO_SERVICE_SPRING_WITH_PROPERTIES_XML },
@@ -69,7 +82,7 @@ public class SpringComponentTest extends TestCase {
 		props.load(new ClassPathResource(PROPERTY_FILE).getInputStream());
 		system.addProperties(props);
 		
-		system.start("Hello");
+		system.start();
 		ProvidedInterface[] services = system.getRunningServices();
 		assertEquals("Property Value", 
 				((HelloService)services[0].getImplementation()).say());
@@ -81,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;
@@ -91,27 +104,27 @@ public class SpringComponentTest extends TestCase {
 
 	public void testWithRequirement() {
 		Map<RequiredInterface, String> required = new HashMap<RequiredInterface, String>();
-		required.put(new DefaultRequiredInterfaceDescriptor("hello", HelloService.class),
+		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 DefaultProvidedInterfaceDescriptor("hello", HelloService.class);
+		ProvidedInterface helloService = new DefaultProvidedInterface("hello", HelloService.class);
 		helloService.publish(helloObject);
 		system.getRequiredServices()[0].setProvider(helloService);
 		
-		system.start("Bla");
+		system.start();
 		system.stop();
 	}
 	
 	public void testWithRequirementAndProvidedService() {
 		Map<RequiredInterface, String> required = new HashMap<RequiredInterface, String>();
-		required.put(new DefaultRequiredInterfaceDescriptor("hello", HelloService.class),
+		required.put(new DefaultRequiredInterface("hello", HelloService.class),
 				"helloService");
 		Map<String,ProvidedInterface> provided = new HashMap<String, ProvidedInterface>();
-		provided.put("blaService", new DefaultProvidedInterfaceDescriptor("bla",
+		provided.put("blaService", new DefaultProvidedInterface("bla",
 				BlaService.class));
 
 		SpringComponent system = new SpringComponent("system",
@@ -120,10 +133,10 @@ public class SpringComponentTest extends TestCase {
 		
 		HelloService helloObject = new HelloService("ladida"); 
 		ProvidedInterface helloService = 
-			new DefaultProvidedInterfaceDescriptor("hello", HelloService.class);
+			new DefaultProvidedInterface("hello", HelloService.class);
 		helloService.publish(helloObject);
 		system.getRequiredServices()[0].setProvider(helloService);
-		system.start("Bla");
+		system.start();
 		ProvidedInterface started = system.getProvidedServices()[0];
 		
 	    assertNotNull(started.getImplementation());