diff options
Diffstat (limited to 'plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils')
4 files changed, 15 insertions, 15 deletions
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)); |