Author: tfmorris Date: 2010-04-13 10:54:07-0700 New Revision: 18254 Modified: trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java 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/TestEnumerationLiteralNotationUml.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 trunk/src/argouml-app/tests/org/argouml/persistence/TestXmiFilePersister.java trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java trunk/src/argouml-app/tests/org/argouml/profile/TestProfileFacade.java trunk/src/argouml-app/tests/org/argouml/profile/TestProfileManager.java trunk/src/argouml-app/tests/org/argouml/profile/TestProfileMother.java trunk/src/argouml-app/tests/org/argouml/profile/TestReaderModelLoader.java trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java
Log: Add tearDown methods to test suites. Delete created models. Modified: trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java (original) +++ trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java 2010-04-13 10:54:07-0700 @@ -45,6 +45,7 @@ import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; +import org.argouml.profile.ProfileFacade; import org.argouml.profile.init.InitProfileSubsystem; /** @@ -110,11 +111,12 @@ */ @Override protected void tearDown() throws Exception { - super.tearDown(); + ProfileFacade.reset(); if (elem != null) { Model.getUmlFactory().delete(elem); } listener = null; + super.tearDown(); } /** Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java (original) +++ trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java 2010-04-13 10:54:07-0700 @@ -45,6 +45,7 @@ import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.notation.NotationSettings; +import org.argouml.profile.ProfileFacade; import org.argouml.profile.init.InitProfileSubsystem; /** @@ -91,6 +92,15 @@ Model.getStateMachinesHelper().setContainer(aActionState, top); } + + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject( + ProjectManager.getManager().getCurrentProject()); + ProfileFacade.reset(); + super.tearDown(); + } + /** * An extra setup method. */ 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=18254&r1=18253&r2=18254 ============================================================================== --- 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 2010-04-13 10:54:07-0700 @@ -47,6 +47,7 @@ import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.notation.NotationSettings; +import org.argouml.profile.ProfileFacade; import org.argouml.profile.init.InitProfileSubsystem; /** @@ -100,6 +101,16 @@ Model.getStateMachinesHelper().setContainer(aCallState, top); } + + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject( + ProjectManager.getManager().getCurrentProject()); + ProfileFacade.reset(); + super.tearDown(); + } + + /** * An extra setup method. */ 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=18254&r1=18253&r2=18254 ============================================================================== --- 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 2010-04-13 10:54:07-0700 @@ -44,8 +44,10 @@ import junit.framework.TestCase; +import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; +import org.argouml.profile.ProfileFacade; import org.argouml.profile.init.InitProfileSubsystem; /** @@ -81,6 +83,15 @@ InitializeModel.initializeDefault(); new InitProfileSubsystem().init(); } + + + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject( + ProjectManager.getManager().getCurrentProject()); + ProfileFacade.reset(); + super.tearDown(); + } /** * Test the name of the ClassifierRole. Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java (original) +++ trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java 2010-04-13 10:54:07-0700 @@ -45,10 +45,12 @@ import junit.framework.TestCase; +import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.notation.InitNotation; import org.argouml.notation.NotationSettings; +import org.argouml.profile.ProfileFacade; import org.argouml.profile.init.InitProfileSubsystem; /** @@ -73,6 +75,9 @@ (new InitProfileSubsystem()).init(); (new InitNotation()).init(); (new InitNotationUml()).init(); + ProjectManager.getManager().setCurrentProject( + ProjectManager.getManager().makeEmptyProject()); + Object model = Model.getModelManagementFactory().createModel(); aEnumeration = Model.getCoreFactory().buildEnumeration("", model); @@ -81,6 +86,15 @@ npSettings = new NotationSettings(); } + + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject( + ProjectManager.getManager().getCurrentProject()); + ProfileFacade.reset(); + super.tearDown(); + } + /** * Test the resulting name after parsing the enumeration literal. * @@ -108,7 +122,7 @@ checkName(aLiteral, "name;<<s2>>nameX", "name"); checkLiterals(4, new String[] {"name", "nameX", "name4", "create second one"}); - checkName(aLiteral, "µôèéàü$", "µôèéàü$"); + checkName(aLiteral, "�������$", "�������$"); checkName(aLiteral, "name;", "name"); checkName(aLiteral, " \u00AB stereotype \u00BB name3", "name3"); checkName(aLiteral, "name;\u00ABstereotype\u00BBname", "name"); 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=18254&r1=18253&r2=18254 ============================================================================== --- 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 2010-04-13 10:54:07-0700 @@ -43,11 +43,13 @@ import junit.framework.TestCase; +import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; import org.argouml.notation.InitNotation; import org.argouml.notation.NotationSettings; import org.argouml.notation.SDNotationSettings; +import org.argouml.profile.ProfileFacade; import org.argouml.profile.init.InitProfileSubsystem; /** @@ -87,7 +89,6 @@ public void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); -// new InitProfileSubsystem().init(); assertTrue("Model subsystem init failed.", Model.isInitiated()); (new InitProfileSubsystem()).init(); (new InitNotation()).init(); @@ -96,6 +97,15 @@ npSettings = new SDNotationSettings(); } + + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject( + ProjectManager.getManager().getCurrentProject()); + ProfileFacade.reset(); + super.tearDown(); + } + private void setupModel1() { pack = Model.getModelManagementFactory().buildPackage("p1"); coll = Model.getCollaborationsFactory().buildCollaboration(pack); 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=18254&r1=18253&r2=18254 ============================================================================== --- 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 2010-04-13 10:54:07-0700 @@ -47,6 +47,7 @@ import org.argouml.kernel.ProjectManager; import org.argouml.model.InitializeModel; import org.argouml.model.Model; +import org.argouml.profile.ProfileFacade; import org.argouml.profile.init.InitProfileSubsystem; /** @@ -89,6 +90,15 @@ Model.getStateMachinesFactory().buildCompositeState(top); } + + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject( + ProjectManager.getManager().getCurrentProject()); + ProfileFacade.reset(); + super.tearDown(); + } + /** * Test the parseStateBody() method: succesful creation. */ 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=18254&r1=18253&r2=18254 ============================================================================== --- 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 2010-04-13 10:54:07-0700 @@ -48,6 +48,7 @@ import org.argouml.model.Model; import org.argouml.notation.NotationProvider; import org.argouml.notation.NotationSettings; +import org.argouml.profile.ProfileFacade; import org.argouml.profile.init.InitProfileSubsystem; /** @@ -88,6 +89,13 @@ aState = Model.getStateMachinesFactory().buildCompositeState(top); } + @Override + protected void tearDown() throws Exception { + ProjectManager.getManager().removeProject( + ProjectManager.getManager().getCurrentProject()); + ProfileFacade.reset(); + super.tearDown(); + } /** * Test for the parseTransition() method. Modified: trunk/src/argouml-app/tests/org/argouml/persistence/TestXmiFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/persistence/TestXmiFilePersister.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/persistence/TestXmiFilePersister.java (original) +++ trunk/src/argouml-app/tests/org/argouml/persistence/TestXmiFilePersister.java 2010-04-13 10:54:07-0700 @@ -49,6 +49,7 @@ import org.argouml.model.Model; import org.argouml.model.XmiReferenceException; import org.argouml.profile.ProfileFacade; +import org.argouml.profile.init.InitProfileSubsystem; /** * Testclass for the XMIReader. Placeholder for all saving/loading tests @@ -75,11 +76,14 @@ if (!Model.isInitiated()) { InitializeModel.initializeMDR(); } -// new InitProfileSubsystem().init(); - // TODO: Why is this necessary? - tfm - // Always force reinitialization of Profile subsystem - ProfileFacade.setManager( - new org.argouml.profile.internal.ProfileManagerImpl()); + new InitProfileSubsystem().init(); + } + + + @Override + protected void tearDown() throws Exception { + ProfileFacade.reset(); + super.tearDown(); } /** @@ -178,6 +182,7 @@ * @throws Exception if loading project fails */ public void testLoadProject() throws Exception { + testSave(); // Create file File file = new File("test.xmi"); XmiFilePersister persister = new XmiFilePersister(); Modified: trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java (original) +++ trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java 2010-04-13 10:54:07-0700 @@ -1,6 +1,6 @@ /* $Id$ ***************************************************************************** - * Copyright (c) 2009 Contributors - see below + * Copyright (c) 2009,2010 Contributors - see below * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -53,6 +53,7 @@ import org.argouml.notation.InitNotation; import org.argouml.notation.providers.java.InitNotationJava; import org.argouml.notation.providers.uml.InitNotationUml; +import org.argouml.profile.ProfileFacade; import org.argouml.profile.init.InitProfileSubsystem; import org.argouml.uml.diagram.activity.ui.InitActivityDiagram; import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram; @@ -82,6 +83,13 @@ (new InitUseCaseDiagram()).init(); (new InitProfileSubsystem()).init(); } + + + @Override + protected void tearDown() throws Exception { + ProfileFacade.reset(); + super.tearDown(); + } /** * The constructor. Modified: trunk/src/argouml-app/tests/org/argouml/profile/TestProfileFacade.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/TestProfileFacade.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/profile/TestProfileFacade.java (original) +++ trunk/src/argouml-app/tests/org/argouml/profile/TestProfileFacade.java 2010-04-13 10:54:07-0700 @@ -38,10 +38,12 @@ package org.argouml.profile; -import org.easymock.MockControl; +import java.util.Collections; import junit.framework.TestCase; +import org.easymock.MockControl; + /** * * @author Luis Sergio Oliveira (euluis) @@ -65,6 +67,7 @@ @Override protected void tearDown() throws Exception { ProfileFacade.reset(); + managerCtrl.verify(); super.tearDown(); } @@ -72,6 +75,10 @@ * Test {...@link ProfileFacade#getManager()} before initialization. */ public void testGetManagerBeforeInitialisationThrows() { + manager.getRegisteredProfiles(); + managerCtrl.setReturnValue(Collections.emptySet()); + managerCtrl.replay(); + ProfileFacade.reset(); try { ProfileFacade.getManager(); @@ -86,10 +93,14 @@ */ public void testRegister() { manager.registerProfile(null); + + // Called during teardown + manager.getRegisteredProfiles(); + managerCtrl.setReturnValue(Collections.emptySet()); + managerCtrl.replay(); ProfileFacade.register(null); - managerCtrl.verify(); } /** @@ -97,9 +108,13 @@ */ public void testRemove() { manager.removeProfile(null); + + // Called during teardown + manager.getRegisteredProfiles(); + managerCtrl.setReturnValue(Collections.emptySet()); + managerCtrl.replay(); ProfileFacade.remove((Profile) null); - managerCtrl.verify(); } } Modified: trunk/src/argouml-app/tests/org/argouml/profile/TestProfileManager.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/TestProfileManager.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/profile/TestProfileManager.java (original) +++ trunk/src/argouml-app/tests/org/argouml/profile/TestProfileManager.java 2010-04-13 10:54:07-0700 @@ -85,14 +85,6 @@ } /** - * Test the {...@link ProfileManager#registerProfile(Profile)} method. - */ - public void testRegisterProfile() { - manager.registerProfile(mockProfile); - assertTrue(manager.getRegisteredProfiles().contains(mockProfile)); - } - - /** * Test the {...@link ProfileManager#removeProfile(Profile)} method. */ public void testRemoveProfile() { @@ -132,6 +124,7 @@ assertEquals(initialDefaultProfiles.size(), manager.getDefaultProfiles().size()); assertFalse(manager.getDefaultProfiles().contains(mockProfile)); + manager.removeProfile(mockProfile); } /** Modified: trunk/src/argouml-app/tests/org/argouml/profile/TestProfileMother.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/TestProfileMother.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/profile/TestProfileMother.java (original) +++ trunk/src/argouml-app/tests/org/argouml/profile/TestProfileMother.java 2010-04-13 10:54:07-0700 @@ -75,6 +75,11 @@ mother = new ProfileMother(); } + protected void tearDown() throws Exception { + ProfileFacade.reset(); + super.tearDown(); + } + /** * Test the creation of a profile model. */ @@ -85,6 +90,7 @@ assertEquals(1, profileStereotypes.size()); assertEquals(ProfileMother.STEREOTYPE_NAME_PROFILE, getFacade().getName(profileStereotypes.iterator().next())); + Model.getUmlFactory().delete(model); } /** @@ -110,6 +116,7 @@ assertNotNull("\"st\" stereotype not found in model.", st); assertTrue(Model.getExtensionMechanismsHelper().isStereotype(st, ProfileMother.STEREOTYPE_NAME_ST, "Class")); + Model.getUmlFactory().delete(model); } /** @@ -123,6 +130,7 @@ mother.saveProfileModel(model, file); assertTrue("The file to where the file was supposed to be saved " + "doesn't exist.", file.exists()); + Model.getUmlFactory().delete(model); } /** @@ -157,6 +165,11 @@ + "from which the dependent profile depends must occur in the " + "file.", file.getName(), dependentProfileFile); + // Clean up our two models and the extent that we read profile in to + Model.getUmlFactory().delete(model); + Model.getUmlFactory().delete(model2); + Model.getUmlFactory().deleteExtent( + simpleModelTopElements.iterator().next()); } /** @@ -205,6 +218,10 @@ true); assertEquals("There should exist only one top level element.", 1, dependentProfileModelTopElements.size()); + // Clean up our model and the extent that we read profile in to + Model.getUmlFactory().delete(model); + Model.getUmlFactory().deleteExtent( + dependentProfileModelTopElements.iterator().next()); } private void assertStringInLineOfFile(String failureMsg, String str, @@ -258,5 +275,6 @@ Collection topModelElements = xmiReader.parse(inputSource, true); assertEquals("Unexpected number of top model elements.", 1, topModelElements.size()); + Model.getUmlFactory().deleteExtent(topModelElements.iterator().next()); } } Modified: trunk/src/argouml-app/tests/org/argouml/profile/TestReaderModelLoader.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/TestReaderModelLoader.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/profile/TestReaderModelLoader.java (original) +++ trunk/src/argouml-app/tests/org/argouml/profile/TestReaderModelLoader.java 2010-04-13 10:54:07-0700 @@ -47,6 +47,7 @@ import org.argouml.FileHelper; import org.argouml.model.InitializeModel; +import org.argouml.model.Model; import junit.framework.TestCase; @@ -84,5 +85,7 @@ loadModel(profileReference); assertNotNull(models); assertTrue(models.size() >= 1); + Model.getUmlFactory().deleteExtent(models.iterator().next()); } + } Modified: trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java (original) +++ trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java 2010-04-13 10:54:07-0700 @@ -83,6 +83,7 @@ @Override protected void tearDown() throws Exception { + ProfileFacade.reset(); FileHelper.delete(testDir); super.tearDown(); } @@ -104,6 +105,7 @@ Profile profile = new UserDefinedProfile(profileFile, ProfileFacade.getManager()); assertEquals(profileName, profile.getDisplayName()); + ProfileFacade.getManager().removeProfile(profile); } /** @@ -135,5 +137,6 @@ assertEquals(profile.getDisplayName(), "displayName"); assertTrue(profile.getDependencies().contains(pm.getUMLProfile())); assertTrue(profile.getCritics().contains(critic)); + ProfileFacade.getManager().removeProfile(profile); } } Modified: trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java?view=diff&pathrev=18254&r1=18253&r2=18254 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java 2010-04-13 10:54:07-0700 @@ -53,7 +53,7 @@ if (proj != null) { ProjectManager.getManager().removeProject(proj); } -// ProfileFacade.reset(); + ProfileFacade.reset(); super.tearDown(); } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2581063 To unsubscribe from this discussion, e-mail: [[email protected]].
