diff options
Diffstat (limited to 'plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration')
5 files changed, 13 insertions, 11 deletions
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 5f0ac6c6b8b..ccc2e24d281 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 @@ -22,7 +22,7 @@ import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.demo.api.DemoActionableItems; import org.eclipse.osee.ats.demo.api.DemoWorkType; import org.eclipse.osee.framework.core.data.IAccessContextId; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -48,7 +48,7 @@ public class AtsBranchAccessManagerTest { (TeamWorkFlowArtifact) DemoTestUtil.getUncommittedActionWorkflow(DemoWorkType.Requirements); Assert.assertNotNull(teamArt); - IOseeBranch branch = AtsClientService.get().getBranchService().getWorkingBranch(teamArt); + BranchId branch = AtsClientService.get().getBranchService().getWorkingBranch(teamArt); Assert.assertNotNull(branch); Assert.assertTrue(mgr.isApplicable(branch)); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java index 4aaca7120bd..114a0c3944e 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.actions; import org.eclipse.osee.ats.actions.ShowMergeManagerAction; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; @@ -29,7 +29,7 @@ import org.junit.Test; @Ignore public class ShowMergeManagerActionTest extends AbstractAtsActionRunTest { - private static IOseeBranch createdBranch = null; + private static BranchId createdBranch = null; @After public void cleanup_closeMergeView() { diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java index c2d0aa12d22..7dad5e7ab6f 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/AtsBranchConfigurationTest.java @@ -36,6 +36,7 @@ import org.eclipse.osee.ats.core.workflow.transition.TeamWorkFlowManager; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchArchivedState; @@ -119,7 +120,7 @@ public class AtsBranchConfigurationTest { OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Creating root branch"); } // Create SAW_Bld_2 branch off SAW_Bld_1 - IOseeBranch viaTeamDefBranch = BranchManager.createTopLevelBranch(BRANCH_VIA_VERSIONS); + BranchId viaTeamDefBranch = BranchManager.createTopLevelBranch(BRANCH_VIA_VERSIONS); TestUtil.sleep(2000); @@ -240,7 +241,7 @@ public class AtsBranchConfigurationTest { OseeLog.log(AtsBranchConfigurationTest.class, Level.INFO, "Creating root branch"); } // Create SAW_Bld_2 branch off SAW_Bld_1 - IOseeBranch viaTeamDefBranch = BranchManager.createTopLevelBranch(BRANCH_VIA_TEAM_DEFINITION); + BranchId viaTeamDefBranch = BranchManager.createTopLevelBranch(BRANCH_VIA_TEAM_DEFINITION); TestUtil.sleep(2000); 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 1d3bad8704b..affba917b55 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 @@ -67,7 +67,7 @@ import org.eclipse.osee.ats.core.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.task.TaskEditor; import org.eclipse.osee.ats.world.WorldEditor; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.QueryOption; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeWrappedException; @@ -485,7 +485,7 @@ public class AtsTestUtil { TaskEditor.closeAll(); if (teamWf != null) { - IOseeBranch workingBranch = teamWf.getWorkingBranch(); + BranchId workingBranch = teamWf.getWorkingBranch(); if (workingBranch != null) { BranchManager.deleteBranchAndPend(workingBranch); } diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java index 90932de9de0..3cbb0950226 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/resource/WordUpdateEndpointImplTest.java @@ -22,6 +22,7 @@ import org.eclipse.osee.define.report.api.WordArtifactChange; import org.eclipse.osee.define.report.api.WordUpdateChange; import org.eclipse.osee.define.report.api.WordUpdateData; import org.eclipse.osee.define.report.api.WordUpdateEndpoint; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -46,7 +47,7 @@ import org.junit.Test; */ public class WordUpdateEndpointImplTest extends AbstractRestTest { private Artifact artReqt = null; - private IOseeBranch branch = null; + private BranchId branch = null; @AfterClass public static void cleanup() { @@ -127,8 +128,8 @@ public class WordUpdateEndpointImplTest extends AbstractRestTest { return change; } - private IOseeBranch getWorkingBranch() { - IOseeBranch branchReturn = null; + private BranchId getWorkingBranch() { + BranchId branchReturn = null; BranchFilter branchFilter = new BranchFilter(BranchType.WORKING); List<IOseeBranch> branches = BranchManager.getBranches(branchFilter); for (IOseeBranch branch : branches) { |