refactor[ats_ATS56804]: Simplify artifact searching options

Change-Id: I93ad48c6b43f411cc1349f621b9dea87e318f062

1 files changed, 7 insertions, 11 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteriaTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteriaTest.java
index 9d549c6fc27..837c28d7ee5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteriaTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteriaTest.java
@@ -10,12 +10,13 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.skynet.core.artifact.search;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
 import java.util.Arrays;
 import java.util.List;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.Operator;
-import org.eclipse.osee.framework.core.enums.TokenOrderType;
+import org.eclipse.osee.framework.core.enums.QueryOption;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.orcs.rest.client.QueryBuilder;
 import org.junit.Test;
@@ -36,17 +37,12 @@ public class AttributeCriteriaTest {
       List<String> values = Arrays.asList("true", "false");
       criteria = new AttributeCriteria(CoreAttributeTypes.Active, values);
       criteria.addToQueryBuilder(builder);
-      verify(builder).and(CoreAttributeTypes.Active, Operator.EQUAL, values);
+      verify(builder).and(CoreAttributeTypes.Active, values);
 
       reset(builder);
-      criteria = new AttributeCriteria(CoreAttributeTypes.Active, "true", Operator.LESS_THAN);
+      criteria = new AttributeCriteria(CoreAttributeTypes.Active, "true", QueryOption.TOKEN_MATCH_ORDER__ANY);
       criteria.addToQueryBuilder(builder);
-      verify(builder).and(CoreAttributeTypes.Active, Operator.LESS_THAN, "true");
-
-      reset(builder);
-      criteria = new AttributeCriteria(CoreAttributeTypes.Active, "true", TokenOrderType.ANY_ORDER);
-      criteria.addToQueryBuilder(builder);
-      verify(builder).and(CoreAttributeTypes.Active, "true", TokenOrderType.ANY_ORDER);
+      verify(builder).and(CoreAttributeTypes.Active, "true", QueryOption.TOKEN_MATCH_ORDER__ANY);
 
       reset(builder);
       criteria = new AttributeCriteria(CoreAttributeTypes.Active, "true");