Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2016-10-21 18:45:06 +0000
committerdonald.g.dunne2016-10-21 18:45:06 +0000
commitaa036762c7b5e177370544f95e7577bc080692a9 (patch)
tree759f2f5ebc8059a8825c8b3a36e78b662c478cbd /plugins/org.eclipse.osee.client.integration.tests
parentf974d7d5d6927da7ff7b62aca0e5b66e6aa90b04 (diff)
downloadorg.eclipse.osee-aa036762c7b5e177370544f95e7577bc080692a9.tar.gz
org.eclipse.osee-aa036762c7b5e177370544f95e7577bc080692a9.tar.xz
org.eclipse.osee-aa036762c7b5e177370544f95e7577bc080692a9.zip
refactor: Remove unnecessary ArtifactLinker
Diffstat (limited to 'plugins/org.eclipse.osee.client.integration.tests')
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java5
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockLinker.java53
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java4
3 files changed, 4 insertions, 58 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java
index 84b66d69cde..21d83984b54 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationCacheTest.java
@@ -14,7 +14,6 @@ import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.osee.client.integration.tests.integration.skynet.core.utils.MockIArtifact;
-import org.eclipse.osee.client.integration.tests.integration.skynet.core.utils.MockLinker;
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.OseeLogMonitor;
@@ -370,8 +369,8 @@ public class RelationCacheTest {
RelationType type = new RelationType(0x00L, "type name", artifactA.getName(), artifactB.getName(),
CoreArtifactTypes.Artifact, CoreArtifactTypes.Artifact, RelationTypeMultiplicity.MANY_TO_MANY, null);
- RelationLink link = new RelationLink(new MockLinker("linker"), artifactA.getArtId(), artifactB.getArtId(),
- testBranch, type, 77, 88, "", ModificationType.MODIFIED, ApplicabilityId.BASE);
+ RelationLink link = new RelationLink(artifactA.getArtId(), artifactB.getArtId(), testBranch, type, 77, 88, "",
+ ModificationType.MODIFIED, ApplicabilityId.BASE);
relCache.cache(artifactA, link);
relCache.cache(artifactB, link);
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
deleted file mode 100644
index 21e4d9543de..00000000000
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockLinker.java
+++ /dev/null
@@ -1,53 +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:
- *public static final CoreAttributeTypes Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.client.integration.tests.integration.skynet.core.utils;
-
-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;
-
-/**
- * @author Roberto E. Escobar
- */
-public class MockLinker implements ArtifactLinker {
-
- private final String name;
-
- public MockLinker(String name) {
- super();
- this.name = name;
- }
-
- public MockLinker() {
- this(null);
- }
-
- @Override
- public void updateCachedArtifact(int artId, BranchId branch) {
- //
- }
-
- @Override
- public Artifact getArtifact(int ArtId, BranchId branch) {
- return null;
- }
-
- @Override
- public String getLazyArtifactName(int aArtifactId, BranchId branch) {
- return name;
- }
-
- @Override
- public void deleteFromRelationOrder(Artifact aArtifact, Artifact bArtifact, IRelationType relationType) {
- //
- }
-} \ No newline at end of file
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 19aa80ca381..b847878b4e8 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
@@ -90,8 +90,8 @@ public final class TestUtil {
}
public static RelationLink createRelationLink(int relationId, int artA, int artB, Branch branch, RelationType relationType) {
- return new RelationLink(new MockLinker("Linker"), artA, artB, branch, relationType, relationId, 0,
- "relation: " + relationId, ModificationType.MODIFIED, ApplicabilityId.BASE);
+ return new RelationLink(artA, artB, branch, relationType, relationId, 0, "relation: " + relationId,
+ ModificationType.MODIFIED, ApplicabilityId.BASE);
}
public static List<RelationLink> createLinks(int total, Branch branch) {

Back to the top