diff options
Diffstat (limited to 'plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee')
27 files changed, 83 insertions, 82 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java index 0ae8f145bbf..1f60bcae7da 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/define/ImportTraceUnitsOperationTest.java @@ -24,6 +24,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; import org.eclipse.osee.define.traceability.operations.ImportTraceUnitsOperation; +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.CoreArtifactTypes; @@ -88,7 +89,7 @@ public final class ImportTraceUnitsOperationTest { "Robot Interfaces", "Individual robot events", "Collaborative Robot"); private IOseeBranch branch; - private IOseeBranch importToBranch; + private BranchId importToBranch; private File testFile; @Before diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java index 302f9318317..c3a83519790 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactCacheQueryTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; @@ -67,7 +67,7 @@ public class ArtifactCacheQueryTest { private static final String[] ALL_STATIC_IDS = new String[] {STATIC_ID_AAA, STATIC_ID_BBB, STATIC_ID_CCC, STATIC_ID_DDD, STATIC_ID_EEE}; - private static final IOseeBranch branch = CoreBranches.COMMON; + private static final BranchId branch = CoreBranches.COMMON; @After public void tearDown() throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactLoaderTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactLoaderTest.java index bb146f1f814..7e5afa58e8f 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactLoaderTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactLoaderTest.java @@ -30,7 +30,7 @@ import org.eclipse.osee.client.integration.tests.integration.skynet.core.utils.T import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; @@ -71,7 +71,7 @@ public class ArtifactLoaderTest { private static final int TOTAL_THREADS = 7; private static final int NUM_ARTIFACTS = 100; private static final String ATTRIBUTE_VALUE = "now is the time"; - private static final IOseeBranch branch = CoreBranches.COMMON; + private static final BranchId branch = CoreBranches.COMMON; @After public void tearDown() throws Exception { diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactPurgeTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactPurgeTest.java index a3a8d96f044..0097aefb9ae 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactPurgeTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactPurgeTest.java @@ -41,7 +41,7 @@ import org.junit.Test; * equal.<br/> * <br/> * Test unit for {@link PurgeArtifacts} - * + * * @author Donald G. Dunne */ public class ArtifactPurgeTest { diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java index c1ac9983bdb..a6ad18ed3f8 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactQueryTest.java @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -33,7 +33,6 @@ import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.QueryOption; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; -import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.model.cache.BranchFilter; import org.eclipse.osee.framework.jdk.core.type.HashCollection; @@ -110,8 +109,7 @@ public class ArtifactQueryTest { public void testGetArtifactListFromType() throws OseeCoreException { // Should exist Set<Artifact> searchedArtifacts = new LinkedHashSet<>(); - List<IOseeBranch> branches = BranchManager.getBranches(new BranchFilter(BranchType.BASELINE)); - for (IOseeBranch branch : branches) { + for (BranchId branch : BranchManager.getBranches(new BranchFilter(BranchType.BASELINE))) { List<Artifact> results = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SoftwareRequirement, branch, DeletionFlag.INCLUDE_DELETED); searchedArtifacts.addAll(results); @@ -180,7 +178,7 @@ public class ArtifactQueryTest { @Test public void testGetOrCreate() throws Exception { String guid = GUID.create(); - IOseeBranch branch = BranchManager.createTopLevelBranch(testInfo.getTestName() + " branch"); + BranchId branch = BranchManager.createTopLevelBranch(testInfo.getTestName() + " branch"); Artifact artifact1 = ArtifactQuery.getOrCreate(guid, CoreArtifactTypes.GeneralData, branch); Assert.assertNotNull(artifact1); Artifact artifact2 = ArtifactQuery.getOrCreate(guid, CoreArtifactTypes.GeneralData, branch); @@ -192,7 +190,7 @@ public class ArtifactQueryTest { @Test public void testLargeAttributeIndexing() throws Exception { String guid = GUID.create(); - IOseeBranch branch = BranchManager.createTopLevelBranch(testInfo.getTestName() + " branch"); + BranchId branch = BranchManager.createTopLevelBranch(testInfo.getTestName() + " branch"); Artifact artifact1 = ArtifactQuery.getOrCreate(guid, CoreArtifactTypes.GeneralData, branch); artifact1.setSoleAttributeFromString(CoreAttributeTypes.Name, longStr()); artifact1.persist(testInfo.getTestName()); @@ -207,7 +205,7 @@ public class ArtifactQueryTest { @Test public void testQueryById() throws OseeCoreException { - IOseeBranch branch = BranchManager.createTopLevelBranch(testInfo.getTestName() + " branch"); + BranchId branch = BranchManager.createTopLevelBranch(testInfo.getTestName() + " branch"); List<Integer> newIdsInOrder = new LinkedList<>(); Map<Integer, TransactionRecord> idToTxId = new HashMap<>(); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java index facf5b3b8e7..e62f045d34f 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java @@ -60,7 +60,7 @@ public class BranchEventTest { public TestInfo method = new TestInfo(); private IOseeBranch mainBranch; - private IOseeBranch topLevel; + private BranchId topLevel; private BranchEventListener branchEventListener; @@ -252,9 +252,9 @@ public class BranchEventTest { return workingBranch; } - private IOseeBranch testEvents__topLevelAdded() throws Exception { + private BranchId testEvents__topLevelAdded() throws Exception { branchEventListener.reset(); - IOseeBranch branch = BranchManager.createTopLevelBranch(mainBranch); + BranchId branch = BranchManager.createTopLevelBranch(mainBranch); Assert.assertNotNull(branch); verifyReceivedBranchStatesEvent(branchEventListener.getFirstResults(), BranchEventType.Added, mainBranch); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchPurgeTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchPurgeTest.java index b6b1a398229..94fc38e978b 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchPurgeTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchPurgeTest.java @@ -20,6 +20,7 @@ import org.eclipse.osee.client.integration.tests.integration.skynet.core.utils.T import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; +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.CoreArtifactTypes; @@ -43,7 +44,7 @@ import org.junit.Test; * This test is intended to be run against a demo database. It tests the branch purge logic by counting the rows of the * version and txs tables, creating a branch, making changes and then purging the branch. If it works properly, all rows * should be equal. - * + * * @author Donald G. Dunne */ public class BranchPurgeTest { @@ -83,7 +84,7 @@ public class BranchPurgeTest { Map<String, Integer> initialRowCount = TestUtil.getTableRowCounts(TABLES); - IOseeBranch branch = BranchManager.createWorkingBranch(SAW_Bld_2, workingBranch); + BranchId branch = BranchManager.createWorkingBranch(SAW_Bld_2, workingBranch); Collection<Artifact> softArts = TestUtil.createSimpleArtifacts(CoreArtifactTypes.SoftwareRequirement, 10, method.getQualifiedTestName(), branch); Artifacts.persistInTransaction("Test purge branch", softArts); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchStateTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchStateTest.java index 0bf5c11ebaa..c4257a563cf 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchStateTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchStateTest.java @@ -23,6 +23,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.client.integration.tests.integration.skynet.core.utils.Asserts; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -365,7 +366,7 @@ public class BranchStateTest { if (workingBranch != null) { purgeBranchAndChildren(workingBranch); } - for (IOseeBranch branch : BranchManager.getBranchesByName(originalBranchName)) { + for (BranchId branch : BranchManager.getBranchesByName(originalBranchName)) { purgeBranchAndChildren(branch); } if (toDelete != null && toDelete.length > 0) { @@ -376,7 +377,7 @@ public class BranchStateTest { } } - private void purgeBranchAndChildren(IOseeBranch branch) throws OseeCoreException { + private void purgeBranchAndChildren(BranchId branch) throws OseeCoreException { for (Branch child : BranchManager.getBranch(branch).getChildBranches(true)) { BranchManager.purgeBranch(child); } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ChangeDataTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ChangeDataTest.java index bedf4710a78..2166e569ead 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ChangeDataTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ChangeDataTest.java @@ -19,7 +19,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.ModificationType; @@ -54,7 +54,7 @@ public class ChangeDataTest { @Rule public TestInfo method = new TestInfo(); - private IOseeBranch workingBranch; + private BranchId workingBranch; private ChangeData theData; @Before diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/FrameworkEventToRemoteEventListenerTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/FrameworkEventToRemoteEventListenerTest.java index a4c233dc466..ffe218741df 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/FrameworkEventToRemoteEventListenerTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/FrameworkEventToRemoteEventListenerTest.java @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.List; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBasicGuidArtifact1; @@ -50,7 +50,7 @@ public class FrameworkEventToRemoteEventListenerTest { @Rule public OseeLogMonitorRule monitorRule = new OseeLogMonitorRule(); - private static final IOseeBranch BRANCH = SAW_Bld_1; + private static final BranchId BRANCH = SAW_Bld_1; private static final String ARTIFACT_NAME_1 = FrameworkEventToRemoteEventListenerTest.class.getSimpleName() + ".Edit1"; private static final int newArtTx = 12345; @@ -124,7 +124,7 @@ public class FrameworkEventToRemoteEventListenerTest { return remoteEvent; } - private static Artifact createArtifact(IOseeBranch branch, String artifactName) throws OseeCoreException { + private static Artifact createArtifact(BranchId branch, String artifactName) throws OseeCoreException { Assert.assertNotNull(branch); Assert.assertNotNull(artifactName); Artifact artifact = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, branch, artifactName); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/PurgeTransactionTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/PurgeTransactionTest.java index f3ed77e560c..e667afba55b 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/PurgeTransactionTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/PurgeTransactionTest.java @@ -21,7 +21,7 @@ import org.eclipse.osee.client.integration.tests.integration.skynet.core.utils.A import org.eclipse.osee.client.integration.tests.integration.skynet.core.utils.TestUtil; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.operation.IOperation; @@ -50,7 +50,7 @@ public class PurgeTransactionTest { @Rule public OseeLogMonitorRule monitorRule = new OseeLogMonitorRule(); - private static final IOseeBranch BRANCH = SAW_Bld_2; + private static final BranchId BRANCH = SAW_Bld_2; private static final String[] TABLES = new String[] {"osee_attribute", "osee_artifact", "osee_relation_link", "osee_tx_details", "osee_txs"}; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationDeletionTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationDeletionTest.java index 10e067810a1..865d76a9745 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationDeletionTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationDeletionTest.java @@ -20,7 +20,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeHousekeepingRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.operation.Operations; @@ -123,7 +123,7 @@ public class RelationDeletionTest { } - private Artifact createArtifact(IArtifactType artifactType, IOseeBranch branch) throws OseeCoreException { + private Artifact createArtifact(IArtifactType artifactType, BranchId branch) throws OseeCoreException { Artifact newArtifact = ArtifactTypeManager.addArtifact(artifactType, branch); artifacts.add(newArtifact); return newArtifact; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderingTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderingTest.java index 4ee4490ac30..06bd1709cea 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderingTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderingTest.java @@ -20,7 +20,7 @@ import java.util.Set; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; @@ -56,7 +56,7 @@ public class RelationOrderingTest { @Rule public TestInfo method = new TestInfo(); - private static final IOseeBranch branch = CoreBranches.COMMON; + private static final BranchId branch = CoreBranches.COMMON; private Set<Artifact> itemsToDelete; private Artifact parent; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/SkynetTransactionTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/SkynetTransactionTest.java index dcb0c84f1d4..05cbbf11f84 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/SkynetTransactionTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/SkynetTransactionTest.java @@ -19,7 +19,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeHousekeepingRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; @@ -218,13 +218,13 @@ public final class SkynetTransactionTest { } private class WorkerThread extends Thread { - private final IOseeBranch branch; + private final BranchId branch; private final Object lock; private final Set<Artifact> data = new HashSet<>(); private Throwable ex; private final WorkerType workerType; - public WorkerThread(Object lock, IOseeBranch branch, WorkerType workerType) { + public WorkerThread(Object lock, BranchId branch, WorkerType workerType) { this.lock = lock; this.branch = branch; this.workerType = workerType; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/UserManagerTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/UserManagerTest.java index f999310bb19..5374a1cbcfb 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/UserManagerTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/UserManagerTest.java @@ -16,7 +16,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IUserToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -105,7 +105,7 @@ public final class UserManagerTest { return user; } - private void createSampleDefaultGroups(IOseeBranch branch, String... names) throws OseeCoreException { + private void createSampleDefaultGroups(BranchId branch, String... names) throws OseeCoreException { for (String name : names) { //Create artifact Artifact groupArt = ArtifactTypeManager.addArtifact(CoreArtifactTypes.UserGroup, branch, name); @@ -121,7 +121,7 @@ public final class UserManagerTest { } } - private void deleteSampleDefaultGroups(IOseeBranch branch, String... artifactNames) throws OseeCoreException { + private void deleteSampleDefaultGroups(BranchId branch, String... artifactNames) throws OseeCoreException { Collection<Artifact> list = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.UserGroup, branch); for (Artifact artifact : list) { for (String artifactName : artifactNames) { diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java index 8743ce238f8..725c58d3b06 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java @@ -19,7 +19,7 @@ import java.util.List; import org.eclipse.osee.client.integration.tests.integration.skynet.core.ConflictDeletionTest; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; @@ -115,11 +115,11 @@ public class ConflictTestManager { protected Object object; protected Object object2; protected Class<?> clas; - protected IOseeBranch branch; + protected BranchId branch; protected int rootArtifact; protected IArtifactType type; - protected ArtifactModification(Type itemToChange, Modification modificationToPerform, int rootArtifact, IOseeBranch branch, IArtifactType type, String name) throws OseeCoreException { + protected ArtifactModification(Type itemToChange, Modification modificationToPerform, int rootArtifact, BranchId branch, IArtifactType type, String name) throws OseeCoreException { if (!itemToChange.equals(Type.ARTIFACT)) { throw new OseeCoreException("This is the Artifact Constructor"); } @@ -292,7 +292,7 @@ public class ConflictTestManager { } } - protected static Artifact createArtifact(int rootArtifactId, IOseeBranch branch, IArtifactType type, String name) throws OseeCoreException { + protected static Artifact createArtifact(int rootArtifactId, BranchId branch, IArtifactType type, String name) throws OseeCoreException { Artifact rootArtifact = ArtifactQuery.getArtifactFromAttribute(CoreAttributeTypes.Name, FOLDER, branch); if (rootArtifactId > 0 && rootArtifactId < NUMBER_OF_ARTIFACTS) { if (branch.equals(destArtifacts[0].getBranch())) { diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockIArtifact.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockIArtifact.java index 47a139dd4d0..911f3194fa2 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockIArtifact.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockIArtifact.java @@ -12,7 +12,7 @@ package org.eclipse.osee.client.integration.tests.integration.skynet.core.utils; import java.util.Collections; import java.util.List; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.model.RelationTypeSide; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.type.NamedIdentity; @@ -27,10 +27,10 @@ public class MockIArtifact extends NamedIdentity<String>implements IArtifact { private boolean wasGetFullArtifactCalled; private final int uniqueId; private final ArtifactType artifactType; - private final IOseeBranch branch; + private final BranchId branch; // MockObject do not change to use tokens - public MockIArtifact(int uniqueId, String name, String guid, IOseeBranch branch, ArtifactType artifactType) { + public MockIArtifact(int uniqueId, String name, String guid, BranchId branch, ArtifactType artifactType) { super(guid, name); this.uniqueId = uniqueId; this.branch = branch; @@ -57,7 +57,7 @@ public class MockIArtifact extends NamedIdentity<String>implements IArtifact { } @Override - public IOseeBranch getBranch() { + public BranchId getBranch() { return branch; } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockLinker.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockLinker.java index 2ea83cece93..21e4d9543de 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockLinker.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockLinker.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.client.integration.tests.integration.skynet.core.utils; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationLink.ArtifactLinker; @@ -32,17 +32,17 @@ public class MockLinker implements ArtifactLinker { } @Override - public void updateCachedArtifact(int artId, IOseeBranch branch) { + public void updateCachedArtifact(int artId, BranchId branch) { // } @Override - public Artifact getArtifact(int ArtId, IOseeBranch branch) { + public Artifact getArtifact(int ArtId, BranchId branch) { return null; } @Override - public String getLazyArtifactName(int aArtifactId, IOseeBranch branch) { + public String getLazyArtifactName(int aArtifactId, BranchId branch) { return name; } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java index 736ce5bc0b5..8fc2c9b971d 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import java.util.Random; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -50,7 +50,7 @@ public final class TestUtil { /** * Creates a simple artifact and adds it to the root artifact default hierarchical relation */ - public static Artifact createSimpleArtifact(IArtifactType artifactType, String name, IOseeBranch branch) throws OseeCoreException { + public static Artifact createSimpleArtifact(IArtifactType artifactType, String name, BranchId branch) throws OseeCoreException { Artifact softArt = ArtifactTypeManager.addArtifact(artifactType, branch); softArt.setName(name); if (softArt.isAttributeTypeValid(CoreAttributeTypes.Subsystem)) { @@ -61,7 +61,7 @@ public final class TestUtil { return softArt; } - public static Collection<Artifact> createSimpleArtifacts(IArtifactType artifactType, int numArts, String name, IOseeBranch branch) throws OseeCoreException { + public static Collection<Artifact> createSimpleArtifacts(IArtifactType artifactType, int numArts, String name, BranchId branch) throws OseeCoreException { List<Artifact> arts = new ArrayList<>(); for (int x = 1; x < numArts + 1; x++) { arts.add(createSimpleArtifact(artifactType, name + " " + x, branch)); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AbstractEditTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AbstractEditTest.java index 1f6482d4ebb..e57f658574d 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AbstractEditTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AbstractEditTest.java @@ -24,8 +24,8 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -63,13 +63,13 @@ public abstract class AbstractEditTest { public TestInfo method = new TestInfo(); private final String editFile; - private final IOseeBranch branch; + private final BranchId branch; private final IArtifactType artType; private final FileSystemRenderer renderer; private Artifact artifact; - protected AbstractEditTest(IOseeBranch branch, String editFile, IArtifactType artType, FileSystemRenderer renderer) { + protected AbstractEditTest(BranchId branch, String editFile, IArtifactType artType, FileSystemRenderer renderer) { this.branch = branch; this.editFile = editFile; this.artType = artType; @@ -91,7 +91,7 @@ public abstract class AbstractEditTest { } } - private Artifact createArtifact(IOseeBranch branch, IArtifactType artType, String artifactName) throws OseeCoreException { + private Artifact createArtifact(BranchId branch, IArtifactType artType, String artifactName) throws OseeCoreException { Assert.assertNotNull(branch); Assert.assertNotNull(artifactName); Artifact artifact = ArtifactTypeManager.addArtifact(artType, branch, artifactName); @@ -119,7 +119,7 @@ public abstract class AbstractEditTest { } private IFile openArtifactForEdit(FileSystemRenderer renderer, Artifact artifact) throws OseeCoreException { - IFile editFile = renderer.renderToFile(artifact, artifact.getBranch(), PresentationType.SPECIALIZED_EDIT); + IFile editFile = renderer.renderToFile(artifact, artifact.getBranchToken(), PresentationType.SPECIALIZED_EDIT); Assert.assertNotNull(editFile); return editFile; } @@ -155,7 +155,7 @@ public abstract class AbstractEditTest { Assert.assertNotNull(artifact); IFile renderedFileFromModifiedStorage = - renderer.renderToFile(artifact, artifact.getBranch(), PresentationType.SPECIALIZED_EDIT); + renderer.renderToFile(artifact, artifact.getBranchToken(), PresentationType.SPECIALIZED_EDIT); Assert.assertNotNull(renderedFileFromModifiedStorage); InputStream inputStream = null; try { diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/HtmlRendererTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/HtmlRendererTest.java index dc5365ec302..39ff589a64b 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/HtmlRendererTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/HtmlRendererTest.java @@ -18,7 +18,7 @@ import java.util.List; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -57,7 +57,7 @@ public class HtmlRendererTest { private final static String LEGACY_ID = "ABC-123,ABC-234"; private final static String PARAGRAPH_NUMBER = "1.2.3.4"; - private IOseeBranch rootBranch; + private BranchId rootBranch; private List<Artifact> theArtifacts = null; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java index 120d9f4953f..ed6bba8666e 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java @@ -41,7 +41,7 @@ import org.junit.Test; /** * Tests cross branch drag and drop. - * + * * @author Jeff C. Phillips * @author Megumi Telles */ diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/PreviewAndMultiPreviewTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/PreviewAndMultiPreviewTest.java index 6a1ab5c2102..96bfdaef57c 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/PreviewAndMultiPreviewTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/PreviewAndMultiPreviewTest.java @@ -18,7 +18,7 @@ import java.util.List; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -187,7 +187,7 @@ public class PreviewAndMultiPreviewTest { RendererManager.openInJob(Arrays.asList(art), PresentationType.PREVIEW); } - private Artifact createArtifact(IArtifactType type, IOseeBranch branch, String name) throws OseeCoreException { + private Artifact createArtifact(IArtifactType type, BranchId branch, String name) throws OseeCoreException { Artifact artifact = ArtifactTypeManager.addArtifact(type, branch, name); Assert.assertNotNull(artifact); testArtifacts.add(artifact); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java index 202acdbcbc0..9974c6634e8 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java @@ -15,7 +15,7 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; @@ -58,8 +58,8 @@ public class RelationIntegrityCheckTest { private final DoubleKeyHashMap<Integer, Integer, LocalRelationLink> map = new DoubleKeyHashMap<Integer, Integer, LocalRelationLink>(); - private IOseeBranch parentBranch; - private IOseeBranch workingBranch; + private BranchId parentBranch; + private BranchId workingBranch; @Before public void setUp() throws Exception { diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java index 3d808172ac2..1fa04cb0170 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -116,8 +116,8 @@ public final class ReplaceWithBaselineTest { private static enum ChangeItem { NEW, DELETED, MODIFIED, MOVED, INTRODUCED, RELATION_ORDER_ATTR }; //@formatter:on - private IOseeBranch workingBranch; - private IOseeBranch baselineBranch; + private BranchId workingBranch; + private BranchId baselineBranch; private final String testName; private final int expectedChangesLeft; @@ -308,7 +308,7 @@ public final class ReplaceWithBaselineTest { testData.setArtifactId(createNewArtifact(workingBranch, GUID.create()).getArtId()); break; case INTRODUCED: - IOseeBranch anotherBranch = BranchManager.createWorkingBranch(workingBranch, + BranchId anotherBranch = BranchManager.createWorkingBranch(workingBranch, "another working branch", UserManager.getUser(SystemUser.OseeSystem)); Artifact artifactToIntroduce = createNewArtifact(anotherBranch, "introduce artifact"); @@ -438,7 +438,7 @@ public final class ReplaceWithBaselineTest { } - private Artifact createNewArtifact(IOseeBranch branch, String name) throws Exception { + private Artifact createNewArtifact(BranchId branch, String name) throws Exception { Artifact artifact = ArtifactTypeManager.addArtifact(DOC, branch, name); artifact.persist(testName + name); return artifact; @@ -459,7 +459,7 @@ public final class ReplaceWithBaselineTest { Operations.executeWorkAndCheckStatus(new ReplaceAttributeWithBaselineOperation(attrChanges)); } - private List<Change> getBranchChanges(IOseeBranch branch) throws OseeCoreException { + private List<Change> getBranchChanges(BranchId branch) throws OseeCoreException { List<Change> changes = new ArrayList<>(); Operations.executeWorkAndCheckStatus(ChangeManager.comparedToParent(branch, changes), MONITOR); return changes; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ViewWordChangeAndDiffTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ViewWordChangeAndDiffTest.java index 01cb990b60a..0e960208375 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ViewWordChangeAndDiffTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ViewWordChangeAndDiffTest.java @@ -25,7 +25,7 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.framework.access.AccessControlManager; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.core.operation.IOperation; @@ -60,7 +60,7 @@ public final class ViewWordChangeAndDiffTest { public OseeLogMonitorRule monitorRule = new OseeLogMonitorRule(); private IFolder renderFolder; - private IOseeBranch branch; + private BranchId branch; @Before public void setUp() throws Exception { @@ -138,7 +138,7 @@ public final class ViewWordChangeAndDiffTest { assertTrue("Single Native Diff test passed", true); } - private static Collection<Change> getChanges(IOseeBranch testBranch) throws OseeCoreException { + private static Collection<Change> getChanges(BranchId testBranch) throws OseeCoreException { Collection<Change> changes = new ArrayList<>(); IOperation operation = ChangeManager.comparedToParent(testBranch, changes); Operations.executeWorkAndCheckStatus(operation); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateRendererTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateRendererTest.java index e96af881be2..08c72df3e9c 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateRendererTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateRendererTest.java @@ -22,7 +22,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; @@ -100,8 +100,8 @@ public class WordTemplateRendererTest { private static String SLAVE_RENDERER_OPTIONS = "{\"ElementType\" : \"Artifact\", \"OutliningOptions\" : [{\"Outlining\" : true, \"RecurseChildren\" : true, \"HeadingAttributeType\" : \"Name\", \"ArtifactName\" : \"srsProducer.objects\", \"OutlineNumber\" : \"\" }], \"AttributeOptions\" : [{\"AttrType\" : \"Partition\", \"Label\" : \"<w:r><w:t>Partition:</w:t></w:r>\", \"FormatPre\" : \">x<\", \"FormatPost\" : \"\"}, {\"AttrType\" : \"Development Assurance Level\", \"Label\" : \"<w:r><w:t>Development Assurance Level:</w:t></w:r>\", \"FormatPre\" : \">x<\", \"FormatPost\" : \"\"}, {\"AttrType\" : \"Word Template Content\", \"Label\" : \"\", \"FormatPre\" : \"\", \"FormatPost\" : \"\"}]}"; - private IOseeBranch rootBranch; - private IOseeBranch updateBranch; + private BranchId rootBranch; + private BranchId updateBranch; private Artifact docFolder; private Artifact swReqFolder; private Artifact templateFolder; @@ -198,7 +198,7 @@ public class WordTemplateRendererTest { @Test public void testBlankWordTemplateContent() { - IOseeBranch rootBr = BranchManager.createTopLevelBranch("Root Branch"); + BranchId rootBr = BranchManager.createTopLevelBranch("Root Branch"); SkynetTransaction tx = TransactionManager.createTransaction(rootBr, String.format("%s", method.getQualifiedTestName())); Artifact vol4 = ArtifactTypeManager.addArtifact(CoreArtifactTypes.HeadingMSWord, rootBr, "Volume 4"); @@ -622,7 +622,7 @@ public class WordTemplateRendererTest { } // Create the folder to store the templates - private void setupTemplates(Artifact folder, IOseeBranch branch) throws OseeCoreException { + private void setupTemplates(Artifact folder, BranchId branch) throws OseeCoreException { recurseTemplate = ArtifactTypeManager.addArtifact(CoreArtifactTypes.RendererTemplate, branch, "Recurse Template"); recurseTemplate.setSoleAttributeValue(CoreAttributeTypes.WholeWordContent, RECURSE_TEMPLATE_STRING); recurseTemplate.addAttributeFromString(CoreAttributeTypes.TemplateMatchCriteria, @@ -679,7 +679,7 @@ public class WordTemplateRendererTest { | |---- Ventilation */ //@formatter:on - private void setUpSWReq(Artifact swReqFolder, IOseeBranch branch) throws OseeCoreException { + private void setUpSWReq(Artifact swReqFolder, BranchId branch) throws OseeCoreException { Artifact crewReq = ArtifactTypeManager.addArtifact(CoreArtifactTypes.HeadingMSWord, branch, "Crew Station Requirements"); Artifact commReq = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, branch, @@ -728,7 +728,7 @@ public class WordTemplateRendererTest { |---- More Notes */ //@formatter:on - private void setUpDocFolder(Artifact docFolder, IOseeBranch branch) throws OseeCoreException { + private void setUpDocFolder(Artifact docFolder, BranchId branch) throws OseeCoreException { Artifact intro = ArtifactTypeManager.addArtifact(CoreArtifactTypes.HeadingMSWord, branch, "Introduction"); Artifact background = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SubsystemDesign, branch, "Background"); Artifact scope = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SubsystemDesign, branch, "Scope"); |