Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2016-09-22 22:29:12 +0000
committerdonald.g.dunne2016-09-22 22:29:12 +0000
commit62746f32e3bf88a6ca55df839b64a9887763fe7f (patch)
treef7679ab1ff16ea9675fd7083e002ab1ab20bc3d1 /plugins/org.eclipse.osee.orcs.rest.test
parentd017cc5715cbf2944b65a5e11287117e772e7d45 (diff)
downloadorg.eclipse.osee-62746f32e3bf88a6ca55df839b64a9887763fe7f.tar.gz
org.eclipse.osee-62746f32e3bf88a6ca55df839b64a9887763fe7f.tar.xz
org.eclipse.osee-62746f32e3bf88a6ca55df839b64a9887763fe7f.zip
refactor: Consolidate IRelationTypeSide and RelationTypeSide
- Automated refactor to remove IRelationTypeSide and move - RelationTypeSide to a more appropriate package. Change-Id: Ib35e9d5306b78bc71fdcd40ea2bb482b0e88ef3c
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.rest.test')
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java
index 6829e2140f1..285f2933bf2 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.List;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.rest.internal.search.artifact.predicate.ExistenceTypePredicateHandler;
@@ -155,7 +155,7 @@ public class ExistenceTypePredicateHandlerTest {
values = Collections.singletonList(value);
testPredicate = new Predicate(SearchMethod.EXISTS_TYPE, typeParameters, values, QueryOption.TOKEN_DELIMITER__ANY);
handler.handle(builder, testPredicate);
- verify(builder, never()).andExists(any(IRelationTypeSide.class));
+ verify(builder, never()).andExists(any(RelationTypeSide.class));
}
@Test(expected = OseeCoreException.class)
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java
index 90fec4bb2be..1a4fd8d3b6d 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java
@@ -16,7 +16,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -43,7 +43,7 @@ public class RelatedToPredicateHandlerTest {
@Captor
private ArgumentCaptor<Collection<ArtifactId>> idsCaptor;
@Captor
- private ArgumentCaptor<IRelationTypeSide> rtsCaptor;
+ private ArgumentCaptor<RelationTypeSide> rtsCaptor;
@Before
public void initialize() {
@@ -57,7 +57,7 @@ public class RelatedToPredicateHandlerTest {
Arrays.asList("4", "5"), QueryOption.TOKEN_DELIMITER__ANY);
handler.handle(builder, testPredicate);
verify(builder, times(2)).andRelatedTo(rtsCaptor.capture(), idsCaptor.capture());
- List<IRelationTypeSide> rts = rtsCaptor.getAllValues();
+ List<RelationTypeSide> rts = rtsCaptor.getAllValues();
Assert.assertEquals(2, rts.size());
verifyRelationTypeSide(rts.get(0), "A1");
verifyRelationTypeSide(rts.get(1), "B2");
@@ -75,7 +75,7 @@ public class RelatedToPredicateHandlerTest {
handler.handle(builder, testPredicate);
}
- private void verifyRelationTypeSide(IRelationTypeSide rts, String input) {
+ private void verifyRelationTypeSide(RelationTypeSide rts, String input) {
if (input.startsWith("A")) {
Assert.assertEquals(RelationSide.SIDE_A, rts.getSide());
} else {

Back to the top