Author: linus Date: 2011-01-18 12:57:19-0800 New Revision: 18975 Modified: trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java trunk/src/argouml-app/tests/org/argouml/ui/targetmanager/TestTargetManager.java trunk/src/argouml-app/tests/org/argouml/uml/diagram/TestDiagramFactory.java trunk/src/argouml-app/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionActivityGraphDiagram.java trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionStateDiagram.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java
Log: Create empty projects for the tests. Modified: trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java (original) +++ trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java 2011-01-18 12:57:19-0800 @@ -47,6 +47,8 @@ import org.argouml.cognitive.checklist.ui.InitCheckListUI; import org.argouml.cognitive.ui.InitCognitiveUI; import org.argouml.cognitive.ui.TabToDo; +import org.argouml.kernel.Project; +import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.profile.init.InitProfileSubsystem; @@ -70,6 +72,8 @@ */ public class TestDetailsPane extends TestCase { + private Project project; + /** * @param arg0 is the name of the test case. */ @@ -84,6 +88,9 @@ super.setUp(); InitializeModel.initializeDefault(); new InitProfileSubsystem().init(); + + project = ProjectManager.getManager().makeEmptyProject(); + new InitUmlUI().init(); new InitCheckListUI().init(); new InitCognitiveUI().init(); @@ -96,15 +103,24 @@ (new InitUseCaseDiagram()).init(); } + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject(project); + super.tearDown(); + } + /** * Test setting a target. + * + * @exception Exception if the intTestTargetSet() encounters an error. */ public void testTargetSet() throws Exception { // Make sure this test happens on the AWT event thread SwingUtilities.invokeAndWait(new Runnable() { public void run() { intTestTargetSet(); - }}); + } + }); } /** Modified: trunk/src/argouml-app/tests/org/argouml/ui/targetmanager/TestTargetManager.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/ui/targetmanager/TestTargetManager.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/ui/targetmanager/TestTargetManager.java (original) +++ trunk/src/argouml-app/tests/org/argouml/ui/targetmanager/TestTargetManager.java 2011-01-18 12:57:19-0800 @@ -80,6 +80,7 @@ private Fig targetRemovedFigTarget; private Object targetRemovedModelTarget; private Object targetRemovedObjects[]; + private Project project; private class TestTargetListener implements TargetListener { @@ -470,8 +471,9 @@ Object test = new Object(); ArgoDiagram diag = new ArgoDiagramImpl() { public Fig getContainingFig(Object obj) { - if (obj == owner) + if (obj == owner) { return fig; + } return null; } public void encloserChanged(FigNode enclosed, @@ -581,8 +583,12 @@ Object test = new Object(); List<Object> list1 = new ArrayList<Object>(); - List<Object> list2 = new ArrayList<Object>(); list2.add(test); - List<Object> list3 = new ArrayList<Object>(); list3.add(fig); list3.add(test); + + List<Object> list2 = new ArrayList<Object>(); + list2.add(test); + + List<Object> list3 = new ArrayList<Object>(); + list3.add(fig); list3.add(test); TargetListener listener = new TestTargetListener(); TargetManager.getInstance().addTargetListener(listener); @@ -907,6 +913,8 @@ protected void setUp() { InitializeModel.initializeDefault(); new InitProfileSubsystem().init(); + + project = ProjectManager.getManager().makeEmptyProject(); TargetManager.getInstance().setTarget(null); } @@ -916,5 +924,6 @@ */ protected void tearDown() { TargetManager.getInstance().setTarget(null); + ProjectManager.getManager().removeProject(project); } } Modified: trunk/src/argouml-app/tests/org/argouml/uml/diagram/TestDiagramFactory.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/diagram/TestDiagramFactory.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/diagram/TestDiagramFactory.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/diagram/TestDiagramFactory.java 2011-01-18 12:57:19-0800 @@ -39,6 +39,8 @@ package org.argouml.uml.diagram; import org.apache.log4j.Logger; +import org.argouml.kernel.Project; +import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.profile.init.InitProfileSubsystem; @@ -55,11 +57,20 @@ private static final Logger LOG = Logger.getLogger(TestDiagramFactory.class); + private Project project; protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); new InitProfileSubsystem().init(); + + project = ProjectManager.getManager().makeEmptyProject(); + } + + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject(project); + super.tearDown(); } /** @@ -90,7 +101,8 @@ ArgoDiagram diagram; if (type == DiagramType.Sequence) { // TODO: Fix this so that new sequence diagrams are tested - LOG.warn("Skipping Sequence Diagram test because they are in a separate module"); + LOG.warn("Skipping Sequence Diagram test " + + "because they are in a separate module"); return; } else if (type == DiagramType.State) { Object context = Model.getCoreFactory().buildClass(model); Modified: trunk/src/argouml-app/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java 2011-01-18 12:57:19-0800 @@ -42,6 +42,8 @@ import junit.framework.TestCase; +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; @@ -58,6 +60,7 @@ public class TestUMLClassDiagram extends TestCase { private static Object[] nodeTypes; + private Project project; /** * The constructor. @@ -80,6 +83,9 @@ InitializeModel.initializeDefault(); new InitProfileSubsystem().init(); + + project = ProjectManager.getManager().makeEmptyProject(); + nodeTypes = new Object[] { Model.getCoreFactory().createClass(), @@ -103,6 +109,11 @@ }; } + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject(project); + super.tearDown(); + } /** * Test the UMLClassDiagram empty constructor. The graph model should always * be a ClassDiagramGraphModel Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java 2011-01-18 12:57:19-0800 @@ -43,6 +43,8 @@ import junit.framework.TestCase; +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; @@ -74,6 +76,8 @@ */ private List validNamespaces; + private Project project; + /** * Constructor for AbstractTestActionAddDiagram. * @param arg0 test case name @@ -92,6 +96,8 @@ (new InitNotationJava()).init(); (new InitProfileSubsystem()).init(); + project = ProjectManager.getManager().makeEmptyProject(); + action = getAction(); ns = getNamespace(); @@ -105,6 +111,8 @@ action = null; ns = null; validNamespaces = null; + + ProjectManager.getManager().removeProject(project); } /** Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionActivityGraphDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionActivityGraphDiagram.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionActivityGraphDiagram.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionActivityGraphDiagram.java 2011-01-18 12:57:19-0800 @@ -42,6 +42,8 @@ import junit.framework.TestCase; +import org.argouml.kernel.Project; +import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.profile.init.InitProfileSubsystem; @@ -65,6 +67,8 @@ */ private Object ns; + private Project project; + /** * Constructor. @@ -89,6 +93,7 @@ @Override protected void setUp() { + project = ProjectManager.getManager().makeEmptyProject(); action = getAction(); ns = getNamespace(); TargetManager.getInstance().setTarget(ns); Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java 2011-01-18 12:57:19-0800 @@ -44,6 +44,8 @@ import junit.framework.TestCase; +import org.argouml.kernel.Project; +import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.profile.init.InitProfileSubsystem; @@ -77,6 +79,8 @@ */ private List validNamespaces; + private Project project; + /** * Constructor for TestActionCollaborationDiagram. * @param arg0 name of the test case @@ -117,6 +121,9 @@ protected void setUp() { InitializeModel.initializeDefault(); new InitProfileSubsystem().init(); + + project = ProjectManager.getManager().makeEmptyProject(); + action = getAction(); ns = getNamespace(); validNamespaces = getValidNamespaceClasses(); @@ -124,6 +131,10 @@ TargetManager.getInstance().setTarget(ns); } + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } /** * Test if the namespace is correct for the diagram.<p> * Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionStateDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionStateDiagram.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionStateDiagram.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/TestActionStateDiagram.java 2011-01-18 12:57:19-0800 @@ -44,6 +44,7 @@ import junit.framework.TestCase; +import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.profile.init.InitProfileSubsystem; @@ -127,6 +128,8 @@ * @see junit.framework.TestCase#setUp() */ protected void setUp() { + ProjectManager.getManager().makeEmptyProject(); + action = getAction(); ns = getNamespace(); validNamespaces = getValidNamespaceClasses(); Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java 2011-01-18 12:57:19-0800 @@ -97,7 +97,7 @@ InitializeModel.initializeDefault(); new InitProfileSubsystem().init(); - Project p = ProjectManager.getManager().getCurrentProject(); + Project p = ProjectManager.getManager().makeEmptyProject(); model = new UMLAssociationRoleBaseComboBoxModel(); Object class1 = Model.getCoreFactory().createClass(); Object class2 = Model.getCoreFactory().createClass(); Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java 2011-01-18 12:57:19-0800 @@ -86,14 +86,15 @@ protected void setUp() throws Exception { super.setUp(); + Project p = ProjectManager.getManager().makeEmptyProject(); + elem = Model.getCollaborationsFactory().createCollaboration(); Model.getCoreHelper().setName(elem, "collaboration elem"); model = new UMLCollaborationRepresentedClassifierComboBoxModel(); TargetManager.getInstance().setTarget(elem); ThreadHelper.synchronize(); - Project p = ProjectManager.getManager().getCurrentProject(); - Object m = p.getRoot(); + Object m = p.getRoots().iterator().next(); clazz = Model.getCoreFactory().buildClass(m); Model.getCoreHelper().setName(clazz, "clazz"); Model.getCollaborationsHelper().setRepresentedClassifier(elem, clazz); @@ -126,6 +127,7 @@ /** * Test removing the represented operation. + * @throws Exception if we were interrupted waiting for the awt thread. */ public void testExtraRepresentedOperation() throws Exception { Object cl2 = Model.getCoreFactory().createClass(); Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java?view=diff&pathrev=18975&r1=18974&r2=18975 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java 2011-01-18 12:57:19-0800 @@ -38,13 +38,11 @@ package org.argouml.uml.ui.behavior.collaborations; -import java.lang.reflect.InvocationTargetException; - import junit.framework.TestCase; -import org.argouml.model.InitializeModel; import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; +import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.profile.init.InitProfileSubsystem; import org.argouml.ui.targetmanager.TargetEvent; @@ -79,13 +77,14 @@ protected void setUp() throws Exception { super.setUp(); + Project p = ProjectManager.getManager().makeEmptyProject(); + elem = Model.getCollaborationsFactory().createCollaboration(); model = new UMLCollaborationRepresentedOperationComboBoxModel(); TargetManager.getInstance().setTarget(elem); ThreadHelper.synchronize(); - Project p = ProjectManager.getManager().getCurrentProject(); - Object m = p.getRoot(); + Object m = p.getRoots().iterator().next(); Object clazz = Model.getCoreFactory().buildClass(m); oper = Model.getCoreFactory().createOperation(); Model.getCoreHelper().setOwner(oper, clazz); @@ -119,8 +118,11 @@ /** * Test removing the represented operation. + * + * @throws Exception interupted by awt thread. */ public void testExtraRepresentedOperation() throws Exception { + assertEquals(2, model.getSize()); Object op = Model.getCoreFactory().createOperation(); Model.getCollaborationsHelper().setRepresentedOperation(elem, op); /* Simulate a target change. */ ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2698955 To unsubscribe from this discussion, e-mail: [[email protected]].
