(no commit message)

[utils] / system / general / src / test / java / org / wamblee / system / DefaultInterfaceDescriptorTest.java

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 dd3451dbc1cf0ed8427e630d58eccacca0e53257..6786e1642f1c0b7bf6e6707b98433e40426802b5 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/DefaultInterfaceDescriptorTest.java
+++ b/system/general/src/test/java/org/wamblee/system/DefaultInterfaceDescriptorTest.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;
 
 import java.io.Serializable;
@@ -7,27 +22,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 +54,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));
        }