X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2FDefaultInterfaceDescriptorTest.java;h=b6a5eb8b872ab1b83deb68af21ecd73202968f28;hb=6110f13b29c47ba0fe8039194ee2c4a992911e3b;hp=dd3451dbc1cf0ed8427e630d58eccacca0e53257;hpb=bfb43f7e25ff26dcb43bbfd671862945855a4d3d;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/DefaultInterfaceDescriptorTest.java b/system/general/src/test/java/org/wamblee/system/DefaultInterfaceDescriptorTest.java
index dd3451db..b6a5eb8b 100644
--- a/system/general/src/test/java/org/wamblee/system/DefaultInterfaceDescriptorTest.java
+++ b/system/general/src/test/java/org/wamblee/system/DefaultInterfaceDescriptorTest.java
@@ -7,27 +7,27 @@ import junit.framework.TestCase;
 public class DefaultInterfaceDescriptorTest extends TestCase {
 
 	public void testOneRequiredOneProvidedMatch() { 
-		ProvidedInterfaceDescriptor provided = new DefaultProvidedInterfaceDescriptor("name", String.class);
-		RequiredInterfaceDescriptor required = new DefaultRequiredInterfaceDescriptor("name", String.class);
+		ProvidedInterface provided = new DefaultProvidedInterface("name", String.class);
+		RequiredInterface required = new DefaultRequiredInterface("name", String.class);
 		assertTrue(required.implementedBy(provided));
 	}
 	
 	public void testOneRequiredOneProvidedMatchSubClass() { 
-		ProvidedInterfaceDescriptor provided = new DefaultProvidedInterfaceDescriptor("name", Integer.class);
-		RequiredInterfaceDescriptor required = new DefaultRequiredInterfaceDescriptor("name", Number.class);
+		ProvidedInterface provided = new DefaultProvidedInterface("name", Integer.class);
+		RequiredInterface required = new DefaultRequiredInterface("name", Number.class);
 		assertTrue(required.implementedBy(provided));
 	}
 	
 	public void testOneRequiredOneProvidedNoMatch() { 
-		ProvidedInterfaceDescriptor provided = new DefaultProvidedInterfaceDescriptor("name", String.class);
-		RequiredInterfaceDescriptor required = new DefaultRequiredInterfaceDescriptor("name", Number.class);
+		ProvidedInterface provided = new DefaultProvidedInterface("name", String.class);
+		RequiredInterface required = new DefaultRequiredInterface("name", Number.class);
 		assertFalse(required.implementedBy(provided));
 	}
 	
 	public void testOneRequiredMultipleProvidedMatch() { 
-		ProvidedInterfaceDescriptor provided = new DefaultProvidedInterfaceDescriptor("name", 
+		ProvidedInterface provided = new DefaultProvidedInterface("name", 
 				new Class[] { String.class, Integer.class} );
-		RequiredInterfaceDescriptor required = new DefaultRequiredInterfaceDescriptor("name", String.class);
+		RequiredInterface required = new DefaultRequiredInterface("name", String.class);
 		assertTrue(required.implementedBy(provided));
 	}
 	
@@ -39,25 +39,25 @@ public class DefaultInterfaceDescriptorTest extends TestCase {
 	}
 	
 	public void testMultipleRequiredOneProvidedMatch() { 
-		ProvidedInterfaceDescriptor provided = new DefaultProvidedInterfaceDescriptor("name", 
+		ProvidedInterface provided = new DefaultProvidedInterface("name", 
 				MyMultiple.class );
-		RequiredInterfaceDescriptor required = new DefaultRequiredInterfaceDescriptor("name", 
+		RequiredInterface required = new DefaultRequiredInterface("name", 
 				new Class[] {Runnable.class, Serializable.class} );
 		assertTrue(required.implementedBy(provided));
 	}
 	
 	public void testMultipleRequiredOneProvidedNoMatch() { 
-		ProvidedInterfaceDescriptor provided = new DefaultProvidedInterfaceDescriptor("name", 
+		ProvidedInterface provided = new DefaultProvidedInterface("name", 
 				MyMultiple.class );
-		RequiredInterfaceDescriptor required = new DefaultRequiredInterfaceDescriptor("name", 
+		RequiredInterface required = new DefaultRequiredInterface("name", 
 				new Class[] { String.class, Runnable.class} );
 		assertFalse(required.implementedBy(provided));
 	}
 	
 	public void testMultipleRequiredMultipleProvidedMatch() { 
-		ProvidedInterfaceDescriptor provided = new DefaultProvidedInterfaceDescriptor("name", 
+		ProvidedInterface provided = new DefaultProvidedInterface("name", 
 				new Class[] { Runnable.class, Serializable.class, String.class}  );
-		RequiredInterfaceDescriptor required = new DefaultRequiredInterfaceDescriptor("name", 
+		RequiredInterface required = new DefaultRequiredInterface("name", 
 				new Class[] {Runnable.class, Serializable.class} );
 		assertTrue(required.implementedBy(provided));
 	}