Author: linus Date: 2011-01-18 11:34:12-0800 New Revision: 18974 Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java
Log: Create empty projects for the tests. Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java?view=diff&pathrev=18974&r1=18973&r2=18974 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java (original) +++ trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java 2011-01-18 11:34:12-0800 @@ -80,7 +80,7 @@ new InitProfileSubsystem().init(); Object model = Model.getModelManagementFactory().createModel(); - Project p = ProjectManager.getManager().getCurrentProject(); + Project p = ProjectManager.getManager().makeEmptyProject(true); p.addModel(model); aClass = Model.getCoreFactory().buildClass(model); aClass2 = Model.getCoreFactory().buildClass(model); Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java?view=diff&pathrev=18974&r1=18973&r2=18974 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java (original) +++ trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java 2011-01-18 11:34:12-0800 @@ -82,6 +82,7 @@ super.setUp(); InitializeModel.initializeDefault(); new InitProfileSubsystem().init(); + ProjectManager.getManager().makeEmptyProject(); } Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java?view=diff&pathrev=18974&r1=18973&r2=18974 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java (original) +++ trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java 2011-01-18 11:34:12-0800 @@ -95,6 +95,7 @@ (new InitNotationUml()).init(); npSettings = new SDNotationSettings(); + ProjectManager.getManager().makeEmptyProject(); } Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java?view=diff&pathrev=18974&r1=18973&r2=18974 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java (original) +++ trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java 2011-01-18 11:34:12-0800 @@ -43,7 +43,6 @@ import junit.framework.TestCase; -import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; @@ -79,9 +78,9 @@ new InitProfileSubsystem().init(); Object model = Model.getModelManagementFactory().createModel(); - Project p = ProjectManager.getManager().getCurrentProject(); + ProjectManager.getManager().makeEmptyProject(true); aClass = Model.getCoreFactory().buildClass(model); - Object returnType = p.getDefaultReturnType(); + Object returnType = null; Model.getCoreFactory().buildOperation2(aClass, returnType, "myOper"); aStateMachine = Model.getStateMachinesFactory().buildStateMachine(aClass); Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java?view=diff&pathrev=18974&r1=18973&r2=18974 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java (original) +++ trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java 2011-01-18 11:34:12-0800 @@ -81,12 +81,14 @@ InitializeModel.initializeDefault(); assertTrue("Model subsystem init failed.", Model.isInitiated()); new InitProfileSubsystem().init(); - Project p = ProjectManager.getManager().getCurrentProject(); + Project p = ProjectManager.getManager().makeEmptyProject(); returnType = p.getDefaultReturnType(); model = Model.getModelManagementFactory().createModel(); aClass = Model.getCoreFactory().buildClass("A", model); - aOper = Model.getCoreFactory().buildOperation2(aClass, returnType, "myOper"); + aOper = + Model.getCoreFactory().buildOperation2( + aClass, returnType, "myOper"); aStateMachine = Model.getStateMachinesFactory().buildStateMachine(aClass); Object top = Model.getFacade().getTop(aStateMachine); @@ -117,7 +119,8 @@ Object trigger2s = Model.getFacade().getTrigger(t2s); Object trigger3s = Model.getFacade().getTrigger(t3s); assertTrue("No reuse of a signal event.", trigger1s == trigger2s); - assertTrue("Unexpected reuse of a signal event.", trigger1s != trigger3s); + assertTrue("Unexpected reuse of a signal event.", + trigger1s != trigger3s); // reuse call event: Object t1c = checkGenerated(aState, "trigger1()[guard]/effect", @@ -156,7 +159,8 @@ Object trigger2g = Model.getFacade().getTrigger(t2g); Object trigger3g = Model.getFacade().getTrigger(t3g); assertTrue("No reuse of a change event.", trigger1g == trigger2g); - assertTrue("Unexpected reuse of a change event.", trigger1g != trigger3g); + assertTrue("Unexpected reuse of a change event.", + trigger1g != trigger3g); } /** @@ -458,7 +462,9 @@ Object aPack = Model.getModelManagementFactory().buildPackage("pack1"); Model.getCoreHelper().setNamespace(aPack, model); aClass = Model.getCoreFactory().buildClass("A", aPack); - aOper = Model.getCoreFactory().buildOperation2(aClass, returnType, "myOper"); + aOper = + Model.getCoreFactory().buildOperation2( + aClass, returnType, "myOper"); aStateMachine = Model.getActivityGraphsFactory().buildActivityGraph(aPack); @@ -525,7 +531,8 @@ /** * This method only uses the "aState" variable. */ - private void checkLinkingOfOperationToCallEvent(String text, Object operation) { + private void checkLinkingOfOperationToCallEvent( + String text, Object operation) { Object trans; Object trig; Object myOp; ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2698948 To unsubscribe from this discussion, e-mail: [[email protected]].
