CVS: jcontainer/loom/engine/src/test/org/jcontainer/loom/components/assembler AssemblerTestCase.java,1.8,1.9

Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/test/org/jcontainer/loom/components/assembler
In directory hogshead.codehaus.org:/tmp/cvs-serv22178/engine/src/test/org/jcontainer/loom/components/assembler

Modified Files:
	AssemblerTestCase.java 
Log Message:
Rename the MetaData away from standard MetaData postfix to use more readily accesisble names


Index: AssemblerTestCase.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/test/org/jcontainer/loom/components/assembler/AssemblerTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- AssemblerTestCase.java	16 Oct 2003 14:45:51 -0000	1.8
+++ AssemblerTestCase.java	3 Nov 2003 06:43:16 -0000	1.9
@@ -20,7 +20,7 @@
 import org.jcontainer.loom.components.deployer.PhoenixProfileBuilder;
 import org.jcontainer.loom.components.util.ConfigurationBuilder;
 import org.jcontainer.loom.components.assembler.data.Service1;
-import org.jcontainer.loom.components.util.metadata.DependencyMetaData;
+import org.jcontainer.loom.components.util.metadata.DependencyDirective;
 import org.jcontainer.loom.components.util.profile.ComponentProfile;
 import org.jcontainer.loom.components.util.profile.PartitionProfile;
 import org.jcontainer.loom.interfaces.ContainerConstants;
@@ -52,13 +52,13 @@
 
         final ComponentProfile block1 = blocks[ 0 ];
         final ComponentProfile block2 = blocks[ 1 ];
-        final DependencyMetaData[] dependencies1 = block1.getMetaData().getDependencies();
-        final DependencyMetaData[] dependencies2 = block2.getMetaData().getDependencies();
+        final DependencyDirective[] dependencies1 = block1.getTemplate().getDependencies();
+        final DependencyDirective[] dependencies2 = block2.getTemplate().getDependencies();
 
         assertEquals( "Block1 getImplementationKey",
                       Component1.class.getName(),
-                      block1.getMetaData().getImplementationKey() );
-        assertEquals( "Block1 getName", "c1", block1.getMetaData().getName() );
+                      block1.getTemplate().getImplementationKey() );
+        assertEquals( "Block1 getName", "c1", block1.getTemplate().getName() );
         assertEquals( "Block1 getDependencies count",
                       1, dependencies1.length );
         assertEquals( "Block1 dep1 name", "c2", dependencies1[ 0 ].getProviderName() );
@@ -70,8 +70,8 @@
 
         assertEquals( "Block2 getImplementationKey",
                       Component2.class.getName(),
-                      block2.getMetaData().getImplementationKey() );
-        assertEquals( "Block2 getName", "c2", block2.getMetaData().getName() );
+                      block2.getTemplate().getImplementationKey() );
+        assertEquals( "Block2 getName", "c2", block2.getTemplate().getName() );
         assertEquals( "Block2 getDependencies count",
                       0, dependencies2.length );
         assertTrue( "Block2 getBlockInfo non null",
@@ -81,7 +81,7 @@
 
     private boolean isProxyDisabled( final ComponentProfile block2 )
     {
-        return block2.getMetaData().isDisableProxy();
+        return block2.getTemplate().isDisableProxy();
     }
 
     public void _testComplex()
@@ -96,15 +96,15 @@
         final ComponentProfile block2 = blocks[ 1 ];
         final ComponentProfile block3 = blocks[ 2 ];
         final ComponentProfile block4 = blocks[ 3 ];
-        final DependencyMetaData[] dependencies1 = block1.getMetaData().getDependencies();
-        final DependencyMetaData[] dependencies2 = block2.getMetaData().getDependencies();
-        final DependencyMetaData[] dependencies3 = block3.getMetaData().getDependencies();
-        final DependencyMetaData[] dependencies4 = block4.getMetaData().getDependencies();
+        final DependencyDirective[] dependencies1 = block1.getTemplate().getDependencies();
+        final DependencyDirective[] dependencies2 = block2.getTemplate().getDependencies();
+        final DependencyDirective[] dependencies3 = block3.getTemplate().getDependencies();
+        final DependencyDirective[] dependencies4 = block4.getTemplate().getDependencies();
 
         assertEquals( "Block1 getImplementationKey",
                       Component2.class.getName(),
-                      block1.getMetaData().getImplementationKey() );
-        assertEquals( "Block1 getName", "c2a", block1.getMetaData().getName() );
+                      block1.getTemplate().getImplementationKey() );
+        assertEquals( "Block1 getName", "c2a", block1.getTemplate().getName() );
         assertEquals( "Block1 getDependencies count",
                       0, dependencies1.length );
         assertTrue( "Block2 getBlockInfo non null",
@@ -113,8 +113,8 @@
 
         assertEquals( "Block2 getImplementationKey",
                       Component2.class.getName(),
-                      block2.getMetaData().getImplementationKey() );
-        assertEquals( "Block2 getName", "c2b", block2.getMetaData().getName() );
+                      block2.getTemplate().getImplementationKey() );
+        assertEquals( "Block2 getName", "c2b", block2.getTemplate().getName() );
         assertEquals( "Block2 getDependencies count",
                       0, dependencies2.length );
         assertTrue( "Block2 getBlockInfo non null",
@@ -123,8 +123,8 @@
 
         assertEquals( "Block3 getImplementationKey",
                       Component2.class.getName(),
-                      block3.getMetaData().getImplementationKey() );
-        assertEquals( "Block3 getName", "c2c", block3.getMetaData().getName() );
+                      block3.getTemplate().getImplementationKey() );
+        assertEquals( "Block3 getName", "c2c", block3.getTemplate().getName() );
         assertEquals( "Block3 getDependencies count",
                       0, dependencies3.length );
         assertTrue( "Block3 getBlockInfo non null",
@@ -133,13 +133,13 @@
 
         assertEquals( "Block4 getImplementationKey",
                       Component3.class.getName(),
-                      block4.getMetaData().getImplementationKey() );
-        assertEquals( "Block4 getName", "c3", block4.getMetaData().getName() );
+                      block4.getTemplate().getImplementationKey() );
+        assertEquals( "Block4 getName", "c3", block4.getTemplate().getName() );
         assertEquals( "Block4 getDependencies count",
                       3, dependencies4.length );
-        final DependencyMetaData dependency1 = dependencies4[ 0 ];
-        final DependencyMetaData dependency2 = dependencies4[ 1 ];
-        final DependencyMetaData dependency3 = dependencies4[ 2 ];
+        final DependencyDirective dependency1 = dependencies4[ 0 ];
+        final DependencyDirective dependency2 = dependencies4[ 1 ];
+        final DependencyDirective dependency3 = dependencies4[ 2 ];
         assertEquals( "Block4 dep1 name", "c2a", dependency1.getProviderName() );
         assertEquals( "Block4 dep1 role",
                       Service1.class.getName(), dependency1.getKey() );