Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2017-05-01 20:11:47 +0000
committerRyan Brooks2017-05-02 22:42:07 +0000
commitbb685bca14831ae5a00df9befe41dad175939335 (patch)
tree8ab42a814f8e2f3cacc340854e773c380dfbbf34 /plugins/org.eclipse.osee.orcs.db.test
parent0d4134d65900d07caabed328a64e74bc8089167c (diff)
downloadorg.eclipse.osee-bb685bca14831ae5a00df9befe41dad175939335.tar.gz
org.eclipse.osee-bb685bca14831ae5a00df9befe41dad175939335.tar.xz
org.eclipse.osee-bb685bca14831ae5a00df9befe41dad175939335.zip
refactor: Consolidate query context creation
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.db.test')
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java27
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java15
2 files changed, 22 insertions, 20 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java
index 2987d859bf8..df3ab6d0e4d 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/BranchQuerySqlContextFactoryImplTest.java
@@ -53,6 +53,7 @@ import org.eclipse.osee.orcs.db.internal.IdentityLocator;
import org.eclipse.osee.orcs.db.internal.search.Engines;
import org.eclipse.osee.orcs.db.internal.search.QuerySqlContext;
import org.eclipse.osee.orcs.db.internal.search.QuerySqlContextFactory;
+import org.eclipse.osee.orcs.db.internal.sql.QueryType;
import org.eclipse.osee.orcs.db.internal.sql.join.AbstractJoinQuery;
import org.eclipse.osee.orcs.db.internal.sql.join.IdJoinQuery;
import org.eclipse.osee.orcs.db.internal.sql.join.SqlJoinFactory;
@@ -124,7 +125,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(UUIDS, TYPES);
- QuerySqlContext context = queryEngine.createCountContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.COUNT);
assertEquals(expected, context.getSql());
@@ -153,7 +154,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(UUIDS, TYPES);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -178,7 +179,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(ALL_BRANCHES);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -201,7 +202,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(uuid(2L), type(SYSTEM_ROOT));
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -226,7 +227,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(name("Hello"));
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -250,7 +251,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(NAME_PATTERN);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -276,7 +277,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(STATE, IS_ARCHIVED);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -304,7 +305,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(state(CREATION_IN_PROGRESS), IS_ARCHIVED);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -335,7 +336,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(childOf(COMMON));
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -365,7 +366,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(ancestorOf(COMMON));
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -403,7 +404,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(STATE, IS_ARCHIVED, type(WORKING), childOf(COMMON), NAME_PATTERN);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -437,7 +438,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(new CriteriaMergeBranchFor(CoreBranches.SYSTEM_ROOT, COMMON));
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -462,7 +463,7 @@ public class BranchQuerySqlContextFactoryImplTest {
queryData.addCriteria(new CriteriaAssociatedArtId(DefaultHierarchyRoot));
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java
index ea78f18a8de..48ac292faa3 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/TxQuerySqlContextFactoryImplTest.java
@@ -41,6 +41,7 @@ import org.eclipse.osee.orcs.db.internal.IdentityLocator;
import org.eclipse.osee.orcs.db.internal.search.Engines;
import org.eclipse.osee.orcs.db.internal.search.QuerySqlContext;
import org.eclipse.osee.orcs.db.internal.search.QuerySqlContextFactory;
+import org.eclipse.osee.orcs.db.internal.sql.QueryType;
import org.eclipse.osee.orcs.db.internal.sql.join.AbstractJoinQuery;
import org.eclipse.osee.orcs.db.internal.sql.join.IdJoinQuery;
import org.eclipse.osee.orcs.db.internal.sql.join.SqlJoinFactory;
@@ -114,7 +115,7 @@ public class TxQuerySqlContextFactoryImplTest {
"txd1.transaction_id = jid1.id AND jid1.query_id = ?";
queryData.addCriteria(IDS);
- QuerySqlContext context = queryEngine.createCountContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.COUNT);
assertEquals(expected, context.getSql());
@@ -139,7 +140,7 @@ public class TxQuerySqlContextFactoryImplTest {
queryData.addCriteria(IDS);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -164,7 +165,7 @@ public class TxQuerySqlContextFactoryImplTest {
queryData.addCriteria(COMMENT);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -184,7 +185,7 @@ public class TxQuerySqlContextFactoryImplTest {
queryData.addCriteria(TYPES);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -213,7 +214,7 @@ public class TxQuerySqlContextFactoryImplTest {
queryData.addCriteria(TYPES, IDS);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -250,7 +251,7 @@ public class TxQuerySqlContextFactoryImplTest {
queryData.addCriteria(BRANCHIDS, IDS_WITH_OPERATOR, DATE_WITH_OPERATOR, AUTHORS, COMMITS);
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());
@@ -285,7 +286,7 @@ public class TxQuerySqlContextFactoryImplTest {
TransactionId tx = TransactionId.valueOf(3);
queryData.addCriteria(new CriteriaTxGetPrior(tx));
- QuerySqlContext context = queryEngine.createQueryContext(session, queryData);
+ QuerySqlContext context = queryEngine.createQueryContext(session, queryData, QueryType.SELECT);
assertEquals(expected, context.getSql());

Back to the top