svn commit: r18973 - trunk/src/argouml-app/tests/org/argouml/notation: . providers/java

Author: linus
Date: 2011-01-18 11:08:04-0800
New Revision: 18973

Modified:
   trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java
   trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java

Log:
Fixed test case to work without the project.

Modified: trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java?view=diff&pathrev=18973&r1=18972&r2=18973
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java	2011-01-18 11:08:04-0800
@@ -110,8 +110,6 @@
     public void testListener() throws InterruptedException {
         Object model =
             Model.getModelManagementFactory().createModel();
-        Project p = ProjectManager.getManager().getCurrentProject();
-        p.addModel(model);
         aClass = Model.getCoreFactory().buildClass(model);
         
         NotationProvider np = new NPImpl();

Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java?view=diff&pathrev=18973&r1=18972&r2=18973
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java	2011-01-18 11:08:04-0800
@@ -54,11 +54,17 @@
  */
 public class TestModelElementNameNotationJava extends TestCase {
     private Object theClass;
+    private Object model;
+
+    private Object getModel() {
+        return model;
+    }
 
     protected void setUp() throws Exception {
         super.setUp();
         InitializeModel.initializeDefault();
         new InitProfileSubsystem().init();
+        model = Model.getModelManagementFactory().createModel();
         theClass = Model.getCoreFactory().buildClass("TheClass", getModel());
     }
     
@@ -145,10 +151,6 @@
         assertToStringForNamedRelationshipEqualsItsName(generalization);
     }
 
-    private Object getModel() {
-        return ProjectManager.getManager().getCurrentProject().getModel();
-    }
-
     /**
      * Test if help is correctly provided.
      */

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2698946

To unsubscribe from this discussion, e-mail: [[email protected]].