svn commit: r16122 - trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui

Author: tfmorris
Date: 2008-11-21 16:23:56-0800
New Revision: 16122

Modified:
   trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java
   trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java

Log:
Add some additional initialization to test setup

Modified: trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java?view=diff&rev=16122&p1=trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java&r1=16121&r2=16122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java	2008-11-21 16:23:56-0800
@@ -26,10 +26,20 @@
 
 import junit.framework.TestCase;
 
+import org.argouml.kernel.ProjectManager;
+import org.argouml.model.InitializeModel;
 import org.argouml.notation.InitNotation;
 import org.argouml.notation.providers.java.InitNotationJava;
 import org.argouml.notation.providers.uml.InitNotationUml;
+import org.argouml.profile.init.InitProfileSubsystem;
+import org.argouml.uml.diagram.activity.ui.InitActivityDiagram;
+import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
+import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
+import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
+import org.argouml.uml.diagram.state.ui.InitStateDiagram;
+import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
 import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
+import org.argouml.uml.diagram.use_case.ui.InitUseCaseDiagram;
 
 /**
  * @author Timothy M. Lebo
@@ -53,10 +63,22 @@
      */
     protected void setUp() throws Exception {
         super.setUp();
+
+        InitializeModel.initializeDefault();
         (new InitNotation()).init();
         (new InitNotationUml()).init();
         (new InitNotationJava()).init();
-
+        (new InitDiagramAppearanceUI()).init();
+        (new InitActivityDiagram()).init();
+        (new InitCollaborationDiagram()).init();
+        (new InitDeploymentDiagram()).init();
+        (new InitSequenceDiagram()).init();
+        (new InitStateDiagram()).init();
+        (new InitClassDiagram()).init();
+        (new InitUseCaseDiagram()).init();
+        (new InitProfileSubsystem()).init();
+        ProjectManager.getManager().makeEmptyProject();
+        
         diagram = new UMLClassDiagram();
 	action = new ActionAddAllClassesFromModel("Add all classes from model",
 						  diagram);

Modified: trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java?view=diff&rev=16122&p1=trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java&r1=16121&r2=16122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java	2008-11-21 16:23:56-0800
@@ -30,11 +30,23 @@
 
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
+import org.argouml.model.InitializeModel;
 import org.argouml.model.Model;
+import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
+import org.argouml.profile.init.InitProfileSubsystem;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.activity.ui.InitActivityDiagram;
+import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
+import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
+import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
+import org.argouml.uml.diagram.state.ui.InitStateDiagram;
 import org.argouml.uml.diagram.static_structure.ui.FigClass;
+import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
 import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
+import org.argouml.uml.diagram.use_case.ui.InitUseCaseDiagram;
 import org.tigris.gef.graph.presentation.JGraph;
 
 /**
@@ -63,6 +75,20 @@
      */
     protected void setUp() throws Exception {
         super.setUp();
+        InitializeModel.initializeDefault();
+        (new InitNotation()).init();
+        (new InitNotationUml()).init();
+        (new InitNotationJava()).init();
+        (new InitDiagramAppearanceUI()).init();
+        (new InitActivityDiagram()).init();
+        (new InitCollaborationDiagram()).init();
+        (new InitDeploymentDiagram()).init();
+        (new InitSequenceDiagram()).init();
+        (new InitStateDiagram()).init();
+        (new InitClassDiagram()).init();
+        (new InitUseCaseDiagram()).init();
+        (new InitProfileSubsystem()).init();
+        ProjectManager.getManager().makeEmptyProject();
         diagram = new UMLClassDiagram();
     }