diff options
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.db.test')
24 files changed, 120 insertions, 81 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch b/plugins/org.eclipse.osee.orcs.db.test/OrcsDb_JUnitAndIntegration_TestSuite.launch index 670adef174f..b2735aa9c9f 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch +++ b/plugins/org.eclipse.osee.orcs.db.test/OrcsDb_JUnitAndIntegration_TestSuite.launch @@ -24,7 +24,7 @@ <booleanAttribute key="includeOptional" value="false"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/OrcsDbTestSuite.java"/> +<listEntry value="/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/OrcsDb_JUnitAndIntegration_TestSuite.java"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="1"/> @@ -34,7 +34,7 @@ <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.orcs.db.OrcsDbTestSuite"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.orcs.db.OrcsDb_JUnitAndIntegration_TestSuite"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.orcs.db.test"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> diff --git a/plugins/org.eclipse.osee.orcs.db.test/README_BEFORE_RUNNING_TESTS.txt b/plugins/org.eclipse.osee.orcs.db.test/README_BEFORE_RUNNING_TESTS.txt new file mode 100644 index 00000000000..8598991df4d --- /dev/null +++ b/plugins/org.eclipse.osee.orcs.db.test/README_BEFORE_RUNNING_TESTS.txt @@ -0,0 +1,13 @@ +This test bundle contains both JUnit and Integration test suites. Please read before running. + +OrcsDb_JUnit_TestSuites and all suites in /internal can be run as JUnit with right-click > Debug As > JUnit + +OrcsDb_All_TestSuite + +integration/OrcsDb_Integration_TestSuites can be run through OrcsDbTestSuite + +This suite uses canned database from org.eclpise.osee.orcs.db.mock. +Database files will be copied out to users home directory for tests that require a db. +If schema or breaking db changes are made, update database from instructions in that plugin. +It does not require running an separate application server. + diff --git a/plugins/org.eclipse.osee.orcs.db.test/pom.xml b/plugins/org.eclipse.osee.orcs.db.test/pom.xml index e74778d0690..38df0aa2ce8 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/pom.xml +++ b/plugins/org.eclipse.osee.orcs.db.test/pom.xml @@ -22,7 +22,7 @@ <version>${tycho-version}</version> <configuration> <testSuite>org.eclipse.osee.orcs.db.test</testSuite> - <testClass>org.eclipse.osee.orcs.db.OrcsDbTestSuite</testClass> + <testClass>org.eclipse.osee.orcs.db.OrcsDb_JUnitAndIntegration_TestSuite</testClass> </configuration> </plugin> <plugin> diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/accessor/AccessorTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/OrcsDb_JUnitAndIntegration_TestSuite.java index 215daf64210..68b4171afb3 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/accessor/AccessorTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/OrcsDb_JUnitAndIntegration_TestSuite.java @@ -8,16 +8,20 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.db.internal.accessor; +package org.eclipse.osee.orcs.db; +import org.eclipse.osee.orcs.db.intergration.OrcsDb_Integration_TestSuites; +import org.eclipse.osee.orcs.db.internal.Internal_JUnit_TestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; /** + * Test Suite run by build system and OrcsDbTestSuite.launch. Runs both JUnit and Integration tests. + * * @author Roberto E. Escobar */ @RunWith(Suite.class) -@Suite.SuiteClasses({}) -public class AccessorTestSuite { +@Suite.SuiteClasses({Internal_JUnit_TestSuite.class, OrcsDb_Integration_TestSuites.class}) +public class OrcsDb_JUnitAndIntegration_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/OrcsDbTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/OrcsDb_JUnit_TestSuite.java index 88d62a7e0b1..e7e99b14df8 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/OrcsDbTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/OrcsDb_JUnit_TestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. + * Copyright (c) 2016 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 @@ -10,16 +10,17 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db; -import org.eclipse.osee.orcs.db.intergration.IntegrationTestSuite; -import org.eclipse.osee.orcs.db.internal.InternalTestSuite; +import org.eclipse.osee.orcs.db.internal.Internal_JUnit_TestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; /** - * @author Roberto E. Escobar + * Test Suite to run all the pure JUnit test suites in this bundle. + * + * @author Donald G. Dunne */ @RunWith(Suite.class) -@Suite.SuiteClasses({InternalTestSuite.class, IntegrationTestSuite.class}) -public class OrcsDbTestSuite { +@Suite.SuiteClasses({Internal_JUnit_TestSuite.class}) +public class OrcsDb_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java index 404c85bd9fc..c3552a8fc1e 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java @@ -32,7 +32,11 @@ import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.enums.CoreArtifactTokens; import org.eclipse.osee.framework.core.enums.LoadLevel; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.eclipse.osee.jdbc.JdbcClient; +import org.eclipse.osee.jdbc.JdbcService; +import org.eclipse.osee.orcs.OrcsApi; import org.eclipse.osee.orcs.OrcsSession; import org.eclipse.osee.orcs.OrcsTypes; import org.eclipse.osee.orcs.core.ds.ArtifactData; @@ -62,6 +66,11 @@ public class LoaderTest { @Rule public TestRule db = integrationRule(this); + @OsgiService + public OrcsApi orcsApi; + @OsgiService + public JdbcService jdbcService; + // @formatter:off @OsgiService private OrcsDataStore dataStore; @Mock private LoadDataHandler builder; @@ -84,12 +93,17 @@ public class LoaderTest { private final int UserGroupsId = CoreArtifactTokens.UserGroups.getUuid().intValue(); private final String UserGroupsGuid = CoreArtifactTokens.UserGroups.getGuid(); private final TransactionId tx5 = TransactionId.valueOf(5); - private final TransactionId tx6 = TransactionId.valueOf(6); private final TransactionId tx7 = TransactionId.valueOf(7); private final TransactionId tx10 = TransactionId.valueOf(10); @Before public void setUp() throws OseeCoreException { + JdbcClient jdbcClient = jdbcService.getClient(); + + if (jdbcClient.getConfig().isProduction()) { + throw new OseeStateException("Test should not be run against a Production Database"); + } + MockitoAnnotations.initMocks(this); when(types.getArtifactTypes()).thenReturn(artTypes); diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OrcsDb_Integration_TestSuites.java index 2089b69baae..88db3401908 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OrcsDb_Integration_TestSuites.java @@ -14,10 +14,12 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; /** + * Integration test suite. DO NOT RUN WITH PDE JUnit launch. Use OrcsDbTestSuite.launch instead. + * * @author Roberto E. Escobar */ @RunWith(Suite.class) @Suite.SuiteClasses({LoaderTest.class, OseeInfoDataAccessorTest.class, PurgeAttributeTest.class}) -public class IntegrationTestSuite { +public class OrcsDb_Integration_TestSuites { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/PurgeAttributeTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/PurgeAttributeTest.java index 0a379256dff..ebfe7377319 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/PurgeAttributeTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/PurgeAttributeTest.java @@ -40,7 +40,6 @@ import org.junit.rules.TestRule; public class PurgeAttributeTest { private static final ArtifactId Joe_Smith = ArtifactId.valueOf(61106791L); - private static final String UNIQUE_ATTR_VALUE = "AEqvcQoyRV8zNDZSBVAA"; @Rule @@ -48,7 +47,6 @@ public class PurgeAttributeTest { @OsgiService public OrcsApi orcsApi; - @OsgiService public JdbcService jdbcService; @OsgiService diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/README_BEFORE_RUNNING_TESTS.txt b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/README_BEFORE_RUNNING_TESTS.txt new file mode 100644 index 00000000000..7c25f150d02 --- /dev/null +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/README_BEFORE_RUNNING_TESTS.txt @@ -0,0 +1,9 @@ +OrcsDb_Integration_TestSuites + +DO NOT RUN THIS TEST SUITE WITH Right-Click > Debug As > PDE JUnit Test +or it will try to connect to the production database. + +All integration tests should check to see if production before running. +See PurgeAttributeTest for an example on how to check if production database. + +See this bundle's read-me file for more details.
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/InternalTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/InternalTestSuite.java deleted file mode 100644 index 07e72540107..00000000000 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/InternalTestSuite.java +++ /dev/null @@ -1,41 +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: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.orcs.db.internal; - -import org.eclipse.osee.orcs.db.internal.accessor.AccessorTestSuite; -import org.eclipse.osee.orcs.db.internal.change.ChangeTestSuite; -import org.eclipse.osee.orcs.db.internal.exchange.ExchangeTestSuite; -import org.eclipse.osee.orcs.db.internal.loader.LoaderTestSuite; -import org.eclipse.osee.orcs.db.internal.proxy.ProxyTestSuite; -import org.eclipse.osee.orcs.db.internal.resource.ResourceTestSuite; -import org.eclipse.osee.orcs.db.internal.search.QueryTestSuite; -import org.eclipse.osee.orcs.db.internal.sql.SqlTestSuite; -import org.eclipse.osee.orcs.db.internal.transaction.TransactionTestSuite; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * @author Roberto E. Escobar - */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ - AccessorTestSuite.class, - ChangeTestSuite.class, - ExchangeTestSuite.class, - LoaderTestSuite.class, - ProxyTestSuite.class, - ResourceTestSuite.class, - QueryTestSuite.class, - SqlTestSuite.class, - TransactionTestSuite.class}) -public class InternalTestSuite { - // Test Suite -} diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/Internal_JUnit_TestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/Internal_JUnit_TestSuite.java new file mode 100644 index 00000000000..7f27ece6c16 --- /dev/null +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/Internal_JUnit_TestSuite.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * 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: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.orcs.db.internal; + +import org.eclipse.osee.orcs.db.internal.change.Change_JUnit_TestSuite; +import org.eclipse.osee.orcs.db.internal.exchange.Exchange_JUnit_TestSuite; +import org.eclipse.osee.orcs.db.internal.loader.Loader_JUnit_TestSuite; +import org.eclipse.osee.orcs.db.internal.proxy.Proxy_JUnit_TestSuite; +import org.eclipse.osee.orcs.db.internal.resource.Resource_JUnit_TestSuite; +import org.eclipse.osee.orcs.db.internal.search.Query_JUnit_TestSuite; +import org.eclipse.osee.orcs.db.internal.sql.Sql_JUnit_TestSuite; +import org.eclipse.osee.orcs.db.internal.transaction.Transaction_JUnit_TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Roberto E. Escobar + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + Change_JUnit_TestSuite.class, + Exchange_JUnit_TestSuite.class, + Loader_JUnit_TestSuite.class, + Proxy_JUnit_TestSuite.class, + Resource_JUnit_TestSuite.class, + Query_JUnit_TestSuite.class, + Sql_JUnit_TestSuite.class, + Transaction_JUnit_TestSuite.class}) +public class Internal_JUnit_TestSuite { + // Test Suite +} diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ChangeTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/Change_JUnit_TestSuite.java index 2e3d06a0703..d85b4dfe3cf 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ChangeTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/Change_JUnit_TestSuite.java @@ -18,6 +18,6 @@ import org.junit.runners.Suite; /** * @author Roberto E. Escobar */ -public class ChangeTestSuite { +public class Change_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/exchange/ExchangeTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/exchange/Exchange_JUnit_TestSuite.java index ef98832653a..b82524f0d74 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/exchange/ExchangeTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/exchange/Exchange_JUnit_TestSuite.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.exchange; -import org.eclipse.osee.orcs.db.internal.exchange.transformer.TransformerTestSuite; +import org.eclipse.osee.orcs.db.internal.exchange.transformer.Transformer_JUnit_TestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -18,7 +18,7 @@ import org.junit.runners.Suite; * @author Roberto E. Escobar */ @RunWith(Suite.class) -@Suite.SuiteClasses({TransformerTestSuite.class}) -public class ExchangeTestSuite { +@Suite.SuiteClasses({Transformer_JUnit_TestSuite.class}) +public class Exchange_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/exchange/transformer/TransformerTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/exchange/transformer/Transformer_JUnit_TestSuite.java index f4ba72dcf7d..64ba6936402 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/exchange/transformer/TransformerTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/exchange/transformer/Transformer_JUnit_TestSuite.java @@ -20,6 +20,6 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ // ExchangeTransformProviderTest.class, // }) -public class TransformerTestSuite { - // +public class Transformer_JUnit_TestSuite { + // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/LoaderTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/Loader_JUnit_TestSuite.java index 4d234289b4f..79fea74d946 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/LoaderTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/Loader_JUnit_TestSuite.java @@ -22,6 +22,6 @@ import org.junit.runners.Suite; DataFactoryImplTest.class, DataLoaderFactoryImplTest.class, LoaderSqlHandlerFactoryUtilTest.class}) -public class LoaderTestSuite { +public class Loader_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/proxy/ProxyTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/proxy/Proxy_JUnit_TestSuite.java index 3f6821b5c36..a93d6ef34c6 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/proxy/ProxyTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/proxy/Proxy_JUnit_TestSuite.java @@ -23,6 +23,6 @@ import org.junit.runners.Suite; ResourceHandlerTest.class, StorageTest.class, UriDataProxyTest.class}) -public class ProxyTestSuite { +public class Proxy_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/resource/ResourceTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/resource/Resource_JUnit_TestSuite.java index 20141597657..55412e63050 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/resource/ResourceTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/resource/Resource_JUnit_TestSuite.java @@ -18,6 +18,6 @@ import org.junit.runners.Suite; /** * @author Roberto E. Escobar */ -public class ResourceTestSuite { +public class Resource_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/Query_JUnit_TestSuite.java index e7ae8f2b385..ea073fd11f1 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/Query_JUnit_TestSuite.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.search; -import org.eclipse.osee.orcs.db.internal.search.engines.EnginesTestSuite; -import org.eclipse.osee.orcs.db.internal.search.handlers.HandlersTestSuite; +import org.eclipse.osee.orcs.db.internal.search.engines.Engines_JUnit_TestSuite; +import org.eclipse.osee.orcs.db.internal.search.handlers.Handlers_JUnit_TestSuite; import org.eclipse.osee.orcs.db.internal.search.indexer.callable.consumer.IndexingTaskDatabaseTxCallableTest; import org.eclipse.osee.orcs.db.internal.search.language.LanguageTestSuite; -import org.eclipse.osee.orcs.db.internal.search.tagger.TaggerTestSuite; -import org.eclipse.osee.orcs.db.internal.search.util.UtilityTestSuite; +import org.eclipse.osee.orcs.db.internal.search.tagger.Tagger_JUnit_TestSuite; +import org.eclipse.osee.orcs.db.internal.search.util.Utility_Test_Suite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -24,12 +24,12 @@ import org.junit.runners.Suite; */ @RunWith(Suite.class) @Suite.SuiteClasses({ - EnginesTestSuite.class, - HandlersTestSuite.class, + Engines_JUnit_TestSuite.class, + Handlers_JUnit_TestSuite.class, LanguageTestSuite.class, - TaggerTestSuite.class, + Tagger_JUnit_TestSuite.class, IndexingTaskDatabaseTxCallableTest.class, - UtilityTestSuite.class}) -public class QueryTestSuite { + Utility_Test_Suite.class}) +public class Query_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/EnginesTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/Engines_JUnit_TestSuite.java index bb4e54c8661..36a40850a56 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/EnginesTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/engines/Engines_JUnit_TestSuite.java @@ -21,6 +21,6 @@ import org.junit.runners.Suite; ArtifactQuerySqlContextFactoryImplTest.class, BranchQuerySqlContextFactoryImplTest.class, TxQuerySqlContextFactoryImplTest.class}) -public class EnginesTestSuite { +public class Engines_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/handlers/HandlersTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/handlers/Handlers_JUnit_TestSuite.java index 482fd012703..517432c24b2 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/handlers/HandlersTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/handlers/Handlers_JUnit_TestSuite.java @@ -18,6 +18,6 @@ import org.junit.runners.Suite; */ @RunWith(Suite.class) @Suite.SuiteClasses({SqlHandlerFactoryUtilTest.class}) -public class HandlersTestSuite { +public class Handlers_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/tagger/TaggerTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/tagger/Tagger_JUnit_TestSuite.java index 4c8db6a1fa9..1142cee813e 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/tagger/TaggerTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/tagger/Tagger_JUnit_TestSuite.java @@ -18,6 +18,6 @@ import org.junit.runners.Suite; */ @RunWith(Suite.class) @Suite.SuiteClasses({TagEncoderTest.class, TagProcessorTest.class}) -public class TaggerTestSuite { +public class Tagger_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/util/UtilityTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/util/Utility_Test_Suite.java index c3c8c8efaa6..d555049d07b 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/util/UtilityTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/util/Utility_Test_Suite.java @@ -18,6 +18,6 @@ import org.junit.runners.Suite; */ @RunWith(Suite.class) @Suite.SuiteClasses({SecondPassMatcherTest.class, WordsUtilTest.class, SecondPassScannerTest.class}) -public class UtilityTestSuite { +public class Utility_Test_Suite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/sql/SqlTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/sql/Sql_JUnit_TestSuite.java index ca1c9ff8cf4..1adcd7fec15 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/sql/SqlTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/sql/Sql_JUnit_TestSuite.java @@ -19,6 +19,6 @@ import org.junit.runners.Suite; /** * @author Roberto E. Escobar */ -public class SqlTestSuite { +public class Sql_JUnit_TestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TransactionTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/Transaction_JUnit_TestSuite.java index 9bb9342803f..6e0d7d7b40c 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TransactionTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/Transaction_JUnit_TestSuite.java @@ -18,6 +18,6 @@ import org.junit.runners.Suite; */ @RunWith(Suite.class) @Suite.SuiteClasses({DaoToSqlTest.class, TransactionWriterTest.class, TxSqlBuilderTest.class}) -public class TransactionTestSuite { +public class Transaction_JUnit_TestSuite { // Test Suite } |