From a0e10763c616203c1e655b84e3b0dffc56e2cac9 Mon Sep 17 00:00:00 2001 From: donald.g.dunne Date: Wed, 15 May 2013 15:27:59 -0700 Subject: bug[ats_1ZRRE]: Add AtsTestUtil.cleanup() to tests using AtsTestUtil Change-Id: Ica25f62e90164136cbd380250cd859fa5ef31fb1 --- .../tests/ats/actions/AbstractAtsActionTest.java | 2 -- .../core/client/workflow/transition/StateManagerTest.java | 14 ++++++++++++-- .../tests/ats/world/search/LegacyPcrIdQuickSearchTest.java | 8 ++++++++ .../ats/world/search/TeamDefinitionQuickSearchTest.java | 8 ++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) (limited to 'plugins/org.eclipse.osee.ats.client.integration.tests/src') diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java index 84f8c06c937..ee2263cb075 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java @@ -13,7 +13,6 @@ package org.eclipse.osee.ats.client.integration.tests.ats.actions; import junit.framework.Assert; import org.eclipse.jface.action.Action; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; -import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -30,7 +29,6 @@ public abstract class AbstractAtsActionTest { @AfterClass public static void cleanup() throws Throwable { AtsTestUtil.cleanup(); - SMAEditor.closeAll(); } @Test diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java index 0bdc4ead763..b9dc02ed4fc 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java @@ -21,6 +21,8 @@ import org.eclipse.osee.ats.core.client.workflow.transition.ITransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -28,6 +30,12 @@ import org.junit.Test; */ public class StateManagerTest { + @BeforeClass + @AfterClass + public static void cleanup() throws Exception { + AtsTestUtil.cleanup(); + } + @Test public void testUpdateMetrics() throws OseeCoreException { AtsTestUtil.cleanupAndReset(getClass().getSimpleName()); @@ -39,7 +47,8 @@ public class StateManagerTest { ITransitionHelper helper = new MockTransitionHelper("dodad", Collections.singletonList(teamWf), - AtsTestUtil.getImplementStateDef().getName(), Collections.singleton(AtsClientService.get().getUserAdmin().getCurrentUser()), null); + AtsTestUtil.getImplementStateDef().getName(), + Collections.singleton(AtsClientService.get().getUserAdmin().getCurrentUser()), null); TransitionManager manager = new TransitionManager(helper); TransitionResults results = manager.handleAll(); manager.getTransaction().execute(); @@ -48,7 +57,8 @@ public class StateManagerTest { stateMgr.updateMetrics(AtsTestUtil.getImplementStateDef(), 2.2, 1, false); helper = new MockTransitionHelper("dodad", Collections.singletonList(teamWf), - AtsTestUtil.getCompletedStateDef().getName(), Collections.singleton(AtsClientService.get().getUserAdmin().getCurrentUser()), null); + AtsTestUtil.getCompletedStateDef().getName(), + Collections.singleton(AtsClientService.get().getUserAdmin().getCurrentUser()), null); manager = new TransitionManager(helper); results = manager.handleAll(); manager.getTransaction().execute(); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java index c18e9427092..556625e71a7 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java @@ -19,6 +19,8 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.world.search.LegacyPcrIdQuickSearch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -28,6 +30,12 @@ import org.junit.Test; */ public class LegacyPcrIdQuickSearchTest { + @BeforeClass + @AfterClass + public static void cleanup() throws Exception { + AtsTestUtil.cleanup(); + } + @Test public void testPerformSearch() throws OseeCoreException { AtsTestUtil.cleanupAndReset(getClass().getSimpleName() + ".testPerformSearch"); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java index 82c54e35e2c..82577d66a2e 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java @@ -20,6 +20,8 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.world.search.TeamDefinitionQuickSearch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -29,6 +31,12 @@ import org.junit.Test; */ public class TeamDefinitionQuickSearchTest { + @BeforeClass + @AfterClass + public static void cleanup() throws Exception { + AtsTestUtil.cleanup(); + } + @Test public void testPerformSearch() throws OseeCoreException { AtsTestUtil.cleanupAndReset(getClass().getSimpleName() + ".testPerformSearch"); -- cgit v1.2.3