diff options
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.db.test/src')
4 files changed, 11 insertions, 23 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImplTest.java index f20e2b5b6d6..f5874d4b2c4 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImplTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImplTest.java @@ -30,7 +30,6 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.LoadLevel; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.cache.BranchCache; -import org.eclipse.osee.framework.core.services.IOseeCachingService; import org.eclipse.osee.framework.core.services.IdentityService; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.AbstractJoinQuery; @@ -68,7 +67,6 @@ public class DataLoaderImplTest { @Mock private IdentityService identityService; @Mock private SqlProvider sqlProvider; - @Mock private IOseeCachingService cacheService; @Mock private ArtifactBuilder builder; @@ -98,13 +96,11 @@ public class DataLoaderImplTest { DataModuleFactory module = new DataModuleFactory(logger); - when(cacheService.getBranchCache()).thenReturn(branchCache); - - SqlHandlerFactory handlerFactory = module.createHandlerFactory(identityService, cacheService); + SqlHandlerFactory handlerFactory = module.createHandlerFactory(identityService); SqlArtifactLoader loader = module.createArtifactLoader(dbService, handlerFactory, sqlProvider, rowDataFactory); spyLoader = spy(loader); - factory = module.createDataLoader(dbService, spyLoader, cacheService.getBranchCache()); + factory = module.createDataLoader(dbService, spyLoader, branchCache); when(branchCache.getLocalId(CoreBranches.COMMON)).thenReturn(EXPECTED_BRANCH_ID); when(sqlProvider.getSql(OseeSql.QUERY_BUILDER)).thenReturn("/*+ ordered */"); diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/LoaderSqlHandlerFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/LoaderSqlHandlerFactoryImplTest.java index 0a7f5d34a8c..cf15f3d0e4d 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/LoaderSqlHandlerFactoryImplTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/LoaderSqlHandlerFactoryImplTest.java @@ -17,7 +17,6 @@ import java.util.Iterator; import java.util.List; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreBranches; -import org.eclipse.osee.framework.core.services.IOseeCachingService; import org.eclipse.osee.framework.core.services.IdentityService; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.core.ds.Criteria; @@ -49,7 +48,6 @@ public class LoaderSqlHandlerFactoryImplTest { // @formatter:off @Mock private Log logger; @Mock private IdentityService identityService; - @Mock private IOseeCachingService cache; // @formatter:on private SqlHandlerFactory factory; @@ -59,7 +57,7 @@ public class LoaderSqlHandlerFactoryImplTest { MockitoAnnotations.initMocks(this); DataModuleFactory module = new DataModuleFactory(logger); - factory = module.createHandlerFactory(identityService, cache); + factory = module.createHandlerFactory(identityService); } @Test @@ -84,15 +82,14 @@ public class LoaderSqlHandlerFactoryImplTest { @SuppressWarnings("rawtypes") private void assertSqlHandler(SqlHandler<?, ?> handler, Class<? extends SqlHandler> clazz, SqlHandlerPriority priority) { - assertHandler(handler, clazz, priority, logger, identityService, cache); + assertHandler(handler, clazz, priority, logger, identityService); } - private static void assertHandler(SqlHandler<?, ?> actual, Class<?> type, SqlHandlerPriority priority, Log logger, IdentityService idService, IOseeCachingService caches) { + private static void assertHandler(SqlHandler<?, ?> actual, Class<?> type, SqlHandlerPriority priority, Log logger, IdentityService idService) { Assert.assertNotNull(actual); Assert.assertEquals(type, actual.getClass()); Assert.assertEquals(logger, actual.getLogger()); Assert.assertEquals(idService, actual.getIdentityService()); - Assert.assertEquals(caches, actual.getTypeCaches()); Assert.assertEquals(priority.ordinal(), actual.getPriority()); } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryEngineImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryEngineImplTest.java index f11211b3ed3..1ce643390d4 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryEngineImplTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryEngineImplTest.java @@ -27,7 +27,6 @@ import org.eclipse.osee.framework.core.enums.TokenOrderType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.cache.AttributeTypeCache; import org.eclipse.osee.framework.core.model.cache.BranchCache; -import org.eclipse.osee.framework.core.services.IOseeCachingService; import org.eclipse.osee.framework.core.services.IdentityService; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.AbstractJoinQuery; @@ -68,7 +67,7 @@ public class QueryEngineImplTest { private static final Criteria<?> GUIDS = new CriteriaArtifactGuids(Arrays.asList(GUID.create(), GUID.create())); private static final Criteria<?> IDS = new CriteriaArtifactIds(Arrays.asList(1, 2, 3, 4, 5)); private static final Criteria<?> HRIDS = new CriteriaArtifactHrids(Arrays.asList("ABCDE", "FGHIJ")); - private static final Criteria<?> TYPES = new CriteriaArtifactType(Arrays.asList(CoreArtifactTypes.CodeUnit)); + private static final Criteria<?> TYPES = new CriteriaArtifactType(null, Arrays.asList(CoreArtifactTypes.CodeUnit)); private static final Criteria<?> ATTRIBUTE = new CriteriaAttributeOther(CoreAttributeTypes.Name, Arrays.asList("Hello"), Operator.EQUAL); @@ -93,7 +92,6 @@ public class QueryEngineImplTest { @Mock private IOseeDatabaseService dbService; @Mock private SqlProvider sqlProvider; @Mock private IdentityService identityService; - @Mock private IOseeCachingService cache; @Mock private ExecutorAdmin executorAdmin; @Mock private BranchCache branchCache; @Mock private AttributeTypeCache attributeTypeCache; @@ -119,7 +117,7 @@ public class QueryEngineImplTest { DataPostProcessorFactory<CriteriaAttributeKeywords> postProcessorFactory = queryModule.createAttributeKeywordPostProcessor(executorAdmin, taggingEngine); SqlHandlerFactory handlerFactory = - queryModule.createHandlerFactory(identityService, cache, postProcessorFactory, taggingEngine.getTagProcessor()); + queryModule.createHandlerFactory(identityService, postProcessorFactory, taggingEngine.getTagProcessor()); queryEngine = queryModule.createQueryEngine(dbService, handlerFactory, sqlProvider, branchCache); CriteriaSet criteriaSet = new CriteriaSet(CoreBranches.COMMON); diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QuerySqlHandlerFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QuerySqlHandlerFactoryImplTest.java index 7f7bd0137aa..80a62652512 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QuerySqlHandlerFactoryImplTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QuerySqlHandlerFactoryImplTest.java @@ -18,7 +18,6 @@ import java.util.List; import org.eclipse.osee.executor.admin.ExecutorAdmin; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreBranches; -import org.eclipse.osee.framework.core.services.IOseeCachingService; import org.eclipse.osee.framework.core.services.IdentityService; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.core.ds.Criteria; @@ -68,7 +67,6 @@ public class QuerySqlHandlerFactoryImplTest { @Mock private Log logger; @Mock private IdentityService identityService; @Mock private TaggingEngine taggingEngine; - @Mock private IOseeCachingService cache; @Mock private ExecutorAdmin executorAdmin; // @formatter:on @@ -83,7 +81,7 @@ public class QuerySqlHandlerFactoryImplTest { postProcessorFactory = queryModule.createAttributeKeywordPostProcessor(executorAdmin, taggingEngine); factory = - queryModule.createHandlerFactory(identityService, cache, postProcessorFactory, taggingEngine.getTagProcessor()); + queryModule.createHandlerFactory(identityService, postProcessorFactory, taggingEngine.getTagProcessor()); } @SuppressWarnings("unchecked") @@ -93,7 +91,7 @@ public class QuerySqlHandlerFactoryImplTest { criteria.add(new CriteriaArtifactGuids(null)); criteria.add(new CriteriaArtifactHrids(null)); criteria.add(new CriteriaArtifactIds(null)); - criteria.add(new CriteriaArtifactType(null)); + criteria.add(new CriteriaArtifactType(null, null)); criteria.add(new CriteriaRelationTypeExists(null)); criteria.add(new CriteriaAttributeTypeExists(null)); criteria.add(new CriteriaAttributeOther(null, null, null)); @@ -129,15 +127,14 @@ public class QuerySqlHandlerFactoryImplTest { @SuppressWarnings("rawtypes") private void assertSqlHandler(SqlHandler<?, ?> handler, Class<? extends SqlHandler> clazz, SqlHandlerPriority priority) { - assertHandler(handler, clazz, priority, logger, identityService, taggingEngine, cache, executorAdmin); + assertHandler(handler, clazz, priority, logger, identityService, taggingEngine, executorAdmin); } - private static void assertHandler(SqlHandler<?, ?> actual, Class<?> type, SqlHandlerPriority priority, Log logger, IdentityService idService, TaggingEngine taggingEngine, IOseeCachingService caches, ExecutorAdmin executorAdmin) { + private static void assertHandler(SqlHandler<?, ?> actual, Class<?> type, SqlHandlerPriority priority, Log logger, IdentityService idService, TaggingEngine taggingEngine, ExecutorAdmin executorAdmin) { Assert.assertNotNull(actual); Assert.assertEquals(type, actual.getClass()); Assert.assertEquals(logger, actual.getLogger()); Assert.assertEquals(idService, actual.getIdentityService()); - Assert.assertEquals(caches, actual.getTypeCaches()); Assert.assertEquals(priority.ordinal(), actual.getPriority()); } |