diff options
17 files changed, 66 insertions, 111 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF index 09798e2c29a..1ad174bce0b 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF @@ -45,6 +45,7 @@ Import-Package: javax.ws.rs.core;version="2.0.0", org.eclipse.osee.ats.workdef, org.eclipse.osee.ats.world, org.eclipse.osee.ats.world.search, + org.eclipse.osee.client.demo, org.eclipse.osee.define.traceability, org.eclipse.osee.define.traceability.data, org.eclipse.osee.framework.core.client, diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java deleted file mode 100644 index 15fecbaa454..00000000000 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.client.demo; - -import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; - -/** - * @author Donald G. Dunne - */ -public final class DemoCISBuilds { - public static final IOseeBranch CIS_Bld_1 = TokenFactory.createBranch(4, "CIS_Bld_1"); - public static final IOseeBranch CIS_Bld_2 = TokenFactory.createBranch(1001, "CIS_Bld_2"); - public static final IOseeBranch CIS_Bld_3 = TokenFactory.createBranch(1002, "CIS_Bld_3"); - - private DemoCISBuilds() { - // Constants - } -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java deleted file mode 100644 index f02b2e50baf..00000000000 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSawBuilds.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.client.demo; - -import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.data.TokenFactory; - -/** - * @author Donald G. Dunne - */ -public final class DemoSawBuilds { - - public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch(3, "SAW_Bld_1"); - public static final IOseeBranch SAW_Bld_2 = TokenFactory.createBranch(5, "SAW_Bld_2"); - public static final IOseeBranch SAW_Bld_3 = TokenFactory.createBranch(2002, "SAW_Bld_3"); - - private DemoSawBuilds() { - // Constants - } -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java index c8527505f83..8360ee6c6ac 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.demo; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_2; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_3; import java.io.File; import java.util.Collection; import java.util.Date; @@ -162,8 +165,8 @@ public class PopulateDemoActions extends XNavigateItemAction { // Create traceability between System, Subsystem and Software requirements SkynetTransaction demoDbTraceability = - TransactionManager.createTransaction(DemoSawBuilds.SAW_Bld_1, "Populate Demo DB - Create Traceability"); - demoDbTraceabilityTx(demoDbTraceability, DemoSawBuilds.SAW_Bld_1); + TransactionManager.createTransaction(SAW_Bld_1, "Populate Demo DB - Create Traceability"); + demoDbTraceabilityTx(demoDbTraceability, SAW_Bld_1); demoDbTraceability.execute(); //DemoDbUtil.sleep(5000); @@ -217,7 +220,7 @@ public class PopulateDemoActions extends XNavigateItemAction { OseeLog.log(Activator.class, Level.INFO, "Creating SAW_Bld_2 branch off SAW_Bld_1"); } // Create SAW_Bld_2 branch off SAW_Bld_1 - Branch childBranch = BranchManager.createBaselineBranch(DemoSawBuilds.SAW_Bld_1, DemoSawBuilds.SAW_Bld_2); + Branch childBranch = BranchManager.createBaselineBranch(SAW_Bld_1, SAW_Bld_2); DemoDbUtil.sleep(5000); // need to update the branch type; @@ -237,13 +240,13 @@ public class PopulateDemoActions extends XNavigateItemAction { } Set<ActionArtifact> actions = createActions(DemoDbActionData.getNonReqSawActionData(), DemoArtifactToken.SAW_Bld_3, null, changes); - appendBuildNameToTitles(actions, DemoSawBuilds.SAW_Bld_3.getName(), changes); + appendBuildNameToTitles(actions, SAW_Bld_3.getName(), changes); if (DEBUG) { OseeLog.log(Activator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_2"); } actions = createActions(DemoDbActionData.getNonReqSawActionData(), DemoArtifactToken.SAW_Bld_2, null, changes); - appendBuildNameToTitles(actions, DemoSawBuilds.SAW_Bld_2.getName(), changes); + appendBuildNameToTitles(actions, SAW_Bld_2.getName(), changes); if (DEBUG) { OseeLog.log(Activator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_1"); @@ -252,7 +255,7 @@ public class PopulateDemoActions extends XNavigateItemAction { actions = createActions(DemoDbActionData.getNonReqSawActionData(), DemoArtifactToken.SAW_Bld_1, TeamState.Completed, changes); - appendBuildNameToTitles(actions, DemoSawBuilds.SAW_Bld_1.toString(), changes); + appendBuildNameToTitles(actions, SAW_Bld_1.toString(), changes); changes.execute(); } @@ -340,9 +343,9 @@ public class PopulateDemoActions extends XNavigateItemAction { private void demoDbImportReqsTx() { try { //@formatter:off - importRequirements(DemoSawBuilds.SAW_Bld_1, CoreArtifactTypes.SoftwareRequirement, "Software Requirements", "support/SAW-SoftwareRequirements.xml"); - importRequirements(DemoSawBuilds.SAW_Bld_1, CoreArtifactTypes.SystemRequirementMSWord, "System Requirements", "support/SAW-SystemRequirements.xml"); - importRequirements(DemoSawBuilds.SAW_Bld_1, CoreArtifactTypes.SubsystemRequirementMSWord, "Subsystem Requirements", "support/SAW-SubsystemRequirements.xml"); + importRequirements(SAW_Bld_1, CoreArtifactTypes.SoftwareRequirement, "Software Requirements", "support/SAW-SoftwareRequirements.xml"); + importRequirements(SAW_Bld_1, CoreArtifactTypes.SystemRequirementMSWord, "System Requirements", "support/SAW-SystemRequirements.xml"); + importRequirements(SAW_Bld_1, CoreArtifactTypes.SubsystemRequirementMSWord, "Subsystem Requirements", "support/SAW-SubsystemRequirements.xml"); //@formatter:on } catch (Exception ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java index cbb584f8b00..f994771da62 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.demo.config; +import static org.eclipse.osee.client.demo.DemoBranches.CIS_Bld_1; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; import org.eclipse.osee.ats.api.country.CountryEndpointApi; import org.eclipse.osee.ats.api.country.JaxCountry; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; @@ -22,8 +24,6 @@ import org.eclipse.osee.ats.api.insertion.JaxInsertionActivity; import org.eclipse.osee.ats.api.program.JaxProgram; import org.eclipse.osee.ats.api.program.ProgramEndpointApi; import org.eclipse.osee.ats.client.demo.DemoArtifactToken; -import org.eclipse.osee.ats.client.demo.DemoCISBuilds; -import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.demo.DemoSubsystems; import org.eclipse.osee.ats.client.demo.DemoUsers; import org.eclipse.osee.ats.client.demo.internal.AtsClientService; @@ -60,12 +60,12 @@ public class DemoDatabaseConfig implements IDbInitializationTask { TestUtil.setDemoDb(true); // Create SAW_Bld_1 branch - BranchManager.createTopLevelBranch(DemoSawBuilds.SAW_Bld_1); - populateProgramBranch(DemoSawBuilds.SAW_Bld_1); + BranchManager.createTopLevelBranch(SAW_Bld_1); + populateProgramBranch(SAW_Bld_1); // Create build one branch for CIS - BranchManager.createTopLevelBranch(DemoCISBuilds.CIS_Bld_1); - populateProgramBranch(DemoCISBuilds.CIS_Bld_1); + BranchManager.createTopLevelBranch(CIS_Bld_1); + populateProgramBranch(CIS_Bld_1); AtsGroup.AtsTempAdmin.addMember(UserManager.getUser(DemoUsers.Joe_Smith)); AtsGroup.AtsTempAdmin.getArtifact().persist("Set Joe as Temp Admin"); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF index d5b3cc7d707..cd0791611eb 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF @@ -74,6 +74,7 @@ Import-Package: com.google.common.collect, org.eclipse.osee.ats.version, org.eclipse.osee.ats.world, org.eclipse.osee.ats.world.search, + org.eclipse.osee.client.demo, org.eclipse.osee.define.report.api, org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.client.server, diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java index 32d2ee7fb2b..dd570772259 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_2; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_3; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -18,7 +21,6 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; -import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.demo.DemoTeam; import org.eclipse.osee.ats.client.demo.DemoUtil; import org.eclipse.osee.ats.client.demo.PopulateDemoActions; @@ -79,17 +81,17 @@ public class PopulateDemoActionsTest { if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Code")) { numTested++; codeTeamArt = teamArt; - testTeamContents(teamArt, title, "1", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "1", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Code", "Joe Smith", DemoArtifactTypes.DemoCodeTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Code)); } else if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Test")) { numTested++; - testTeamContents(teamArt, title, "1", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "1", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Test", "Kay Jones", DemoArtifactTypes.DemoTestTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Test)); } else if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Req")) { numTested++; - testTeamContents(teamArt, title, "1", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "1", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Requirements", "Joe Smith", DemoArtifactTypes.DemoReqTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Requirements)); } @@ -144,26 +146,26 @@ public class PopulateDemoActionsTest { numTested++; codeTeam = teamArt; - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Code", "Joe Smith", DemoArtifactTypes.DemoCodeTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Code)); } else if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Test")) { numTested++; - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Test", "Kay Jones", DemoArtifactTypes.DemoTestTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Test)); } else if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Req")) { numTested++; - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Requirements", "Joe Smith", DemoArtifactTypes.DemoReqTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Requirements)); } else if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Design")) { numTested++; designTeam = teamArt; - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW SW Design", "Kay Jones", AtsArtifactTypes.TeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_SW_Design)); } @@ -210,26 +212,26 @@ public class PopulateDemoActionsTest { if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Code")) { numTested++; - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Code", "Joe Smith", DemoArtifactTypes.DemoCodeTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Code)); } else if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Test")) { numTested++; - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Test", "Kay Jones", DemoArtifactTypes.DemoTestTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Test)); } else if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Req")) { numTested++; - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Requirements", "Joe Smith", DemoArtifactTypes.DemoReqTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Requirements)); } else if (teamArt.getActionableItemsDam().getActionableItemsStr().contains("Design")) { numTested++; designTeam = teamArt; - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW SW Design", "Kay Jones", AtsArtifactTypes.TeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_SW_Design)); } @@ -251,7 +253,7 @@ public class PopulateDemoActionsTest { Assert.assertEquals(1, action.getTeams().size()); TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next(); - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Implement.getName(), "SAW Requirements", "Joe Smith", DemoArtifactTypes.DemoReqTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_Requirements)); } @@ -266,7 +268,7 @@ public class PopulateDemoActionsTest { Assert.assertEquals(1, action.getTeams().size()); TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next(); - testTeamContents(teamArt, title, "1", DemoSawBuilds.SAW_Bld_1.getName(), TeamState.Completed.getName(), + testTeamContents(teamArt, title, "1", SAW_Bld_1.getName(), TeamState.Completed.getName(), "Adapter", "", DemoArtifactTypes.DemoReqTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_HW)); } @@ -280,7 +282,7 @@ public class PopulateDemoActionsTest { Assert.assertEquals(1, action.getTeams().size()); TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next(); - testTeamContents(teamArt, title, "1", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "1", SAW_Bld_2.getName(), TeamState.Implement.getName(), "Adapter", "Jason Michael", DemoArtifactTypes.DemoReqTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_HW)); } @@ -294,7 +296,7 @@ public class PopulateDemoActionsTest { Assert.assertEquals(1, action.getTeams().size()); TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next(); - testTeamContents(teamArt, title, "1", DemoSawBuilds.SAW_Bld_3.getName(), TeamState.Implement.getName(), + testTeamContents(teamArt, title, "1", SAW_Bld_3.getName(), TeamState.Implement.getName(), "Adapter", "Jason Michael", DemoArtifactTypes.DemoReqTeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_HW)); } @@ -308,7 +310,7 @@ public class PopulateDemoActionsTest { Assert.assertEquals(1, action.getTeams().size()); TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next(); - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_1.getName(), TeamState.Completed.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_1.getName(), TeamState.Completed.getName(), "SAW SW Design", "", AtsArtifactTypes.TeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_SW_Design)); } @@ -322,7 +324,7 @@ public class PopulateDemoActionsTest { Assert.assertEquals(1, action.getTeams().size()); TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next(); - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_2.getName(), TeamState.Endorse.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_2.getName(), TeamState.Endorse.getName(), "SAW SW Design", "Kay Jones", AtsArtifactTypes.TeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_SW_Design)); } @@ -336,7 +338,7 @@ public class PopulateDemoActionsTest { Assert.assertEquals(1, action.getTeams().size()); TeamWorkFlowArtifact teamArt = action.getTeams().iterator().next(); - testTeamContents(teamArt, title, "3", DemoSawBuilds.SAW_Bld_3.getName(), TeamState.Endorse.getName(), + testTeamContents(teamArt, title, "3", SAW_Bld_3.getName(), TeamState.Endorse.getName(), "SAW SW Design", "Kay Jones", AtsArtifactTypes.TeamWorkflow, DemoTestUtil.getTeamDef(DemoTeam.SAW_SW_Design)); } diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java index 41f3c857075..08b3d6aa176 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.access; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; import java.util.Arrays; import org.eclipse.osee.ats.access.AtsBranchAccessManager; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.client.demo.DemoActionableItems; -import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.demo.DemoWorkType; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; @@ -79,7 +79,7 @@ public class AtsBranchAccessManagerTest { public void testIsApplicable() throws OseeCoreException { AtsBranchAccessManager mgr = new AtsBranchAccessManager(getEventService()); Assert.assertFalse(mgr.isApplicable(AtsUtilCore.getAtsBranch())); - Assert.assertFalse(mgr.isApplicable(DemoSawBuilds.SAW_Bld_1)); + Assert.assertFalse(mgr.isApplicable(SAW_Bld_1)); TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TargetedVersionColumnTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TargetedVersionColumnTest.java index 296f2b793f3..512e0815e61 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TargetedVersionColumnTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/column/TargetedVersionColumnTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.column; -import org.eclipse.osee.ats.client.demo.DemoSawBuilds; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_2; import org.eclipse.osee.ats.client.demo.DemoWorkType; import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.ats.column.TargetedVersionColumn; @@ -32,16 +32,16 @@ public class TargetedVersionColumnTest { TeamWorkFlowArtifact reqArt = (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements); - Assert.assertEquals(DemoSawBuilds.SAW_Bld_2.getName(), + Assert.assertEquals(SAW_Bld_2.getName(), TargetedVersionColumn.getInstance().getColumnText(reqArt, TargetedVersionColumn.getInstance(), 0)); TeamWorkFlowArtifact codeArt = (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Code); - Assert.assertEquals(DemoSawBuilds.SAW_Bld_2.getName(), + Assert.assertEquals(SAW_Bld_2.getName(), TargetedVersionColumn.getInstance().getColumnText(codeArt, TargetedVersionColumn.getInstance(), 0)); Artifact actionArt = reqArt.getParentActionArtifact(); - Assert.assertEquals(DemoSawBuilds.SAW_Bld_2.getName(), + Assert.assertEquals(SAW_Bld_2.getName(), TargetedVersionColumn.getInstance().getColumnText(actionArt, TargetedVersionColumn.getInstance(), 0)); TeamWorkFlowArtifact toolsArt = DemoTestUtil.getToolsTeamWorkflow(); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java index cce9864f9ed..2cf6253993a 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtil.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.core.client; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; import java.util.ArrayList; import java.util.Arrays; @@ -40,7 +41,6 @@ import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.transition.IAtsTransitionManager; import org.eclipse.osee.ats.api.workflow.transition.TransitionOption; import org.eclipse.osee.ats.api.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.integration.AtsClientIntegrationTestSuite; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.core.client.action.ActionArtifact; @@ -793,7 +793,7 @@ public class AtsTestUtil { IAtsVersion version = getVerArt1(); version.setAllowCreateBranch(true); version.setAllowCommitBranch(true); - version.setBaselineBranchUuid(BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1).getUuid()); + version.setBaselineBranchUuid(SAW_Bld_1.getUuid()); ((Artifact) version.getStoreObject()).persist(AtsTestUtil.class.getSimpleName() + "-SetTeamWfTargetedVer1"); AtsClientService.get().getConfig().invalidate(version); if (!AtsClientService.get().getVersionService().hasTargetedVersion(getTeamWf())) { diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java index 27c6871d386..f89b0f38df9 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/branch/AtsBranchServiceImplTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.branch; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Collection; @@ -18,7 +19,6 @@ import java.util.HashSet; import org.eclipse.osee.ats.api.commit.ICommitConfigItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.version.IAtsVersion; -import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -67,7 +67,7 @@ public class AtsBranchServiceImplTest { IAtsTeamDefinition teamDef = teamArt.getTeamDefinition(); // clear versions to config item is from teamDef teamDef.getVersions().clear(); - teamDef.setBaselineBranchUuid(DemoSawBuilds.SAW_Bld_1.getUuid()); + teamDef.setBaselineBranchUuid(SAW_Bld_1.getUuid()); Collection<Object> commitObjs = AtsClientService.get().getBranchService().getCommitTransactionsAndConfigItemsForTeamWf(teamArt); assertTrue("commitObjs has wrong size", commitObjs.size() == 1); @@ -95,11 +95,11 @@ public class AtsBranchServiceImplTest { AtsTestUtil.cleanupAndReset(AtsBranchServiceImplTest.class.getSimpleName() + ".testGetCommitTransactionsAndConfigItemsForTeam_txRecords"); TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); IAtsTeamDefinition teamDef = teamArt.getTeamDefinition(); - teamDef.setBaselineBranchUuid(DemoSawBuilds.SAW_Bld_1.getUuid()); + teamDef.setBaselineBranchUuid(SAW_Bld_1.getUuid()); // clear versions to config item is from teamDef teamDef.getVersions().clear(); //Test TxRecords - Branch branch = BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1); + Branch branch = BranchManager.getBranch(SAW_Bld_1); BranchCache branchCache = Mockito.mock(BranchCache.class); Mockito.when(branchCache.getByUuid(Matchers.anyLong())).thenReturn(branch); TransactionRecord txRecord = diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToTaskEditorTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToTaskEditorTest.java index 7927975c336..f98a6811db3 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToTaskEditorTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToTaskEditorTest.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.navigate; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_2; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Collection; @@ -17,7 +19,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; -import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; import org.eclipse.osee.ats.client.integration.tests.util.NavigateTestUtil; @@ -75,8 +76,8 @@ public class AtsNavigateItemsToTaskEditorTest { Set<IAtsTeamDefinition> tda = TeamDefinitions.getTeamDefinitions(teamDefs, AtsClientService.get().getConfig()); runGeneralTaskSearchOnTeamTest(item, tda, 14); runGeneralTaskSearchOnAssigneeTest(item, "Joe Smith", 14); - runGeneralTaskSearchOnVersionTest(item, DemoSawBuilds.SAW_Bld_1.getName(), 0); - runGeneralTaskSearchOnVersionTest(item, DemoSawBuilds.SAW_Bld_2.getName(), 14); + runGeneralTaskSearchOnVersionTest(item, SAW_Bld_1.getName(), 0); + runGeneralTaskSearchOnVersionTest(item, SAW_Bld_2.getName(), 14); selectedUsers.clear(); runGeneralTaskSearchOnTeamTest(item, selectedUsers, 14); runGeneralTaskSearchOnAssigneeTest(item, "Kay Jones", 8); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToWorldViewTest.java index d091d5edb14..a2fd27bc42b 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToWorldViewTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/navigate/AtsNavigateItemsToWorldViewTest.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.navigate; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_2; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -32,7 +34,6 @@ import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.client.demo.DemoArtifactToken; import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; -import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.demo.DemoUsers; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.client.integration.tests.ats.config.AtsBranchConfigurationTest; @@ -438,8 +439,8 @@ public class AtsNavigateItemsToWorldViewTest { teamDefs.add("SAW Design"); Set<IAtsTeamDefinition> tda = TeamDefinitions.getTeamDefinitions(teamDefs, AtsClientService.get().getConfig()); runGeneralTeamWorkflowSearchOnTeamTest(item, tda, 3); - runGeneralTeamWorkflowSearchOnVersionTest(item, DemoSawBuilds.SAW_Bld_1.getName(), 0); - runGeneralTeamWorkflowSearchOnVersionTest(item, DemoSawBuilds.SAW_Bld_2.getName(), 3); + runGeneralTeamWorkflowSearchOnVersionTest(item, SAW_Bld_1.getName(), 0); + runGeneralTeamWorkflowSearchOnVersionTest(item, SAW_Bld_2.getName(), 3); selectedTeamDefs.clear(); runGeneralTeamWorkflowSearchOnTeamTest(item, selectedTeamDefs, 10); TestUtil.severeLoggingEnd(monitor); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java index e4cd5ba2ac2..939fecc7292 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.util; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -31,7 +32,6 @@ import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.client.demo.DemoActionableItems; import org.eclipse.osee.ats.client.demo.DemoArtifactTypes; -import org.eclipse.osee.ats.client.demo.DemoSawBuilds; import org.eclipse.osee.ats.client.demo.DemoTeam; import org.eclipse.osee.ats.client.demo.DemoWorkType; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; @@ -66,7 +66,7 @@ public class DemoTestUtil { public static Result isDbPopulatedWithDemoData() throws Exception { Collection<Artifact> robotArtifacts = ArtifactQuery.getArtifactListFromTypeAndName( - CoreArtifactTypes.SoftwareRequirement, "Robot", DemoSawBuilds.SAW_Bld_1, QueryOption.CONTAINS_MATCH_OPTIONS); + CoreArtifactTypes.SoftwareRequirement, "Robot", SAW_Bld_1, QueryOption.CONTAINS_MATCH_OPTIONS); if (robotArtifacts.size() < 6) { return new Result(String.format( "Expected at least 6 Software Requirements with name \"Robot\" but found [%s]. Database is not be populated with demo data.", diff --git a/plugins/org.eclipse.osee.disposition.rest.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.disposition.rest.test/META-INF/MANIFEST.MF index b95d36489e4..be80276719b 100644 --- a/plugins/org.eclipse.osee.disposition.rest.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.disposition.rest.test/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.disposition.rest Import-Package: org.apache.aries.blueprint;version="1.3.0", org.apache.cxf.jaxrs.impl;version="3.0.0", + org.eclipse.osee.client.demo, org.eclipse.osee.event, org.eclipse.osee.executor.admin, org.eclipse.osee.orcs.db.mock, diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java index c82f558cf8a..225b45fd421 100644 --- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java +++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionInitializer.java @@ -10,8 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.disposition.rest.integration.util; -import static org.eclipse.osee.disposition.rest.integration.util.DispositionTestUtil.SAW_Bld_1; +import static org.eclipse.osee.client.demo.DemoBranches.SAW_Bld_1; import static org.eclipse.osee.disposition.rest.integration.util.DispositionTestUtil.SAW_Bld_1_FOR_DISPO; +import org.eclipse.osee.client.demo.DemoBranches; import org.eclipse.osee.disposition.model.DispoProgram; import org.eclipse.osee.disposition.model.DispoSetDescriptorData; import org.eclipse.osee.disposition.model.DispoStrings; diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java index 05ea0e5c43a..ced8abf37df 100644 --- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java +++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionTestUtil.java @@ -27,7 +27,6 @@ public class DispositionTestUtil { public static final IOseeBranch SAW_Bld_1_FOR_DISPO = TokenFactory.createBranch(2323, "SAW_Bld_1 - FOR_DISPOSITION"); - public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch(3, "SAW_Bld_1"); // @formatter:on } |