http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java b/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java index 83d35a8..2e206c9 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/sqltests/BaseSqlTest.java @@ -58,10 +58,14 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test base for test for sql features. */ +@RunWith(JUnit4.class) public class BaseSqlTest extends GridCommonAbstractTest { /** Number of all employees. */ public static final long EMP_CNT = 1000L; @@ -621,6 +625,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check basic SELECT * query. */ + @Test public void testBasicSelect() { testAllNodes(node -> { Result emps = executeFrom("SELECT * FROM Employee", node); @@ -636,6 +641,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check SELECT query with projection (fields). */ + @Test public void testSelectFields() { testAllNodes(node -> { Result res = executeFrom("SELECT firstName, id, age FROM Employee;", node); @@ -653,6 +659,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check basic BETWEEN operator usage. */ + @Test public void testSelectBetween() { testAllNodes(node -> { Result emps = executeFrom("SELECT * FROM Employee e WHERE e.id BETWEEN 101 and 200", node); @@ -677,6 +684,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check BETWEEN operator filters out all the result (empty result set is expected). */ + @Test public void testEmptyBetween() { testAllNodes(node -> { Result emps = executeFrom("SELECT * FROM Employee e WHERE e.id BETWEEN 200 AND 101", node); @@ -688,6 +696,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check SELECT IN with fixed values. */ + @Test public void testSelectInStatic() { testAllNodes(node -> { Result actual = executeFrom("SELECT age FROM Employee WHERE id IN (1, 256, 42)", node); @@ -707,6 +716,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check SELECT IN with simple subquery values. */ + @Test public void testSelectInSubquery() { testAllNodes(node -> { Result actual = executeFrom("SELECT lastName FROM Employee WHERE id in (SELECT id FROM Employee WHERE age < 30)", node); @@ -720,6 +730,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check ORDER BY operator with varchar field. */ + @Test public void testBasicOrderByLastName() { testAllNodes(node -> { Result result = executeFrom("SELECT * FROM Employee e ORDER BY e.lastName", node); @@ -738,6 +749,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check DISTINCT operator selecting not unique field. */ + @Test public void testBasicDistinct() { testAllNodes(node -> { Result ages = executeFrom("SELECT DISTINCT age FROM Employee", node); @@ -751,6 +763,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check simple WHERE operator. */ + @Test public void testDistinctWithWhere() { testAllNodes(node -> { Result ages = executeFrom("SELECT DISTINCT age FROM Employee WHERE id < 100", node); @@ -764,6 +777,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check greater operator in where clause with both indexed and non-indexed field. */ + @Test public void testWhereGreater() { testAllNodes(node -> { Result idxActual = executeFrom("SELECT firstName FROM Employee WHERE age > 30", node); @@ -782,6 +796,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check less operator in where clause with both indexed and non-indexed field. */ + @Test public void testWhereLess() { testAllNodes(node -> { Result idxActual = executeFrom("SELECT firstName FROM Employee WHERE age < 30", node); @@ -800,6 +815,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check equals operator in where clause with both indexed and non-indexed field. */ + @Test public void testWhereEq() { testAllNodes(node -> { Result idxActual = executeFrom("SELECT firstName FROM Employee WHERE age = 30", node); @@ -818,6 +834,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check GROUP BY operator with indexed field. */ + @Test public void testGroupByIndexedField() { testAllNodes(node -> { // Need to filter out only part of records (each one is a count of employees @@ -850,6 +867,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check GROUP BY operator with indexed field. */ + @Test public void testGroupByNonIndexedField() { testAllNodes(node -> { // Need to filter out only part of records (each one is a count of employees @@ -1039,6 +1057,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check INNER JOIN with collocated data. */ + @Test public void testInnerJoinEmployeeDepartment() { checkInnerJoinEmployeeDepartment(DEP_TAB); } @@ -1137,6 +1156,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check LEFT JOIN with collocated data. */ + @Test public void testLeftJoin() { checkLeftJoinEmployeeDepartment(DEP_TAB); } @@ -1206,6 +1226,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { /** * Check RIGHT JOIN with collocated data. */ + @Test public void testRightJoin() { checkRightJoinEmployeeDepartment(DEP_TAB); } @@ -1214,6 +1235,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { * Check that FULL OUTER JOIN (which is currently unsupported) causes valid error message. */ @SuppressWarnings("ThrowableNotThrown") + @Test public void testFullOuterJoinIsNotSupported() { testAllNodes(node -> { String fullOuterJoinQry = "SELECT e.id as EmpId, e.firstName as EmpName, d.id as DepId, d.name as DepName " + @@ -1234,6 +1256,7 @@ public class BaseSqlTest extends GridCommonAbstractTest { * Check that distributed FULL OUTER JOIN (which is currently unsupported) causes valid error message. */ @SuppressWarnings("ThrowableNotThrown") + @Test public void testFullOuterDistributedJoinIsNotSupported() { testAllNodes(node -> { String qry = "SELECT d.id, d.name, a.address " +
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/sqltests/PartitionedSqlTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/sqltests/PartitionedSqlTest.java b/modules/indexing/src/test/java/org/apache/ignite/sqltests/PartitionedSqlTest.java index 83e7015..8899b38 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/sqltests/PartitionedSqlTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/sqltests/PartitionedSqlTest.java @@ -19,10 +19,14 @@ package org.apache.ignite.sqltests; import java.util.Arrays; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Includes all base sql test plus tests that make sense in partitioned mode. */ +@RunWith(JUnit4.class) public class PartitionedSqlTest extends BaseSqlTest { /** {@inheritDoc} */ @Override protected void setupData() { @@ -34,6 +38,7 @@ public class PartitionedSqlTest extends BaseSqlTest { /** * Check distributed INNER JOIN. */ + @Test public void testInnerDistributedJoin() { Arrays.asList(true, false).forEach(forceOrder -> testAllNodes(node -> { final String qryTpl = "SELECT d.id, d.name, a.address " + @@ -57,6 +62,7 @@ public class PartitionedSqlTest extends BaseSqlTest { /** * Check that if required index is missed, correct exception will be thrown. */ + @Test public void testInnerDistJoinMissedIndex() { Arrays.asList(true, false).forEach(forceOrder -> testAllNodes(node -> { String qryTpl = "SELECT d.id, d.name, a.address " + @@ -74,6 +80,7 @@ public class PartitionedSqlTest extends BaseSqlTest { /** * Check distributed LEFT JOIN. */ + @Test public void testLeftDistributedJoin() { Arrays.asList(true, false).forEach(forceOrder -> testAllNodes(node -> { final String qryTpl = "SELECT d.id, d.name, a.depId, a.address " + @@ -97,6 +104,7 @@ public class PartitionedSqlTest extends BaseSqlTest { /** * Check that if required index is missed, correct exception will be thrown. */ + @Test public void testLeftDistributedJoinMissedIndex() { Arrays.asList(true, false).forEach(forceOrder -> testAllNodes(node -> { String qryTpl = "SELECT d.id, d.name, a.address " + @@ -114,6 +122,7 @@ public class PartitionedSqlTest extends BaseSqlTest { /** * Check distributed RIGHT JOIN. */ + @Test public void testRightDistributedJoin() { setExplain(true); @@ -140,6 +149,7 @@ public class PartitionedSqlTest extends BaseSqlTest { /** * Check that if required index is missed, correct exception will be thrown. */ + @Test public void testRightDistributedJoinMissedIndex() { Arrays.asList(true, false).forEach(forceOrder -> testAllNodes(node -> { String qryTpl = "SELECT d.id, d.name, a.address " + http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/sqltests/ReplicatedSqlTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/sqltests/ReplicatedSqlTest.java b/modules/indexing/src/test/java/org/apache/ignite/sqltests/ReplicatedSqlTest.java index a71f217..954b911 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/sqltests/ReplicatedSqlTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/sqltests/ReplicatedSqlTest.java @@ -19,10 +19,14 @@ package org.apache.ignite.sqltests; import java.util.Arrays; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Includes all base sql test plus tests that make sense in replicated mode. */ +@RunWith(JUnit4.class) public class ReplicatedSqlTest extends BaseSqlTest { /** Name of the department table created in partitioned mode. */ private String DEP_PART_TAB = "DepartmentPart"; @@ -45,6 +49,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Checks distributed INNER JOIN of replicated and replicated tables. */ + @Test public void testInnerDistributedJoinReplicatedReplicated() { checkInnerDistJoinWithReplicated(DEP_TAB); } @@ -52,6 +57,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Checks distributed INNER JOIN of partitioned and replicated tables. */ + @Test public void testInnerDistJoinPartitionedReplicated() { checkInnerDistJoinWithReplicated(DEP_PART_TAB); } @@ -90,6 +96,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Checks distributed INNER JOIN of replicated and partitioned tables. */ + @Test public void testMixedInnerDistJoinReplicatedPartitioned() { checkInnerDistJoinReplicatedWith(DEP_PART_TAB); } @@ -129,6 +136,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Checks distributed LEFT JOIN of replicated and replicated tables. */ + @Test public void testLeftDistributedJoinReplicatedReplicated() { checkLeftDistributedJoinWithReplicated(DEP_TAB); } @@ -136,6 +144,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Checks distributed LEFT JOIN of partitioned and replicated tables. */ + @Test public void testLeftDistributedJoinPartitionedReplicated() { setExplain(true); checkLeftDistributedJoinWithReplicated(DEP_PART_TAB); @@ -144,6 +153,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Checks distributed LEFT JOIN of replicated and partitioned tables. */ + @Test public void testLeftDistributedJoinReplicatedPartitioned() { fail("https://issues.apache.org/jira/browse/IGNITE-8732";); @@ -215,6 +225,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Checks distributed RIGHT JOIN of replicated and replicated tables. */ + @Test public void testRightDistributedJoinReplicatedReplicated() { checkRightDistributedJoinWithReplicated(DEP_TAB); } @@ -222,6 +233,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Checks distributed RIGHT JOIN of partitioned and replicated tables. */ + @Test public void testRightDistributedJoinPartitionedReplicated() { fail("https://issues.apache.org/jira/browse/IGNITE-8732";); @@ -231,6 +243,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Checks distributed RIGHT JOIN of replicated and partitioned tables. */ + @Test public void testRightDistributedJoinReplicatedPartitioned() { setExplain(true); checkRightDistributedJoinReplicatedWith(DEP_PART_TAB); @@ -304,6 +317,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Check INNER JOIN with collocated data of replicated and partitioned tables. */ + @Test public void testInnerJoinReplicatedPartitioned() { checkInnerJoinEmployeeDepartment(DEP_PART_TAB); } @@ -311,6 +325,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Check INNER JOIN with collocated data of partitioned and replicated tables. */ + @Test public void testInnerJoinPartitionedReplicated() { checkInnerJoinDepartmentEmployee(DEP_PART_TAB); } @@ -318,6 +333,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Check LEFT JOIN with collocated data of replicated and partitioned tables. */ + @Test public void testLeftJoinReplicatedPartitioned() { fail("https://issues.apache.org/jira/browse/IGNITE-8732";); @@ -327,6 +343,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Check LEFT JOIN with collocated data of partitioned and replicated tables. */ + @Test public void testLeftJoinPartitionedReplicated() { checkLeftJoinDepartmentEmployee(DEP_PART_TAB); } @@ -334,6 +351,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Check RIGHT JOIN with collocated data of replicated and partitioned tables. */ + @Test public void testRightJoinReplicatedPartitioned() { checkRightJoinEmployeeDepartment(DEP_PART_TAB); } @@ -341,6 +359,7 @@ public class ReplicatedSqlTest extends BaseSqlTest { /** * Check RIGHT JOIN with collocated data of partitioned and replicated tables. */ + @Test public void testRightJoinPartitionedReplicated() { fail("https://issues.apache.org/jira/browse/IGNITE-8732";); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java index 18dd099..d510b11 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java @@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.cache.BinarySerializationQueryWithR import org.apache.ignite.internal.processors.cache.CacheIteratorScanQueryTest; import org.apache.ignite.internal.processors.cache.CacheLocalQueryDetailMetricsSelfTest; import org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest; -import org.apache.ignite.internal.processors.cache.CacheOffheapBatchIndexingBaseTest; import org.apache.ignite.internal.processors.cache.CacheOffheapBatchIndexingMultiTypeTest; import org.apache.ignite.internal.processors.cache.CacheOffheapBatchIndexingSingleTypeTest; import org.apache.ignite.internal.processors.cache.CachePartitionedQueryDetailMetricsDistributedSelfTest; @@ -111,7 +110,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheP import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCachePartitionedQueryP2PDisabledSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCachePartitionedQuerySelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCachePartitionedSnapshotEnabledQuerySelfTest; -import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryAbstractDistributedJoinSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNoRebalanceSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedFieldsQueryJoinNoPrimaryPartitionsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest; @@ -242,9 +240,8 @@ import org.apache.ignite.testframework.IgniteTestSuite; public class IgniteBinaryCacheQueryTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { IgniteTestSuite suite = new IgniteTestSuite("Ignite Cache Queries Test Suite"); suite.addTestSuite(AffinityKeyNameAndValueFieldNameConflictTest.class); @@ -275,23 +272,23 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite { suite.addTestSuite(BasicIndexTest.class); // Misc tests. - suite.addTest(new TestSuite(QueryEntityValidationSelfTest.class)); - suite.addTest(new TestSuite(DuplicateKeyValueClassesSelfTest.class)); - suite.addTest(new TestSuite(GridCacheLazyQueryPartitionsReleaseTest.class)); + suite.addTestSuite(QueryEntityValidationSelfTest.class); + suite.addTestSuite(DuplicateKeyValueClassesSelfTest.class); + suite.addTestSuite(GridCacheLazyQueryPartitionsReleaseTest.class); // Dynamic index create/drop tests. - suite.addTest(new TestSuite(SchemaExchangeSelfTest.class)); + suite.addTestSuite(SchemaExchangeSelfTest.class); - suite.addTest(new TestSuite(DynamicIndexServerCoordinatorBasicSelfTest.class)); - suite.addTest(new TestSuite(DynamicIndexServerBasicSelfTest.class)); - suite.addTest(new TestSuite(DynamicIndexServerNodeFilterCoordinatorBasicSelfTest.class)); - suite.addTest(new TestSuite(DynamicIndexServerNodeFIlterBasicSelfTest.class)); - suite.addTest(new TestSuite(DynamicIndexClientBasicSelfTest.class)); + suite.addTestSuite(DynamicIndexServerCoordinatorBasicSelfTest.class); + suite.addTestSuite(DynamicIndexServerBasicSelfTest.class); + suite.addTestSuite(DynamicIndexServerNodeFilterCoordinatorBasicSelfTest.class); + suite.addTestSuite(DynamicIndexServerNodeFIlterBasicSelfTest.class); + suite.addTestSuite(DynamicIndexClientBasicSelfTest.class); // H2 tests. - suite.addTest(new TestSuite(GridH2IndexingInMemSelfTest.class)); - suite.addTest(new TestSuite(GridH2IndexingOffheapSelfTest.class)); + suite.addTestSuite(GridH2IndexingInMemSelfTest.class); + suite.addTestSuite(GridH2IndexingOffheapSelfTest.class); // Parsing suite.addTestSuite(GridQueryParsingTest.class); @@ -330,7 +327,6 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite { suite.addTestSuite(IgniteErrorOnRebalanceTest.class); suite.addTestSuite(CacheQueryBuildValueTest.class); suite.addTestSuite(CacheOffheapBatchIndexingMultiTypeTest.class); - suite.addTestSuite(CacheOffheapBatchIndexingBaseTest.class); suite.addTestSuite(IgniteCacheQueryIndexSelfTest.class); suite.addTestSuite(IgniteCacheCollocatedQuerySelfTest.class); @@ -341,8 +337,6 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheOffheapEvictQueryTest.class); suite.addTestSuite(IgniteCacheOffheapIndexScanTest.class); - suite.addTestSuite(IgniteCacheQueryAbstractDistributedJoinSelfTest.class); - suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class); suite.addTestSuite(GridCacheQuerySerializationSelfTest.class); suite.addTestSuite(IgniteBinaryObjectFieldsQuerySelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java index 337ed6f..d4478fe 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.CacheScanPartitionQueryFallbackSelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheCrossCacheJoinRandomTest; @@ -66,67 +67,66 @@ import org.apache.ignite.testframework.IgniteTestSuite; public class IgniteBinaryCacheQueryTestSuite2 extends TestSuite { /** * @return Test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new IgniteTestSuite("Ignite Cache Queries Test Suite 2"); // Dynamic index create/drop tests. - suite.addTestSuite(DynamicIndexPartitionedAtomicConcurrentSelfTest.class); - suite.addTestSuite(DynamicIndexPartitionedTransactionalConcurrentSelfTest.class); - suite.addTestSuite(DynamicIndexReplicatedAtomicConcurrentSelfTest.class); - suite.addTestSuite(DynamicIndexReplicatedTransactionalConcurrentSelfTest.class); + suite.addTest(new JUnit4TestAdapter(DynamicIndexPartitionedAtomicConcurrentSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DynamicIndexPartitionedTransactionalConcurrentSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DynamicIndexReplicatedAtomicConcurrentSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DynamicIndexReplicatedTransactionalConcurrentSelfTest.class)); - suite.addTestSuite(DynamicColumnsConcurrentAtomicPartitionedSelfTest.class); - suite.addTestSuite(DynamicColumnsConcurrentTransactionalPartitionedSelfTest.class); - suite.addTestSuite(DynamicColumnsConcurrentAtomicReplicatedSelfTest.class); - suite.addTestSuite(DynamicColumnsConcurrentTransactionalReplicatedSelfTest.class); + suite.addTest(new JUnit4TestAdapter(DynamicColumnsConcurrentAtomicPartitionedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DynamicColumnsConcurrentTransactionalPartitionedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DynamicColumnsConcurrentAtomicReplicatedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DynamicColumnsConcurrentTransactionalReplicatedSelfTest.class)); // Distributed joins. - suite.addTestSuite(IgniteCacheQueryNodeRestartDistributedJoinSelfTest.class); - suite.addTestSuite(IgniteCacheQueryStopOnCancelOrTimeoutDistributedJoinSelfTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeRestartDistributedJoinSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryStopOnCancelOrTimeoutDistributedJoinSelfTest.class)); // Other tests. - suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryMultiThreadedSelfTest.class)); - suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryEvictsMultiThreadedSelfTest.class)); - suite.addTestSuite(ScanQueryOffheapExpiryPolicySelfTest.class); + suite.addTest(new JUnit4TestAdapter(ScanQueryOffheapExpiryPolicySelfTest.class)); - suite.addTestSuite(IgniteCacheCrossCacheJoinRandomTest.class); - suite.addTestSuite(IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class); - suite.addTestSuite(IgniteCacheQueryNodeFailTest.class); - suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class); - suite.addTestSuite(IgniteSqlQueryWithBaselineTest.class); - suite.addTestSuite(IgniteChangingBaselineCacheQueryNodeRestartSelfTest.class); - suite.addTestSuite(IgniteStableBaselineCacheQueryNodeRestartsSelfTest.class); - suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest2.class); - suite.addTestSuite(IgniteCacheQueryNodeRestartTxSelfTest.class); - suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class); - suite.addTestSuite(CacheScanPartitionQueryFallbackSelfTest.class); - suite.addTestSuite(IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.class); - suite.addTestSuite(IgniteCacheObjectKeyIndexingSelfTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheCrossCacheJoinRandomTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheClientQueryReplicatedNodeRestartSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeFailTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeRestartSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteSqlQueryWithBaselineTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteChangingBaselineCacheQueryNodeRestartSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteStableBaselineCacheQueryNodeRestartsSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeRestartSelfTest2.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheQueryNodeRestartTxSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheSqlQueryMultiThreadedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCachePartitionedQueryMultiThreadedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheScanPartitionQueryFallbackSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheObjectKeyIndexingSelfTest.class)); - suite.addTestSuite(IgniteCacheGroupsCompareQueryTest.class); - suite.addTestSuite(IgniteCacheGroupsSqlSegmentedIndexSelfTest.class); - suite.addTestSuite(IgniteCacheGroupsSqlSegmentedIndexMultiNodeSelfTest.class); - suite.addTestSuite(IgniteCacheGroupsSqlDistributedJoinSelfTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsCompareQueryTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsSqlSegmentedIndexSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsSqlSegmentedIndexMultiNodeSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsSqlDistributedJoinSelfTest.class)); - suite.addTestSuite(QueryJoinWithDifferentNodeFiltersTest.class); + suite.addTest(new JUnit4TestAdapter(QueryJoinWithDifferentNodeFiltersTest.class)); - suite.addTestSuite(CacheQueryMemoryLeakTest.class); + suite.addTest(new JUnit4TestAdapter(CacheQueryMemoryLeakTest.class)); - suite.addTestSuite(CreateTableWithDateKeySelfTest.class); + suite.addTest(new JUnit4TestAdapter(CreateTableWithDateKeySelfTest.class)); - suite.addTestSuite(NonCollocatedRetryMessageSelfTest.class); - suite.addTestSuite(RetryCauseMessageSelfTest.class); - suite.addTestSuite(DisappearedCacheCauseRetryMessageSelfTest.class); - suite.addTestSuite(DisappearedCacheWasNotFoundMessageSelfTest.class); + suite.addTest(new JUnit4TestAdapter(NonCollocatedRetryMessageSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(RetryCauseMessageSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DisappearedCacheCauseRetryMessageSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(DisappearedCacheWasNotFoundMessageSelfTest.class)); - suite.addTestSuite(TableViewSubquerySelfTest.class); + suite.addTest(new JUnit4TestAdapter(TableViewSubquerySelfTest.class)); - suite.addTestSuite(IgniteCacheQueriesLoadTest1.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheQueriesLoadTest1.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java index e9c7b79..7ea53fc 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheAffinityRunTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest; import org.apache.ignite.internal.processors.cache.IgniteCacheLockPartitionOnAffinityRunTest; @@ -32,18 +33,17 @@ import org.apache.ignite.internal.processors.database.baseline.IgniteBaselineLoc public class IgniteCacheAffinityRunTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Compute and Cache Affinity Run Test Suite"); - suite.addTestSuite(IgniteCacheLockPartitionOnAffinityRunTest.class); - suite.addTestSuite(IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.class); - suite.addTestSuite(IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.class); - suite.addTestSuite(IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.class); - suite.addTestSuite(IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.class); - suite.addTestSuite(IgniteCacheLockPartitionOnAffinityRunTxCacheOpTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheLockPartitionOnAffinityRunTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheLockPartitionOnAffinityRunAtomicCacheOpTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheLockPartitionOnAffinityRunTxCacheOpTest.class)); return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheBlockExchangeOnSqlReadOperationsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheBlockExchangeOnSqlReadOperationsTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheBlockExchangeOnSqlReadOperationsTestSuite.java index 3be640b..4fa8f5d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheBlockExchangeOnSqlReadOperationsTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheBlockExchangeOnSqlReadOperationsTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.distributed.CacheBlockOnCreateDestoryIndexTest; import org.apache.ignite.internal.processors.cache.distributed.CacheBlockOnSqlQueryTest; @@ -31,8 +32,8 @@ public class IgniteCacheBlockExchangeOnSqlReadOperationsTestSuite extends TestSu public static TestSuite suite() { TestSuite suite = new TestSuite("Do Not Block Read Operations Test Suite"); - suite.addTestSuite(CacheBlockOnSqlQueryTest.class); - suite.addTestSuite(CacheBlockOnCreateDestoryIndexTest.class); + suite.addTest(new JUnit4TestAdapter(CacheBlockOnSqlQueryTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheBlockOnCreateDestoryIndexTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java index 15045c9..c2d31f9 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccSqlTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; @@ -84,78 +85,78 @@ public class IgniteCacheMvccSqlTestSuite extends TestSuite { TestSuite suite = new TestSuite("IgniteCache SQL MVCC Test Suite"); // Simple tests. - suite.addTestSuite(MvccEmptyTransactionSelfTest.class); - suite.addTestSuite(CacheMvccSqlConfigurationValidationTest.class); - suite.addTestSuite(CacheMvccDmlSimpleTest.class); - suite.addTestSuite(SqlTransactionsCommandsWithMvccEnabledSelfTest.class); - suite.addTestSuite(CacheMvccSizeTest.class); - suite.addTestSuite(CacheMvccSqlUpdateCountersTest.class); - suite.addTestSuite(CacheMvccSqlLockTimeoutTest.class); + suite.addTest(new JUnit4TestAdapter(MvccEmptyTransactionSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccSqlConfigurationValidationTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccDmlSimpleTest.class)); + suite.addTest(new JUnit4TestAdapter(SqlTransactionsCommandsWithMvccEnabledSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccSizeTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccSqlUpdateCountersTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccSqlLockTimeoutTest.class)); - suite.addTestSuite(GridIndexRebuildWithMvccEnabledSelfTest.class); + suite.addTest(new JUnit4TestAdapter(GridIndexRebuildWithMvccEnabledSelfTest.class)); - suite.addTestSuite(CacheMvccTxNodeMappingTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccTxNodeMappingTest.class)); // SQL vs CacheAPI consistency. - suite.addTestSuite(MvccRepeatableReadOperationsTest.class); - suite.addTestSuite(MvccRepeatableReadBulkOpsTest.class); + suite.addTest(new JUnit4TestAdapter(MvccRepeatableReadOperationsTest.class)); + suite.addTest(new JUnit4TestAdapter(MvccRepeatableReadBulkOpsTest.class)); // JDBC tests. - suite.addTestSuite(CacheMvccSizeWithConcurrentJdbcTransactionTest.class); - suite.addTestSuite(CacheMvccScanQueryWithConcurrentJdbcTransactionTest.class); - suite.addTestSuite(CacheMvccLocalEntriesWithConcurrentJdbcTransactionTest.class); - suite.addTestSuite(CacheMvccIteratorWithConcurrentJdbcTransactionTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccSizeWithConcurrentJdbcTransactionTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccScanQueryWithConcurrentJdbcTransactionTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccLocalEntriesWithConcurrentJdbcTransactionTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccIteratorWithConcurrentJdbcTransactionTest.class)); // Load tests. - suite.addTestSuite(CacheMvccBulkLoadTest.class); - suite.addTestSuite(CacheMvccStreamingInsertTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccBulkLoadTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccStreamingInsertTest.class)); - suite.addTestSuite(CacheMvccPartitionedSqlQueriesTest.class); - suite.addTestSuite(CacheMvccReplicatedSqlQueriesTest.class); - suite.addTestSuite(CacheMvccPartitionedSqlTxQueriesTest.class); - suite.addTestSuite(CacheMvccReplicatedSqlTxQueriesTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSqlQueriesTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSqlQueriesTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSqlTxQueriesTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSqlTxQueriesTest.class)); - suite.addTestSuite(CacheMvccPartitionedSqlTxQueriesWithReducerTest.class); - suite.addTestSuite(CacheMvccReplicatedSqlTxQueriesWithReducerTest.class); - suite.addTestSuite(CacheMvccPartitionedSelectForUpdateQueryTest.class); - suite.addTestSuite(CacheMvccReplicatedSelectForUpdateQueryTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSqlTxQueriesWithReducerTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSqlTxQueriesWithReducerTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSelectForUpdateQueryTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSelectForUpdateQueryTest.class)); // Failover tests. - suite.addTestSuite(CacheMvccPartitionedBackupsTest.class); - suite.addTestSuite(CacheMvccReplicatedBackupsTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedBackupsTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedBackupsTest.class)); - suite.addTestSuite(CacheMvccPartitionedSqlCoordinatorFailoverTest.class); - suite.addTestSuite(CacheMvccReplicatedSqlCoordinatorFailoverTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccPartitionedSqlCoordinatorFailoverTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccReplicatedSqlCoordinatorFailoverTest.class)); // Continuous queries. - suite.addTestSuite(CacheMvccBasicContinuousQueryTest.class); - suite.addTestSuite(CacheMvccContinuousQueryPartitionedSelfTest.class); - suite.addTestSuite(CacheMvccContinuousQueryReplicatedSelfTest.class); - suite.addTestSuite(CacheMvccSqlContinuousQueryPartitionedSelfTest.class); - suite.addTestSuite(CacheMvccSqlContinuousQueryReplicatedSelfTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccBasicContinuousQueryTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryPartitionedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryReplicatedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccSqlContinuousQueryPartitionedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccSqlContinuousQueryReplicatedSelfTest.class)); - suite.addTestSuite(CacheMvccContinuousQueryPartitionedTxOneNodeTest.class); - suite.addTestSuite(CacheMvccContinuousQueryReplicatedTxOneNodeTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryPartitionedTxOneNodeTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryReplicatedTxOneNodeTest.class)); - suite.addTestSuite(CacheMvccContinuousQueryClientReconnectTest.class); - suite.addTestSuite(CacheMvccContinuousQueryClientTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryClientReconnectTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryClientTest.class)); - suite.addTestSuite(CacheMvccContinuousQueryMultiNodesFilteringTest.class); - suite.addTestSuite(CacheMvccContinuousQueryBackupQueueTest.class); - suite.addTestSuite(CacheMvccContinuousQueryImmutableEntryTest.class); - suite.addTestSuite(CacheMvccClientReconnectContinuousQueryTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryMultiNodesFilteringTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryBackupQueueTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousQueryImmutableEntryTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccClientReconnectContinuousQueryTest.class)); - suite.addTestSuite(CacheMvccContinuousWithTransformerClientSelfTest.class); - suite.addTestSuite(CacheMvccContinuousWithTransformerPartitionedSelfTest.class); - suite.addTestSuite(CacheMvccContinuousWithTransformerReplicatedSelfTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousWithTransformerClientSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousWithTransformerPartitionedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheMvccContinuousWithTransformerReplicatedSelfTest.class)); // Transaction recovery. - suite.addTestSuite(CacheMvccTxRecoveryTest.class); + suite.addTest(new JUnit4TestAdapter(CacheMvccTxRecoveryTest.class)); - suite.addTestSuite(MvccPartitionedPrimaryNodeFailureRecoveryTest.class); - suite.addTestSuite(MvccPartitionedTwoBackupsPrimaryNodeFailureRecoveryTest.class); - suite.addTestSuite(MvccColocatedTxPessimisticOriginatingNodeFailureRecoveryTest.class); - suite.addTestSuite(MvccReplicatedTxPessimisticOriginatingNodeFailureRecoveryTest.class); + suite.addTest(new JUnit4TestAdapter(MvccPartitionedPrimaryNodeFailureRecoveryTest.class)); + suite.addTest(new JUnit4TestAdapter(MvccPartitionedTwoBackupsPrimaryNodeFailureRecoveryTest.class)); + suite.addTest(new JUnit4TestAdapter(MvccColocatedTxPessimisticOriginatingNodeFailureRecoveryTest.class)); + suite.addTest(new JUnit4TestAdapter(MvccReplicatedTxPessimisticOriginatingNodeFailureRecoveryTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java index 433aa22..02633e9 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousBatchForceServerModeAckTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryConcurrentPartitionUpdateTest; @@ -48,45 +49,44 @@ import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheC public class IgniteCacheQuerySelfTestSuite3 extends TestSuite { /** * @return Test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Cache Continuous Queries Test Suite"); // Continuous queries 1. - suite.addTestSuite(GridCacheContinuousQueryNodesFilteringTest.class); - suite.addTestSuite(GridCacheContinuousQueryPartitionTxOneNodeTest.class); - suite.addTestSuite(CacheContinuousWithTransformerReplicatedSelfTest.class); - suite.addTestSuite(CacheContinuousQueryExecuteInPrimaryTest.class); - suite.addTestSuite(CacheContinuousWithTransformerClientSelfTest.class); - suite.addTestSuite(ClientReconnectContinuousQueryTest.class); - suite.addTestSuite(IgniteCacheContinuousQueryNoUnsubscribeTest.class); - suite.addTestSuite(IgniteCacheContinuousQueryClientTxReconnectTest.class); - suite.addTestSuite(IgniteCacheContinuousQueryClientReconnectTest.class); - suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryPartitionTxOneNodeTest.class); - suite.addTestSuite(IgniteCacheContinuousQueryClientReconnectTest.class); - suite.addTestSuite(IgniteCacheContinuousQueryClientTxReconnectTest.class); - suite.addTestSuite(GridCacheContinuousQueryReplicatedSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class); - suite.addTestSuite(GridCacheContinuousQueryPartitionedSelfTest.class); - suite.addTestSuite(CacheContinuousBatchForceServerModeAckTest.class); - suite.addTestSuite(CacheContinuousQueryExecuteInPrimaryTest.class); - suite.addTestSuite(GridCacheContinuousQueryNodesFilteringTest.class); - suite.addTestSuite(IgniteCacheContinuousQueryNoUnsubscribeTest.class); - suite.addTestSuite(ClientReconnectContinuousQueryTest.class); - suite.addTestSuite(ContinuousQueryReassignmentTest.class); - suite.addTestSuite(CacheContinuousQueryConcurrentPartitionUpdateTest.class); - suite.addTestSuite(CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryNodesFilteringTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionTxOneNodeTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerReplicatedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryExecuteInPrimaryTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerClientSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientReconnectContinuousQueryTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryNoUnsubscribeTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientTxReconnectTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientReconnectTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryAtomicSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionTxOneNodeTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientReconnectTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientTxReconnectTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousBatchForceServerModeAckTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryExecuteInPrimaryTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryNodesFilteringTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryNoUnsubscribeTest.class)); + suite.addTest(new JUnit4TestAdapter(ClientReconnectContinuousQueryTest.class)); + suite.addTest(new JUnit4TestAdapter(ContinuousQueryReassignmentTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryConcurrentPartitionUpdateTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class)); - suite.addTestSuite(CacheContinuousQueryCounterPartitionedAtomicTest.class); - suite.addTestSuite(CacheContinuousQueryCounterPartitionedTxTest.class); - suite.addTestSuite(CacheContinuousQueryCounterReplicatedAtomicTest.class); - suite.addTestSuite(CacheContinuousQueryCounterReplicatedTxTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.class); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryCounterPartitionedAtomicTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryCounterPartitionedTxTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryCounterReplicatedAtomicTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryCounterReplicatedTxTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.class)); - suite.addTestSuite(IgniteCacheContinuousQueryReconnectTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryReconnectTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java index 147eb47..d39fce9 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverAtomicSelfTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverMvccTxSelfTest; @@ -35,23 +36,22 @@ import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinu public class IgniteCacheQuerySelfTestSuite4 extends TestSuite { /** * @return Test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Cache Queries Test Suite 4"); // Continuous queries failover tests. - suite.addTestSuite(CacheContinuousQueryFailoverAtomicSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverTxSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverTxReplicatedSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverMvccTxSelfTest.class); - suite.addTestSuite(CacheContinuousQueryFailoverMvccTxReplicatedSelfTest.class); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverAtomicSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverTxSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverTxReplicatedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverMvccTxSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFailoverMvccTxReplicatedSelfTest.class)); - suite.addTestSuite(CacheContinuousQueryAsyncFailoverAtomicSelfTest.class); - suite.addTestSuite(CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest.class); - suite.addTestSuite(CacheContinuousQueryAsyncFailoverTxSelfTest.class); - suite.addTestSuite(CacheContinuousQueryAsyncFailoverMvccTxSelfTest.class); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFailoverAtomicSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFailoverTxSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFailoverMvccTxSelfTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java index 6fb542e..882757a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite5.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEventBufferTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFactoryFilterRandomOperationTest; @@ -43,30 +44,29 @@ import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheC public class IgniteCacheQuerySelfTestSuite5 extends TestSuite { /** * @return Test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Cache Continuous Queries Test Suite 2"); // Continuous queries 2. - suite.addTestSuite(IgniteCacheContinuousQueryImmutableEntryTest.class); - suite.addTestSuite(CacheContinuousWithTransformerLocalSelfTest.class); - suite.addTestSuite(CacheContinuousQueryEventBufferTest.class); - suite.addTestSuite(GridCacheContinuousQueryReplicatedTxOneNodeTest.class); - suite.addTestSuite(GridCacheContinuousQueryLocalSelfTest.class); - suite.addTestSuite(CacheContinuousWithTransformerFailoverTest.class); - suite.addTestSuite(ContinuousQueryRemoteFilterMissingInClassPathSelfTest.class); - suite.addTestSuite(ContinuousQueryPeerClassLoadingTest.class); - suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryTxSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class); - suite.addTestSuite(CacheContinuousQueryLostPartitionTest.class); - suite.addTestSuite(GridCacheContinuousQueryConcurrentTest.class); - suite.addTestSuite(CacheContinuousQueryRandomOperationsTwoNodesTest.class); - suite.addTestSuite(IgniteCacheContinuousQueryBackupQueueTest.class); - suite.addTestSuite(CacheContinuousQueryOperationFromCallbackTest.class); - suite.addTestSuite(CacheContinuousQueryFactoryFilterRandomOperationTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryImmutableEntryTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerLocalSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryEventBufferTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedTxOneNodeTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryLocalSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerFailoverTest.class)); + suite.addTest(new JUnit4TestAdapter(ContinuousQueryRemoteFilterMissingInClassPathSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(ContinuousQueryPeerClassLoadingTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryTxSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedP2PDisabledSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionedP2PDisabledSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryLostPartitionTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryConcurrentTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryRandomOperationsTwoNodesTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryBackupQueueTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryOperationFromCallbackTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryFactoryFilterRandomOperationTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java index 9727b18..846e648 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite6.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousBatchAckTest; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFilterListenerTest; @@ -43,30 +44,29 @@ import org.apache.ignite.internal.processors.cache.query.continuous.IgniteCacheC public class IgniteCacheQuerySelfTestSuite6 extends TestSuite { /** * @return Test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Cache Continuous Queries Test Suite 3"); // Continuous queries 3. - suite.addTestSuite(GridCacheContinuousQueryPartitionAtomicOneNodeTest.class); - suite.addTestSuite(CacheContinuousWithTransformerPartitionedSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicOneNodeTest.class); - suite.addTestSuite(ContinuousQueryMarshallerTest.class); - suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class); - suite.addTestSuite(CacheKeepBinaryIterationTest.class); - suite.addTestSuite(GridCacheContinuousQueryMultiNodesFilteringTest.class); - suite.addTestSuite(CacheKeepBinaryIterationStoreEnabledTest.class); - suite.addTestSuite(CacheKeepBinaryIterationNearEnabledTest.class); - suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class); - suite.addTestSuite(CacheContinuousQueryOperationP2PTest.class); - suite.addTestSuite(CacheContinuousBatchAckTest.class); - suite.addTestSuite(CacheContinuousQueryOrderingEventTest.class); - suite.addTestSuite(IgniteCacheContinuousQueryClientTest.class); - suite.addTestSuite(CacheContinuousQueryAsyncFilterListenerTest.class); - suite.addTestSuite(CacheContinuousWithTransformerRandomOperationsTest.class); - suite.addTestSuite(CacheContinuousQueryRandomOperationsTest.class); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionAtomicOneNodeTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerPartitionedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryLocalAtomicSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedAtomicOneNodeTest.class)); + suite.addTest(new JUnit4TestAdapter(ContinuousQueryMarshallerTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryReplicatedAtomicSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheKeepBinaryIterationTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryMultiNodesFilteringTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheKeepBinaryIterationStoreEnabledTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheKeepBinaryIterationNearEnabledTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheContinuousQueryPartitionedOnlySelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryOperationP2PTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousBatchAckTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryOrderingEventTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheContinuousQueryClientTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryAsyncFilterListenerTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousWithTransformerRandomOperationsTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheContinuousQueryRandomOperationsTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java index 2f3ddec..23f0721 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingAndPersistenceTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.StartCachesInParallelTest; import org.apache.ignite.util.GridCommandHandlerIndexingTest; @@ -27,13 +28,12 @@ import org.apache.ignite.util.GridCommandHandlerIndexingTest; public class IgniteCacheWithIndexingAndPersistenceTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Cache With Indexing And Persistence Test Suite"); - suite.addTestSuite(GridCommandHandlerIndexingTest.class); - suite.addTestSuite(StartCachesInParallelTest.class); + suite.addTest(new JUnit4TestAdapter(GridCommandHandlerIndexingTest.class)); + suite.addTest(new JUnit4TestAdapter(StartCachesInParallelTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java index ab79ce3..c292c8f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheWithIndexingTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.BinaryTypeMismatchLoggingTest; import org.apache.ignite.internal.processors.cache.CacheBinaryKeyConcurrentQueryTest; @@ -49,46 +50,45 @@ import org.apache.ignite.internal.processors.query.h2.database.InlineIndexHelper public class IgniteCacheWithIndexingTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Cache With Indexing Test Suite"); - suite.addTestSuite(InlineIndexHelperTest.class); + suite.addTest(new JUnit4TestAdapter(InlineIndexHelperTest.class)); - suite.addTestSuite(GridIndexingWithNoopSwapSelfTest.class); - suite.addTestSuite(GridCacheOffHeapSelfTest.class); + suite.addTest(new JUnit4TestAdapter(GridIndexingWithNoopSwapSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheOffHeapSelfTest.class)); - suite.addTestSuite(CacheTtlTransactionalLocalSelfTest.class); - suite.addTestSuite(CacheTtlTransactionalPartitionedSelfTest.class); - suite.addTestSuite(CacheTtlAtomicLocalSelfTest.class); - suite.addTestSuite(CacheTtlAtomicPartitionedSelfTest.class); + suite.addTest(new JUnit4TestAdapter(CacheTtlTransactionalLocalSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheTtlTransactionalPartitionedSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheTtlAtomicLocalSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheTtlAtomicPartitionedSelfTest.class)); - suite.addTestSuite(GridCacheOffheapIndexGetSelfTest.class); - suite.addTestSuite(GridCacheOffheapIndexEntryEvictTest.class); - suite.addTestSuite(CacheIndexStreamerTest.class); + suite.addTest(new JUnit4TestAdapter(GridCacheOffheapIndexGetSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(GridCacheOffheapIndexEntryEvictTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheIndexStreamerTest.class)); - suite.addTestSuite(CacheConfigurationP2PTest.class); + suite.addTest(new JUnit4TestAdapter(CacheConfigurationP2PTest.class)); - suite.addTestSuite(IgniteCacheConfigurationPrimitiveTypesSelfTest.class); - suite.addTestSuite(IgniteClientReconnectQueriesTest.class); - suite.addTestSuite(CacheRandomOperationsMultithreadedTest.class); - suite.addTestSuite(IgniteCacheStarvationOnRebalanceTest.class); - suite.addTestSuite(CacheOperationsWithExpirationTest.class); - suite.addTestSuite(CacheBinaryKeyConcurrentQueryTest.class); - suite.addTestSuite(CacheQueryFilterExpiredTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheConfigurationPrimitiveTypesSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteClientReconnectQueriesTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheRandomOperationsMultithreadedTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteCacheStarvationOnRebalanceTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheOperationsWithExpirationTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheBinaryKeyConcurrentQueryTest.class)); + suite.addTest(new JUnit4TestAdapter(CacheQueryFilterExpiredTest.class)); - suite.addTestSuite(ClientReconnectAfterClusterRestartTest.class); + suite.addTest(new JUnit4TestAdapter(ClientReconnectAfterClusterRestartTest.class)); - suite.addTestSuite(CacheQueryAfterDynamicCacheStartFailureTest.class); + suite.addTest(new JUnit4TestAdapter(CacheQueryAfterDynamicCacheStartFailureTest.class)); - suite.addTestSuite(IgniteCacheGroupsSqlTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteCacheGroupsSqlTest.class)); - suite.addTestSuite(IgniteDataStreamerTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteDataStreamerTest.class)); - suite.addTestSuite(BinaryTypeMismatchLoggingTest.class); + suite.addTest(new JUnit4TestAdapter(BinaryTypeMismatchLoggingTest.class)); - suite.addTestSuite(ClusterReadOnlyModeSqlTest.class); + suite.addTest(new JUnit4TestAdapter(ClusterReadOnlyModeSqlTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java index 36cd101..150d3e2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDbMemoryLeakWithIndexingTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.database.IgniteDbMemoryLeakIndexedTest; import org.apache.ignite.internal.processors.database.IgniteDbMemoryLeakSqlQueryTest; @@ -27,13 +28,12 @@ import org.apache.ignite.internal.processors.database.IgniteDbMemoryLeakSqlQuery public class IgniteDbMemoryLeakWithIndexingTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Db Memory Leaks With Indexing Test Suite"); - suite.addTestSuite(IgniteDbMemoryLeakSqlQueryTest.class); - suite.addTestSuite(IgniteDbMemoryLeakIndexedTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteDbMemoryLeakSqlQueryTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteDbMemoryLeakIndexedTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java index 214a541..528c713 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java @@ -16,6 +16,7 @@ */ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsAtomicCacheHistoricalRebalancingTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsAtomicCacheRebalancingTest; @@ -50,46 +51,45 @@ import org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRollove public class IgnitePdsWithIndexingCoreTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Persistent Store With Indexing Test Suite"); - suite.addTestSuite(IgnitePdsCacheIntegrationTest.class); - suite.addTestSuite(IgnitePdsPageEvictionTest.class); - suite.addTestSuite(IgnitePdsMultiNodePutGetRestartTest.class); - suite.addTestSuite(IgnitePersistentStoreCacheGroupsTest.class); - suite.addTestSuite(PersistenceDirectoryWarningLoggingTest.class); - suite.addTestSuite(WalPathsTest.class); - suite.addTestSuite(WalRecoveryTxLogicalRecordsTest.class); - suite.addTestSuite(WalRolloverRecordLoggingFsyncTest.class); - suite.addTestSuite(WalRolloverRecordLoggingLogOnlyTest.class); + suite.addTest(new JUnit4TestAdapter(IgnitePdsCacheIntegrationTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsPageEvictionTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsMultiNodePutGetRestartTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePersistentStoreCacheGroupsTest.class)); + suite.addTest(new JUnit4TestAdapter(PersistenceDirectoryWarningLoggingTest.class)); + suite.addTest(new JUnit4TestAdapter(WalPathsTest.class)); + suite.addTest(new JUnit4TestAdapter(WalRecoveryTxLogicalRecordsTest.class)); + suite.addTest(new JUnit4TestAdapter(WalRolloverRecordLoggingFsyncTest.class)); + suite.addTest(new JUnit4TestAdapter(WalRolloverRecordLoggingLogOnlyTest.class)); - suite.addTestSuite(IgniteWalRecoveryTest.class); - suite.addTestSuite(IgniteWalRecoveryWithCompactionTest.class); - suite.addTestSuite(IgnitePdsNoActualWalHistoryTest.class); - suite.addTestSuite(IgniteWalRebalanceTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteWalRecoveryTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteWalRecoveryWithCompactionTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsNoActualWalHistoryTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteWalRebalanceTest.class)); - suite.addTestSuite(IgnitePdsAtomicCacheRebalancingTest.class); - suite.addTestSuite(IgnitePdsAtomicCacheHistoricalRebalancingTest.class); + suite.addTest(new JUnit4TestAdapter(IgnitePdsAtomicCacheRebalancingTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsAtomicCacheHistoricalRebalancingTest.class)); - suite.addTestSuite(IgnitePdsTxCacheRebalancingTest.class); - suite.addTestSuite(IgnitePdsTxHistoricalRebalancingTest.class); + suite.addTest(new JUnit4TestAdapter(IgnitePdsTxCacheRebalancingTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsTxHistoricalRebalancingTest.class)); - suite.addTestSuite(IgniteWalRecoveryPPCTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteWalRecoveryPPCTest.class)); - suite.addTestSuite(IgnitePdsDiskErrorsRecoveringTest.class); + suite.addTest(new JUnit4TestAdapter(IgnitePdsDiskErrorsRecoveringTest.class)); - suite.addTestSuite(IgnitePdsCacheDestroyDuringCheckpointTest.class); + suite.addTest(new JUnit4TestAdapter(IgnitePdsCacheDestroyDuringCheckpointTest.class)); - suite.addTestSuite(IgnitePdsBinaryMetadataOnClusterRestartTest.class); - suite.addTestSuite(IgnitePdsMarshallerMappingRestoreOnNodeStartTest.class); - suite.addTestSuite(IgnitePdsThreadInterruptionTest.class); - suite.addTestSuite(IgnitePdsBinarySortObjectFieldsTest.class); + suite.addTest(new JUnit4TestAdapter(IgnitePdsBinaryMetadataOnClusterRestartTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsMarshallerMappingRestoreOnNodeStartTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsThreadInterruptionTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsBinarySortObjectFieldsTest.class)); - suite.addTestSuite(IgnitePdsCorruptedIndexTest.class); + suite.addTest(new JUnit4TestAdapter(IgnitePdsCorruptedIndexTest.class)); - suite.addTestSuite(IgniteLogicalRecoveryTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteLogicalRecoveryTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java index 67b9fad..a707868 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.IgnitePdsSingleNodeWithIndexingAndGroupPutGetPersistenceSelfTest; import org.apache.ignite.internal.processors.cache.IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest; @@ -33,19 +34,18 @@ import org.apache.ignite.internal.processors.database.IgniteTwoRegionsRebuildInd public class IgnitePdsWithIndexingTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Db Memory Leaks With Indexing Test Suite"); - suite.addTestSuite(IgniteDbSingleNodeWithIndexingWalRestoreTest.class); - suite.addTestSuite(IgniteDbSingleNodeWithIndexingPutGetTest.class); - suite.addTestSuite(IgniteDbMultiNodeWithIndexingPutGetTest.class); - suite.addTestSuite(IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.class); - suite.addTestSuite(IgnitePdsSingleNodeWithIndexingAndGroupPutGetPersistenceSelfTest.class); - suite.addTestSuite(IgnitePersistentStoreSchemaLoadTest.class); - suite.addTestSuite(IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.class); - suite.addTestSuite(IgniteTwoRegionsRebuildIndexTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteDbSingleNodeWithIndexingWalRestoreTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteDbSingleNodeWithIndexingPutGetTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteDbMultiNodeWithIndexingPutGetTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePdsSingleNodeWithIndexingAndGroupPutGetPersistenceSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePersistentStoreSchemaLoadTest.class)); + suite.addTest(new JUnit4TestAdapter(IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteTwoRegionsRebuildIndexTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java b/modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java index 3e47372..c705af1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java @@ -50,6 +50,9 @@ import org.apache.ignite.internal.util.lang.GridIterator; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.U; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_OK; import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.INDEX_FILE_NAME; @@ -57,6 +60,7 @@ import static org.apache.ignite.internal.processors.cache.persistence.file.FileP /** * */ +@RunWith(JUnit4.class) public class GridCommandHandlerIndexingTest extends GridCommandHandlerTest { /** Test cache name. */ private static final String CACHE_NAME = "persons-cache-vi"; @@ -64,6 +68,7 @@ public class GridCommandHandlerIndexingTest extends GridCommandHandlerTest { /** * Tests that validation doesn't fail if nothing is broken. */ + @Test public void testValidateIndexesNoErrors() throws Exception { prepareGridForTest(); @@ -77,6 +82,7 @@ public class GridCommandHandlerIndexingTest extends GridCommandHandlerTest { /** * Tests that missing rows in CacheDataTree are detected. */ + @Test public void testBrokenCacheDataTreeShouldFailValidation() throws Exception { Ignite ignite = prepareGridForTest(); @@ -101,6 +107,7 @@ public class GridCommandHandlerIndexingTest extends GridCommandHandlerTest { /** * Tests that missing rows in H2 indexes are detected. */ + @Test public void testBrokenSqlIndexShouldFailValidation() throws Exception { Ignite ignite = prepareGridForTest(); @@ -116,6 +123,7 @@ public class GridCommandHandlerIndexingTest extends GridCommandHandlerTest { /** * Tests that corrupted pages in the index partition are detected. */ + @Test public void testCorruptedIndexPartitionShouldFailValidation() throws Exception { Ignite ignite = prepareGridForTest(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java8/org/apache/ignite/internal/processors/query/h2/CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java8/org/apache/ignite/internal/processors/query/h2/CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest.java b/modules/indexing/src/test/java8/org/apache/ignite/internal/processors/query/h2/CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest.java index 9cb0f21..1854978 100644 --- a/modules/indexing/src/test/java8/org/apache/ignite/internal/processors/query/h2/CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest.java +++ b/modules/indexing/src/test/java8/org/apache/ignite/internal/processors/query/h2/CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest.java @@ -35,6 +35,7 @@ import org.apache.ignite.configuration.CacheConfiguration; /** * Tests queries against entities with JSR-310 Java 8 Date and Time API fields. */ +@RunWith(JUnit4.class) public class CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest extends CacheQueryJsr310Java8DateTimeApiAbstractTest { /** * Entity containing JSR-310 fields. @@ -222,6 +223,7 @@ public class CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest extends CacheQ * * @throws Exception If failed. */ + @Test public void testInsertEntityFields() throws Exception { cache.remove(entity.getId()); @@ -247,6 +249,7 @@ public class CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest extends CacheQ * * @throws Exception If failed. */ + @Test public void testDateDiffForLocalDateTimeFieldAtMidnight() throws Exception { SqlFieldsQuery qry = new SqlFieldsQuery("select DATEDIFF('DAY', locDateTime, CURRENT_DATE ()) from EntityWithJsr310Fields"); @@ -262,6 +265,7 @@ public class CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest extends CacheQ * * @throws Exception If failed. */ + @Test public void testSelectLocalTimeFieldReturnsTime() throws Exception { SqlFieldsQuery qry = new SqlFieldsQuery("select locTime from EntityWithJsr310Fields"); @@ -276,6 +280,7 @@ public class CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest extends CacheQ * * @throws Exception If failed. */ + @Test public void testSelectLocalDateFieldReturnsDate() throws Exception { SqlFieldsQuery qry = new SqlFieldsQuery("select locDate from EntityWithJsr310Fields"); @@ -290,6 +295,7 @@ public class CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest extends CacheQ * * @throws Exception If failed. */ + @Test public void testSelectLocalDateTimeFieldReturnsTimestamp() throws Exception { SqlFieldsQuery qry = new SqlFieldsQuery("select locDateTime from EntityWithJsr310Fields"); @@ -302,6 +308,7 @@ public class CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest extends CacheQ /** * Tests selection of an entity by a {@link LocalTime} field. */ + @Test public void testSelectByAllJsr310Fields() { SqlFieldsQuery qry = new SqlFieldsQuery( "select locDate from EntityWithJsr310Fields where locTime = ? and locDate = ? and locDateTime = ?" @@ -316,6 +323,7 @@ public class CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest extends CacheQ /** * Tests updating of all JSR-310 fields. */ + @Test public void testUpdateAllJsr310Fields() { EntityWithJsr310Fields expEntity = new EntityWithJsr310Fields(entity); @@ -337,6 +345,7 @@ public class CacheQueryEntityWithJsr310Java8DateTimeApiFieldsTest extends CacheQ /** * Tests deleting by all JSR-310 fields. */ + @Test public void testDeleteByAllJsr310Fields() { SqlFieldsQuery qry = new SqlFieldsQuery( "delete from EntityWithJsr310Fields where locTime = ? and locDate = ? and locDateTime = ?"
