(no commit message)

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

diff --git a/system/general/src/test/java/org/wamblee/system/core/DefaultScopeTest.java b/system/general/src/test/java/org/wamblee/system/core/DefaultScopeTest.java
index 8458c326e5265d483feda55dc0d6e4895a85be60..6584c528721f7ce9eb402bd55c5b34ea4f8e58f1 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/core/DefaultScopeTest.java
+++ b/system/general/src/test/java/org/wamblee/system/core/DefaultScopeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * Copyright 2005-2010 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.
@@ -12,40 +12,45 @@
  * 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.core;
 
 import junit.framework.TestCase;
 
+/**
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
 public class DefaultScopeTest extends TestCase {
-    
-    public void testLookup() { 
-        ProvidedInterface provider = new DefaultProvidedInterface("x", Integer.class);
-        Scope scope = new DefaultScope(new ProvidedInterface[0]); 
-        
-        assertNull(provider.getUniqueId()); 
+    public void testLookup() {
+        ProvidedInterface provider = new DefaultProvidedInterface("x",
+            Integer.class);
+        Scope scope = new DefaultScope(new ProvidedInterface[0]);
+
         scope.publishInterface(provider, 100);
-        assertNotNull(provider.getUniqueId());
+        assertEquals(100, scope.getInterfaceImplementation(provider,
+            Integer.class).intValue());
     }
-    
-    public void testNestedLookup() { 
-        ProvidedInterface provider1 = new DefaultProvidedInterface("x", Integer.class);
+
+    public void testNestedLookup() {
+        ProvidedInterface provider1 = new DefaultProvidedInterface("x",
+            Integer.class);
         Scope parent = new DefaultScope(new ProvidedInterface[0]);
-        
+
         parent.publishInterface(provider1, 100);
-        
-        ProvidedInterface provider2 = new DefaultProvidedInterface("y", String.class);
+
+        ProvidedInterface provider2 = new DefaultProvidedInterface("y",
+            String.class);
         Scope child = new DefaultScope(new ProvidedInterface[0], parent);
-        
+
         child.publishInterface(provider2, "hallo");
-        
-        assertNotNull(provider1.getUniqueId());
-        assertNotNull(provider2.getUniqueId()); 
-        
-        assertFalse(provider1.getUniqueId().equals(provider2.getUniqueId()));
- 
-        assertEquals(100, child.getInterfaceImplementation(provider1, Integer.class).intValue());
-        assertEquals("hallo", child.getInterfaceImplementation(provider2, String.class));
-    }
 
+        assertFalse(provider1.equals(provider2));
+
+        assertEquals(100, child.getInterfaceImplementation(provider1,
+            Integer.class).intValue());
+        assertEquals("hallo", child.getInterfaceImplementation(provider2,
+            String.class));
+    }
 }