svn commit: r15327 - trunk/src/argouml-app/tests/org/argouml: ui/cmd uml/ui

Author: linus
Date: 2008-07-22 00:20:18-0700
New Revision: 15327

Modified:
   trunk/src/argouml-app/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java
   trunk/src/argouml-app/tests/org/argouml/uml/ui/GUITestActionOpenProject.java

Log:
Fixed the tests so that they can load a model after ProjectBrowser and
notation refactorings.

Modified: trunk/src/argouml-app/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java?view=diff&rev=15327&p1=trunk/src/argouml-app/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java&p2=trunk/src/argouml-app/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java&r1=15326&r2=15327
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java	2008-07-22 00:20:18-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2004-2007 The Regents of the University of California. All
+// Copyright (c) 2004-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -27,13 +27,19 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import javax.swing.JPanel;
 
 import junit.framework.TestCase;
 
+// Test classes
 import org.argouml.model.InitializeModel;
-import org.argouml.profile.init.InitProfileSubsystem;
 import org.argouml.util.CheckMain;
 
+// Real classes
+import org.argouml.notation.providers.uml.InitNotationUml;
+import org.argouml.profile.init.InitProfileSubsystem;
+import org.argouml.ui.ProjectBrowser;
+
 /**
  * Tests the change of diagram from the command line.
  */
@@ -56,6 +62,8 @@
         super.setUp();
         InitializeModel.initializeDefault();
         new InitProfileSubsystem().init();
+        ProjectBrowser.makeInstance(null, true, new JPanel());
+        new InitNotationUml().init();
     }
 
     /**

Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/GUITestActionOpenProject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/GUITestActionOpenProject.java?view=diff&rev=15327&p1=trunk/src/argouml-app/tests/org/argouml/uml/ui/GUITestActionOpenProject.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/ui/GUITestActionOpenProject.java&r1=15326&r2=15327
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/uml/ui/GUITestActionOpenProject.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/uml/ui/GUITestActionOpenProject.java	2008-07-22 00:20:18-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2004-2007 The Regents of the University of California. All
+// Copyright (c) 2004-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -27,14 +27,20 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import javax.swing.JPanel;
 
 import junit.framework.TestCase;
 
-import org.argouml.kernel.ProjectManager;
+// Test classes
 import org.argouml.model.InitializeModel;
+import org.argouml.util.CheckMain;
+
+// Real classes
+import org.argouml.kernel.ProjectManager;
+import org.argouml.notation.providers.uml.InitNotationUml;
 import org.argouml.persistence.PersistenceManager;
 import org.argouml.profile.init.InitProfileSubsystem;
-import org.argouml.util.CheckMain;
+import org.argouml.ui.ProjectBrowser;
 
 /**
  * Testing opening a project from the command line.
@@ -56,6 +62,8 @@
         super.setUp();
         InitializeModel.initializeDefault();
         new InitProfileSubsystem().init();
+        ProjectBrowser.makeInstance(null, true, new JPanel());
+        new InitNotationUml().init();
     }
 
     /**