DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-07-16 06:18:43 +0200 (Sun, 16 Jul 2006)
New Revision: 1563

Modified:
   
trunk/main/metro/test/src/test/net/dpml/test/runtime/ContextModelTestCase.java
Log:


Modified: 
trunk/main/metro/test/src/test/net/dpml/test/runtime/ContextModelTestCase.java
===================================================================
--- 
trunk/main/metro/test/src/test/net/dpml/test/runtime/ContextModelTestCase.java
      2006-07-16 04:17:57 UTC (rev 1562)
+++ 
trunk/main/metro/test/src/test/net/dpml/test/runtime/ContextModelTestCase.java
      2006-07-16 04:18:43 UTC (rev 1563)
@@ -26,8 +26,8 @@
 
 import net.dpml.component.Controller;
 
-import net.dpml.metro.ComponentModelManager;
-import net.dpml.metro.ContextModelManager;
+import net.dpml.metro.ComponentModel;
+import net.dpml.metro.ContextModel;
 import net.dpml.metro.ValidationException;
 import net.dpml.metro.ValidationException.Issue;
 import net.dpml.metro.data.ValueDirective;
@@ -40,7 +40,7 @@
  */
 public class ContextModelTestCase extends TestCase
 {    
-    private ComponentModelManager m_model;
+    private ComponentModel m_model;
     
    /**
     * Testcase setup during which the part definition 'example.part'
@@ -52,7 +52,7 @@
         final String path = "example.part";
         final File test = new File( System.getProperty( "project.test.dir" ) 
);
         final URI uri = new File( test, path ).toURI();
-        m_model = (ComponentModelManager) Controller.STANDARD.createModel( 
uri );
+        m_model = (ComponentModel) Controller.STANDARD.createModel( uri );
     }
     
    /**
@@ -61,7 +61,7 @@
     */
     public void testContextModel() throws Exception
     {
-        ContextModelManager context = m_model.getContextManager();
+        ContextModel context = m_model.getContextModel();
         assertNotNull( "context", context );
         EntryDescriptor[] entries = context.getEntryDescriptors();
         assertEquals( "entries", 1, entries.length );
@@ -83,7 +83,7 @@
     */
     public void testValidationWithoutCause() throws Exception
     {
-        ContextModelManager context = m_model.getContextManager();
+        ContextModel context = m_model.getContextModel();
         context.validate();
     }
     
@@ -93,7 +93,7 @@
     */
     public void testValidationWithCause() throws Exception
     {
-        ContextModelManager context = m_model.getContextManager();
+        ContextModel context = m_model.getContextModel();
         context.setEntryDirective( "color", null );
         try
         {