http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java index 018fd94..45566b5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java @@ -66,11 +66,15 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; import org.h2.jdbc.JdbcSQLException; import org.h2.value.DataType; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for CREATE/DROP TABLE. */ @SuppressWarnings("ThrowableNotThrown") +@RunWith(JUnit4.class) public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** Client node index. */ private static final int CLIENT = 2; @@ -131,6 +135,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that {@code CREATE TABLE} actually creates new cache, H2 table and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testCreateTable() throws Exception { doTestCreateTable(CACHE_NAME, null, null, null); } @@ -139,6 +144,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that {@code CREATE TABLE} actually creates new cache, H2 table and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testCreateTableWithCacheGroup() throws Exception { doTestCreateTable(CACHE_NAME, "MyGroup", null, null); } @@ -147,6 +153,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that {@code CREATE TABLE} actually creates new cache, H2 table and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testCreateTableWithCacheGroupAndLegacyParamName() throws Exception { doTestCreateTable(CACHE_NAME, "MyGroup", null, null, true); } @@ -156,6 +163,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * H2 table and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testCreateTableWithWriteSyncMode() throws Exception { doTestCreateTable(CACHE_NAME + "_async", null, null, CacheWriteSynchronizationMode.FULL_ASYNC); } @@ -165,6 +173,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * H2 table and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testCreateTableReplicated() throws Exception { doTestCreateTable("REPLICATED", null, CacheMode.REPLICATED, CacheWriteSynchronizationMode.FULL_SYNC); } @@ -174,6 +183,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * H2 table and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testCreateTablePartitioned() throws Exception { doTestCreateTable("PARTITIONED", null, CacheMode.PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC); } @@ -183,6 +193,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * H2 table and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testCreateTableReplicatedCaseInsensitive() throws Exception { doTestCreateTable("replicated", null, CacheMode.REPLICATED, CacheWriteSynchronizationMode.FULL_SYNC); } @@ -192,6 +203,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * H2 table and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testCreateTablePartitionedCaseInsensitive() throws Exception { doTestCreateTable("partitioned", null, CacheMode.PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC); } @@ -201,6 +213,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * H2 table and type descriptor on all nodes, when no cache template name is given. * @throws Exception if failed. */ + @Test public void testCreateTableNoTemplate() throws Exception { doTestCreateTable(null, null, CacheMode.PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC); } @@ -208,6 +221,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test behavior depending on table name case sensitivity. */ + @Test public void testTableNameCaseSensitivity() { doTestTableNameCaseSensitivity("Person", false); @@ -218,6 +232,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that {@code CREATE TABLE} with given write sync mode actually creates new cache as needed. * @throws Exception if failed. */ + @Test public void testFullSyncWriteMode() throws Exception { doTestCreateTable(null, null, null, CacheWriteSynchronizationMode.FULL_SYNC, "write_synchronization_mode=full_sync"); @@ -227,6 +242,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that {@code CREATE TABLE} with given write sync mode actually creates new cache as needed. * @throws Exception if failed. */ + @Test public void testPrimarySyncWriteMode() throws Exception { doTestCreateTable(null, null, null, CacheWriteSynchronizationMode.PRIMARY_SYNC, "write_synchronization_mode=primary_sync"); @@ -236,6 +252,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that {@code CREATE TABLE} with given write sync mode actually creates new cache as needed. * @throws Exception if failed. */ + @Test public void testFullAsyncWriteMode() throws Exception { doTestCreateTable(null, null, null, CacheWriteSynchronizationMode.FULL_ASYNC, "write_synchronization_mode=full_async"); @@ -244,6 +261,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test behavior only in case of cache name override. */ + @Test public void testCustomCacheName() { doTestCustomNames("cname", null, null); } @@ -251,6 +269,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test behavior only in case of key type name override. */ + @Test public void testCustomKeyTypeName() { doTestCustomNames(null, "keytype", null); } @@ -258,6 +277,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test behavior only in case of value type name override. */ + @Test public void testCustomValueTypeName() { doTestCustomNames(null, null, "valtype"); } @@ -265,6 +285,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test behavior only in case of cache and key type name override. */ + @Test public void testCustomCacheAndKeyTypeName() { doTestCustomNames("cname", "keytype", null); } @@ -272,6 +293,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test behavior only in case of cache and value type name override. */ + @Test public void testCustomCacheAndValueTypeName() { doTestCustomNames("cname", null, "valtype"); } @@ -279,6 +301,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test behavior only in case of key and value type name override. */ + @Test public void testCustomKeyAndValueTypeName() { doTestCustomNames(null, "keytype", "valtype"); } @@ -286,6 +309,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test behavior only in case of cache, key, and value type name override. */ + @Test public void testCustomCacheAndKeyAndValueTypeName() { doTestCustomNames("cname", "keytype", "valtype"); } @@ -294,6 +318,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that attempting to create a cache with a pre-existing name yields an error. * @throws Exception if failed. */ + @Test public void testDuplicateCustomCacheName() throws Exception { client().getOrCreateCache("new"); @@ -313,6 +338,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that {@code CREATE TABLE} with given write sync mode actually creates new cache as needed. * @throws Exception if failed. */ + @Test public void testPlainKey() throws Exception { doTestCreateTable(null, null, null, CacheWriteSynchronizationMode.FULL_SYNC); } @@ -500,6 +526,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * @throws Exception If failed. */ @SuppressWarnings("unchecked") + @Test public void testBackups() throws Exception { String cacheName = "BackupTestCache"; @@ -621,6 +648,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that attempting to specify negative number of backups yields exception. */ + @Test public void testNegativeBackups() { assertCreateTableWithParamsThrows("bAckUPs = -5 ", "\"BACKUPS\" cannot be negative: -5"); } @@ -628,6 +656,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that attempting to omit mandatory value of BACKUPS parameter yields an error. */ + @Test public void testEmptyBackups() { assertCreateTableWithParamsThrows(" bAckUPs = ", "Parameter value cannot be empty: BACKUPS"); } @@ -635,6 +664,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that attempting to omit mandatory value of ATOMICITY parameter yields an error. */ + @Test public void testEmptyAtomicity() { assertCreateTableWithParamsThrows("AtomicitY= ", "Parameter value cannot be empty: ATOMICITY"); } @@ -642,6 +672,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that providing an invalid value of ATOMICITY parameter yields an error. */ + @Test public void testInvalidAtomicity() { assertCreateTableWithParamsThrows("atomicity=InvalidValue", "Invalid value of \"ATOMICITY\" parameter (should be either TRANSACTIONAL or ATOMIC): InvalidValue"); @@ -650,6 +681,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that attempting to omit mandatory value of CACHEGROUP parameter yields an error. */ + @Test public void testEmptyCacheGroup() { assertCreateTableWithParamsThrows("cache_group=", "Parameter value cannot be empty: CACHE_GROUP"); } @@ -657,6 +689,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that attempting to omit mandatory value of WRITE_SYNCHRONIZATION_MODE parameter yields an error. */ + @Test public void testEmptyWriteSyncMode() { assertCreateTableWithParamsThrows("write_synchronization_mode=", "Parameter value cannot be empty: WRITE_SYNCHRONIZATION_MODE"); @@ -665,6 +698,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that attempting to provide invalid value of WRITE_SYNCHRONIZATION_MODE parameter yields an error. */ + @Test public void testInvalidWriteSyncMode() { assertCreateTableWithParamsThrows("write_synchronization_mode=invalid", "Invalid value of \"WRITE_SYNCHRONIZATION_MODE\" parameter " + @@ -676,6 +710,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * contains {@code IF NOT EXISTS} clause. * @throws Exception if failed. */ + @Test public void testCreateTableIfNotExists() throws Exception { execute("CREATE TABLE \"Person\" (\"id\" int, \"city\" varchar," + " \"name\" varchar, \"surname\" varchar, \"age\" int, PRIMARY KEY (\"id\", \"city\")) WITH " + @@ -690,6 +725,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that attempting to {@code CREATE TABLE} that already exists yields an error. * @throws Exception if failed. */ + @Test public void testCreateExistingTable() throws Exception { execute("CREATE TABLE \"Person\" (\"id\" int, \"city\" varchar," + " \"name\" varchar, \"surname\" varchar, \"age\" int, PRIMARY KEY (\"id\", \"city\")) WITH " + @@ -711,6 +747,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * yields an error. * @throws Exception if failed. */ + @Test public void testCreateTableWithWrongColumnNameAsKey() throws Exception { GridTestUtils.assertThrows(null, new Callable<Object>() { @Override public Object call() throws Exception { @@ -727,6 +764,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that {@code DROP TABLE} executed at client node actually removes specified cache and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testDropTableFromClient() throws Exception { execute(grid(0),"CREATE TABLE IF NOT EXISTS \"Person\" (\"id\" int, \"city\" varchar," + " \"name\" varchar, \"surname\" varchar, \"age\" int, PRIMARY KEY (\"id\", \"city\")) WITH " + @@ -749,6 +787,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that {@code DROP TABLE} actually removes specified cache and type descriptor on all nodes. * @throws Exception if failed. */ + @Test public void testDropTable() throws Exception { execute("CREATE TABLE IF NOT EXISTS \"Person\" (\"id\" int, \"city\" varchar," + " \"name\" varchar, \"surname\" varchar, \"age\" int, PRIMARY KEY (\"id\", \"city\")) WITH " + @@ -771,6 +810,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that attempting to execute {@code DROP TABLE} via API of cache being dropped yields an error. * @throws Exception if failed. */ + @Test public void testCacheSelfDrop() throws Exception { execute("CREATE TABLE IF NOT EXISTS \"Person\" (\"id\" int, \"city\" varchar," + " \"name\" varchar, \"surname\" varchar, \"age\" int, PRIMARY KEY (\"id\", \"city\")) WITH " + @@ -795,6 +835,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * * @throws Exception if failed. */ + @Test public void testDropMissingTableIfExists() throws Exception { execute("DROP TABLE IF EXISTS \"City\""); } @@ -803,6 +844,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that attempting to {@code DROP TABLE} that does not exist yields an error. * @throws Exception if failed. */ + @Test public void testDropMissingTable() throws Exception { GridTestUtils.assertThrows(null, new Callable<Object>() { @Override public Object call() throws Exception { @@ -817,6 +859,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Check that {@code DROP TABLE} for caches not created with {@code CREATE TABLE} yields an error. * @throws Exception if failed. */ + @Test public void testDropNonDynamicTable() throws Exception { GridTestUtils.assertThrows(null, new Callable<Object>() { @Override public Object call() throws Exception { @@ -832,6 +875,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test that attempting to destroy via cache API a cache created via SQL finishes successfully. * @throws Exception if failed. */ + @Test public void testDestroyDynamicSqlCache() throws Exception { execute("CREATE TABLE \"Person\" (\"id\" int, \"city\" varchar," + " \"name\" varchar, \"surname\" varchar, \"age\" int, PRIMARY KEY (\"id\", \"city\")) WITH " + @@ -845,6 +889,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * SQL flag does not match that of cache with the same name that is already started, yields an error. * @throws Exception if failed. */ + @Test public void testSqlFlagCompatibilityCheck() throws Exception { execute("CREATE TABLE \"Person\" (\"id\" int, \"city\" varchar, \"name\" varchar, \"surname\" varchar, " + "\"age\" int, PRIMARY KEY (\"id\", \"city\")) WITH \"template=cache\""); @@ -865,6 +910,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Tests index name conflict check in discovery thread. * @throws Exception if failed. */ + @Test public void testIndexNameConflictCheckDiscovery() throws Exception { execute(grid(0), "CREATE TABLE \"Person\" (id int primary key, name varchar)"); @@ -893,6 +939,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Tests table name conflict check in {@link DdlStatementsProcessor}. * @throws Exception if failed. */ + @Test public void testTableNameConflictCheckSql() throws Exception { execute(grid(0), "CREATE TABLE \"Person\" (id int primary key, name varchar)"); @@ -908,6 +955,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * @throws Exception if failed. */ + @Test public void testAffinityKey() throws Exception { execute("CREATE TABLE \"City\" (\"name\" varchar primary key, \"code\" int) WITH wrap_key,wrap_value," + "\"affinity_key='name'\""); @@ -969,6 +1017,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * @throws Exception If failed. */ @SuppressWarnings({"ThrowableNotThrown", "unchecked"}) + @Test public void testDataRegion() throws Exception { // Empty region name. GridTestUtils.assertThrows(log, new Callable<Void>() { @@ -993,6 +1042,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test various cases of affinity key column specification. */ + @Test public void testAffinityKeyCaseSensitivity() { execute("CREATE TABLE \"A\" (\"name\" varchar primary key, \"code\" int) WITH wrap_key,wrap_value," + "\"affinity_key='name'\""); @@ -1054,6 +1104,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Tests that attempting to specify an affinity key that actually is a value column yields an error. */ + @Test public void testAffinityKeyNotKeyColumn() { // Error arises because user has specified case sensitive affinity column name GridTestUtils.assertThrows(null, new Callable<Object>() { @@ -1068,6 +1119,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Tests that attempting to specify an affinity key that actually is a value column yields an error. */ + @Test public void testAffinityKeyNotFound() { // Error arises because user has specified case sensitive affinity column name GridTestUtils.assertThrows(null, new Callable<Object>() { @@ -1082,6 +1134,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Tests behavior on sequential create and drop of a table and its index. */ + @Test public void testTableAndIndexRecreate() { execute("drop table if exists \"PUBLIC\".t"); @@ -1125,6 +1178,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * @throws Exception If test failed. */ + @Test public void testQueryLocalWithRecreate() throws Exception { execute("CREATE TABLE A(id int primary key, name varchar, surname varchar) WITH \"cache_name=cache," + "template=replicated\""); @@ -1158,6 +1212,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that it's impossible to create tables with same name regardless of key/value wrapping settings. */ + @Test public void testWrappedAndUnwrappedKeyTablesInteroperability() { { execute("create table a (id int primary key, x varchar)"); @@ -1223,6 +1278,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that it's possible to create tables with matching key and/or value primitive types. */ + @Test public void testDynamicTablesInteroperability() { execute("create table a (id int primary key, x varchar) with \"wrap_value=false\""); @@ -1244,6 +1300,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { /** * Test that when key or value has more than one column, wrap=false is forbidden. */ + @Test public void testWrappingAlwaysOnWithComplexObjects() { assertDdlCommandThrows("create table a (id int, x varchar, c long, primary key(id, c)) with \"wrap_key=false\"", "WRAP_KEY cannot be false when composite primary key exists."); @@ -1256,6 +1313,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test behavior when neither key nor value should be wrapped. * @throws SQLException if failed. */ + @Test public void testNoWrap() throws SQLException { doTestKeyValueWrap(false, false, false); } @@ -1264,6 +1322,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test behavior when only key is wrapped. * @throws SQLException if failed. */ + @Test public void testKeyWrap() throws SQLException { doTestKeyValueWrap(true, false, false); } @@ -1272,6 +1331,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test behavior when only value is wrapped. * @throws SQLException if failed. */ + @Test public void testValueWrap() throws SQLException { doTestKeyValueWrap(false, true, false); } @@ -1280,6 +1340,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Test behavior when both key and value is wrapped. * @throws SQLException if failed. */ + @Test public void testKeyAndValueWrap() throws SQLException { doTestKeyValueWrap(true, true, false); } @@ -1289,6 +1350,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Key and value are UUID. * @throws SQLException if failed. */ + @Test public void testUuidNoWrap() throws SQLException { doTestKeyValueWrap(false, false, true); } @@ -1298,6 +1360,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Key and value are UUID. * @throws SQLException if failed. */ + @Test public void testUuidKeyWrap() throws SQLException { doTestKeyValueWrap(true, false, true); } @@ -1307,6 +1370,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Key and value are UUID. * @throws SQLException if failed. */ + @Test public void testUuidValueWrap() throws SQLException { doTestKeyValueWrap(false, true, true); } @@ -1316,6 +1380,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * Key and value are UUID. * @throws SQLException if failed. */ + @Test public void testUuidKeyAndValueWrap() throws SQLException { doTestKeyValueWrap(true, true, true); } @@ -1507,6 +1572,7 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest { * * @throws Exception if failed. */ + @Test public void testGetTablesForCache() throws Exception { try { execute("create table t1(id int primary key, name varchar)");
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCachePageEvictionTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCachePageEvictionTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCachePageEvictionTest.java index ba5edc9..85769ef 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCachePageEvictionTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCachePageEvictionTest.java @@ -36,10 +36,14 @@ import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for H2RowCacheRegistry with page eviction. */ +@RunWith(JUnit4.class) public class H2RowCachePageEvictionTest extends GridCommonAbstractTest { /** Entries count. */ private static final int ENTRIES = 10_000; @@ -147,6 +151,7 @@ public class H2RowCachePageEvictionTest extends GridCommonAbstractTest { /** * @throws Exception On error. */ + @Test public void testEvictPagesWithDiskStorageSingleCacheInGroup() throws Exception { persistenceEnabled = true; @@ -160,6 +165,7 @@ public class H2RowCachePageEvictionTest extends GridCommonAbstractTest { /** * @throws Exception On error. */ + @Test public void testEvictPagesWithDiskStorageWithOtherCacheInGroup() throws Exception { persistenceEnabled = true; @@ -175,6 +181,7 @@ public class H2RowCachePageEvictionTest extends GridCommonAbstractTest { /** * @throws Exception On error. */ + @Test public void testEvictPagesWithoutDiskStorageSingleCacheInGroup() throws Exception { persistenceEnabled = false; @@ -186,6 +193,7 @@ public class H2RowCachePageEvictionTest extends GridCommonAbstractTest { /** * @throws Exception On error. */ + @Test public void testEvictPagesWithoutDiskStorageWithOtherCacheInGroup() throws Exception { persistenceEnabled = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCacheSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCacheSelfTest.java index 5db8231..6a177f0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCacheSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCacheSelfTest.java @@ -39,11 +39,15 @@ import org.apache.ignite.internal.processors.query.h2.opt.GridH2KeyValueRowOnhea import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.ConcurrentLinkedHashMap; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests H2RowCacheRegistry. */ @SuppressWarnings({"unchecked", "ConstantConditions"}) +@RunWith(JUnit4.class) public class H2RowCacheSelfTest extends GridCommonAbstractTest { /** Keys count. */ private static final int ENTRIES = 1_000; @@ -79,6 +83,7 @@ public class H2RowCacheSelfTest extends GridCommonAbstractTest { /** */ + @Test public void testDestroyCacheCreation() { final String cacheName0 = "cache0"; final String cacheName1 = "cache1"; @@ -99,6 +104,7 @@ public class H2RowCacheSelfTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDestroyCacheSingleCacheInGroup() throws IgniteCheckedException { checkDestroyCache(); } @@ -106,6 +112,7 @@ public class H2RowCacheSelfTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDestroyCacheWithOtherCacheInGroup() throws IgniteCheckedException { grid().getOrCreateCache(cacheConfiguration("cacheWithoutOnheapCache", false)); @@ -115,6 +122,7 @@ public class H2RowCacheSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDeleteEntryCacheSingleCacheInGroup() throws Exception { checkDeleteEntry(); } @@ -122,6 +130,7 @@ public class H2RowCacheSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDeleteEntryWithOtherCacheInGroup() throws Exception { grid().getOrCreateCache(cacheConfiguration("cacheWithoutOnheapCache", false)); @@ -131,6 +140,7 @@ public class H2RowCacheSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdateEntryCacheSingleCacheInGroup() throws Exception { checkDeleteEntry(); } @@ -138,6 +148,7 @@ public class H2RowCacheSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdateEntryWithOtherCacheInGroup() throws Exception { grid().getOrCreateCache(cacheConfiguration("cacheWithoutOnheapCache", false)); @@ -147,6 +158,7 @@ public class H2RowCacheSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFixedSize() throws Exception { int maxSize = 100; String cacheName = "cacheWithLimitedSize"; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IgniteDecimalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IgniteDecimalSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IgniteDecimalSelfTest.java index b3743de..aaeb030 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IgniteDecimalSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IgniteDecimalSelfTest.java @@ -33,12 +33,16 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.Arrays.asList; /** * Test to check decimal columns. */ +@RunWith(JUnit4.class) public class IgniteDecimalSelfTest extends AbstractSchemaSelfTest { /** */ private static final int PRECISION = 9; @@ -122,6 +126,7 @@ public class IgniteDecimalSelfTest extends AbstractSchemaSelfTest { /** * @throws Exception If failed. */ + @Test public void testConfiguredFromDdl() throws Exception { checkPrecisionAndScale(DEC_TAB_NAME, VALUE, PRECISION, SCALE); } @@ -129,6 +134,7 @@ public class IgniteDecimalSelfTest extends AbstractSchemaSelfTest { /** * @throws Exception If failed. */ + @Test public void testConfiguredFromQueryEntity() throws Exception { checkPrecisionAndScale(SALARY_TAB_NAME, "amount", PRECISION, SCALE); } @@ -136,6 +142,7 @@ public class IgniteDecimalSelfTest extends AbstractSchemaSelfTest { /** * @throws Exception If failed. */ + @Test public void testConfiguredFromQueryEntityInDynamicallyCreatedCache() throws Exception { IgniteEx grid = grid(0); @@ -151,6 +158,7 @@ public class IgniteDecimalSelfTest extends AbstractSchemaSelfTest { /** * @throws Exception If failed. */ + @Test public void testConfiguredFromAnnotations() throws Exception { IgniteEx grid = grid(0); @@ -164,6 +172,7 @@ public class IgniteDecimalSelfTest extends AbstractSchemaSelfTest { } /** */ + @Test public void testSelectDecimal() throws Exception { IgniteEx grid = grid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java index 0b96ce0..c1d6eea 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java @@ -32,10 +32,14 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class LongIndexNameTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { @@ -63,6 +67,7 @@ public class LongIndexNameTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLongIndexNames() throws Exception { try { Ignite ignite = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/MvccEmptyTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/MvccEmptyTransactionSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/MvccEmptyTransactionSelfTest.java index 5a66062..7704c72 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/MvccEmptyTransactionSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/MvccEmptyTransactionSelfTest.java @@ -31,10 +31,14 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.Statement; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test for empty transaction while is then enlisted with real value. */ +@RunWith(JUnit4.class) public class MvccEmptyTransactionSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryVmIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -48,6 +52,7 @@ public class MvccEmptyTransactionSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ @SuppressWarnings("unchecked") + @Test public void testEmptyTransaction() throws Exception { Ignition.start(config("srv", false)); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java index 57a55f3..fb5e2d0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java @@ -40,6 +40,9 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.List; import java.util.UUID; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -50,6 +53,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; * See IGNITE-6915 for details. */ +@RunWith(JUnit4.class) public class OptimizedMarshallerIndexNameTest extends GridCommonAbstractTest { /** Test name 1 */ private static final String TEST_NAME1 = "Name1"; @@ -111,6 +115,7 @@ public class OptimizedMarshallerIndexNameTest extends GridCommonAbstractTest { * Verifies that BPlusTree are not erroneously shared between tables in the same cache * due to IGNITE-6915 bug. */ + @Test public void testOptimizedMarshallerIndex() { // Put objects of different types into the same cache http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java index 5f24191..ace7635 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java @@ -29,10 +29,14 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.concurrent.Callable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for query entity validation. */ +@RunWith(JUnit4.class) public class QueryEntityValidationSelfTest extends GridCommonAbstractTest { /** Cache name. */ private static final String CACHE_NAME = "cache"; @@ -47,6 +51,7 @@ public class QueryEntityValidationSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testValueTypeNull() throws Exception { final CacheConfiguration ccfg = new CacheConfiguration().setName(CACHE_NAME); @@ -70,6 +75,7 @@ public class QueryEntityValidationSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testIndexTypeNull() throws Exception { final CacheConfiguration ccfg = new CacheConfiguration().setName(CACHE_NAME); @@ -112,6 +118,7 @@ public class QueryEntityValidationSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testIndexNameDuplicate() throws Exception { final CacheConfiguration ccfg = new CacheConfiguration().setName(CACHE_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java index bd2b578..8e11b3d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java @@ -40,6 +40,9 @@ import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.IgniteClientReconnectAbstractTest.TestTcpDiscoverySpi; import static org.apache.ignite.internal.IgniteClientReconnectAbstractTest.reconnectClientNode; @@ -47,6 +50,7 @@ import static org.apache.ignite.internal.IgniteClientReconnectAbstractTest.recon /** * Tests for schema exchange between nodes. */ +@RunWith(JUnit4.class) public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { /** Node on which filter should be applied (if any). */ private static String filterNodeName; @@ -68,6 +72,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testEmptyStatic() throws Exception { checkEmpty(false); } @@ -77,6 +82,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testEmptyDynamic() throws Exception { checkEmpty(true); } @@ -117,6 +123,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testNonEmptyStatic() throws Exception { checkNonEmpty(false); } @@ -126,6 +133,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testNonEmptyDynamic() throws Exception { checkNonEmpty(true); } @@ -166,6 +174,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testDynamicRestarts() throws Exception { IgniteEx node1 = start(1, KeyClass.class, ValueClass.class); IgniteEx node2 = startNoCache(2); @@ -260,6 +269,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testClientJoinStatic() throws Exception { checkClientJoin(false); } @@ -269,6 +279,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testClientJoinDynamic() throws Exception { checkClientJoin(true); } @@ -323,6 +334,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testClientCacheStartStatic() throws Exception { checkClientCacheStart(false); } @@ -332,6 +344,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testClientCacheStartDynamic() throws Exception { checkClientCacheStart(true); } @@ -397,6 +410,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testNodeFilter() throws Exception { filterNodeName = getTestIgniteInstanceName(1); @@ -425,6 +439,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * * @throws Exception If failed. */ + @Test public void testServerRestartWithNewTypes() throws Exception { IgniteEx node1 = start(1, KeyClass.class, ValueClass.class); assertTypes(node1, ValueClass.class); @@ -480,6 +495,7 @@ public class SchemaExchangeSelfTest extends AbstractSchemaSelfTest { * @throws Exception If failed. */ @SuppressWarnings("unchecked") + @Test public void testClientReconnect() throws Exception { final IgniteEx node1 = start(1, KeyClass.class, ValueClass.class); assertTypes(node1, ValueClass.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsWithMvccDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsWithMvccDisabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsWithMvccDisabledSelfTest.java index b8b9360..95fd2d1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsWithMvccDisabledSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsWithMvccDisabledSelfTest.java @@ -20,10 +20,14 @@ package org.apache.ignite.internal.processors.cache.index; import java.util.concurrent.Callable; import org.apache.ignite.internal.processors.query.IgniteSQLException; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class SqlTransactionCommandsWithMvccDisabledSelfTest extends AbstractSchemaSelfTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -46,6 +50,7 @@ public class SqlTransactionCommandsWithMvccDisabledSelfTest extends AbstractSche /** * @throws Exception if failed. */ + @Test public void testBeginWithMvccDisabled() throws Exception { GridTestUtils.assertThrows(null, new Callable<Object>() { @Override public Object call() throws Exception { @@ -59,6 +64,7 @@ public class SqlTransactionCommandsWithMvccDisabledSelfTest extends AbstractSche /** * @throws Exception if failed. */ + @Test public void testCommitWithMvccDisabled() throws Exception { execute(grid(0), "COMMIT"); // assert no exception @@ -67,6 +73,7 @@ public class SqlTransactionCommandsWithMvccDisabledSelfTest extends AbstractSche /** * @throws Exception if failed. */ + @Test public void testRollbackWithMvccDisabled() throws Exception { execute(grid(0), "ROLLBACK"); // assert no exception http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java index 3ac94c8..d47d988 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java @@ -40,10 +40,14 @@ import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionState; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests to check behavior regarding transactions started via SQL. */ +@RunWith(JUnit4.class) public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSchemaSelfTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -65,6 +69,7 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche /** * Test that BEGIN opens a transaction. */ + @Test public void testBegin() { execute(node(), "BEGIN"); @@ -76,6 +81,7 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche /** * Test that COMMIT commits a transaction. */ + @Test public void testCommit() { execute(node(), "BEGIN WORK"); @@ -95,6 +101,7 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche /** * Test that COMMIT without a transaction yields nothing. */ + @Test public void testCommitNoTransaction() { execute(node(), "COMMIT"); } @@ -102,6 +109,7 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche /** * Test that ROLLBACK without a transaction yields nothing. */ + @Test public void testRollbackNoTransaction() { execute(node(), "ROLLBACK"); } @@ -109,6 +117,7 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche /** * Test that ROLLBACK rolls back a transaction. */ + @Test public void testRollback() { execute(node(), "BEGIN TRANSACTION"); @@ -128,6 +137,7 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche /** * Test that attempting to perform various SQL operations within non SQL transaction yields an exception. */ + @Test public void testSqlOperationsWithinNonSqlTransaction() { fail("https://issues.apache.org/jira/browse/IGNITE-9470";); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java index e225f28..c385388 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsSelfTest.java @@ -43,10 +43,14 @@ import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionState; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests to check behavior regarding transactions started via SQL. */ +@RunWith(JUnit4.class) public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -68,6 +72,7 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { /** * Test that BEGIN opens a transaction. */ + @Test public void testBegin() { execute(node(), "BEGIN"); @@ -79,6 +84,7 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { /** * Test that COMMIT commits a transaction. */ + @Test public void testCommit() { execute(node(), "BEGIN WORK"); @@ -98,6 +104,7 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { /** * Test that COMMIT without a transaction yields nothing. */ + @Test public void testCommitNoTransaction() { execute(node(), "COMMIT"); } @@ -105,6 +112,7 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { /** * Test that ROLLBACK without a transaction yields nothing. */ + @Test public void testRollbackNoTransaction() { execute(node(), "ROLLBACK"); } @@ -112,6 +120,7 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { /** * Test that ROLLBACK rolls back a transaction. */ + @Test public void testRollback() { execute(node(), "BEGIN TRANSACTION"); @@ -131,6 +140,7 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { /** * Test that attempting to perform various SQL operations within non SQL transaction yields an exception. */ + @Test public void testSqlOperationsWithinNonSqlTransaction() { assertSqlOperationWithinNonSqlTransactionThrows("COMMIT"); @@ -263,6 +273,7 @@ public class SqlTransactionsSelfTest extends AbstractSchemaSelfTest { /** * Test that attempting to perform a cache PUT operation from within an SQL transaction fails. */ + @Test public void testCacheOperationsFromSqlTransaction() { checkCacheOperationThrows("get", 1); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalFieldsQuerySelfTest.java index e668c06..62bb429 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalFieldsQuerySelfTest.java @@ -20,12 +20,16 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractFieldsQuerySelfTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.LOCAL; /** * Tests for fields queries. */ +@RunWith(JUnit4.class) public class IgniteCacheLocalFieldsQuerySelfTest extends IgniteCacheAbstractFieldsQuerySelfTest { // static { // System.setProperty(IgniteSystemProperties.IGNITE_H2_DEBUG_CONSOLE, "1"); @@ -44,8 +48,9 @@ public class IgniteCacheLocalFieldsQuerySelfTest extends IgniteCacheAbstractFiel /** * @throws Exception If failed. */ + @Test public void testInformationSchema() throws Exception { jcache(String.class, String.class).query( new SqlFieldsQuery("SELECT VALUE FROM INFORMATION_SCHEMA.SETTINGS").setLocal(true)).getAll(); } -} \ 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/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java index fc681a4..d4f7642 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java @@ -29,12 +29,16 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.cache.query.QueryCancelledException; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.LOCAL; /** * Tests local query cancellations and timeouts. */ +@RunWith(JUnit4.class) public class IgniteCacheLocalQueryCancelOrTimeoutSelfTest extends GridCommonAbstractTest { /** Cache size. */ private static final int CACHE_SIZE = 10_000; @@ -92,6 +96,7 @@ public class IgniteCacheLocalQueryCancelOrTimeoutSelfTest extends GridCommonAbst /** * Tests cancellation. */ + @Test public void testQueryCancel() { testQuery(false, 1, TimeUnit.SECONDS); } @@ -99,6 +104,7 @@ public class IgniteCacheLocalQueryCancelOrTimeoutSelfTest extends GridCommonAbst /** * Tests cancellation with zero timeout. */ + @Test public void testQueryCancelZeroTimeout() { testQuery(false, 1, TimeUnit.MILLISECONDS); } @@ -106,6 +112,7 @@ public class IgniteCacheLocalQueryCancelOrTimeoutSelfTest extends GridCommonAbst /** * Tests timeout. */ + @Test public void testQueryTimeout() { testQuery(true, 1, TimeUnit.SECONDS); } @@ -148,4 +155,4 @@ public class IgniteCacheLocalQueryCancelOrTimeoutSelfTest extends GridCommonAbst // Test must exit gracefully. } -} \ 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/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java index 2272f27..f5f171f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java @@ -29,12 +29,16 @@ import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractQuerySelfTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.LOCAL; /** * Tests local query. */ +@RunWith(JUnit4.class) public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfTest { /** {@inheritDoc} */ @Override protected int gridCount() { @@ -49,6 +53,7 @@ public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfT /** * @throws Exception If test failed. */ + @Test public void testQueryLocal() throws Exception { // Let's do it twice to see how prepared statement caching behaves - without recompilation // check for cached prepared statements this would fail. @@ -98,6 +103,7 @@ public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfT } /** {@inheritDoc} */ + @Test @Override public void testLocalSqlQueryFromClient() throws Exception { try { Ignite g = startGrid("client"); @@ -127,6 +133,7 @@ public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfT } /** {@inheritDoc} */ + @Test @Override public void testLocalSqlFieldsQueryFromClient() throws Exception { try { Ignite g = startGrid("client"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java index 1418d47..073bfb0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java @@ -19,12 +19,16 @@ package org.apache.ignite.internal.processors.cache.mvcc; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAbstractSelfTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT; /** * */ +@RunWith(JUnit4.class) public abstract class CacheMvccAbstractContinuousQuerySelfTest extends GridCacheContinuousQueryAbstractSelfTest { /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { @@ -42,22 +46,26 @@ public abstract class CacheMvccAbstractContinuousQuerySelfTest extends GridCache } /** {@inheritDoc} */ + @Test @Override public void testInternalKey() throws Exception { // No-op. } /** {@inheritDoc} */ - public void testExpired() throws Exception { + @Test + @Override public void testExpired() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7311";); } /** {@inheritDoc} */ - public void testLoadCache() throws Exception { + @Test + @Override public void testLoadCache() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7954";); } /** {@inheritDoc} */ - public void testEvents() throws Exception { + @Test + @Override public void testEvents() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-9321";); } -} \ 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/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java index 5eac352..b14dc07 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractSqlCoordinatorFailoverTest.java @@ -17,6 +17,10 @@ package org.apache.ignite.internal.processors.cache.mvcc; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + import static org.apache.ignite.internal.processors.cache.mvcc.CacheMvccAbstractTest.ReadMode.SCAN; import static org.apache.ignite.internal.processors.cache.mvcc.CacheMvccAbstractTest.ReadMode.SQL; import static org.apache.ignite.internal.processors.cache.mvcc.CacheMvccAbstractTest.WriteMode.DML; @@ -26,10 +30,12 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Mvcc SQL API coordinator failover test. */ +@RunWith(JUnit4.class) public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheMvccAbstractBasicCoordinatorFailoverTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxSql_Server_Backups0_CoordinatorFails() throws Exception { accountsTxReadAll(2, 1, 0, 64, new InitIndexing(Integer.class, MvccTestAccount.class), true, SQL, DML, DFLT_TEST_TIME, RestartMode.RESTART_CRD); @@ -38,6 +44,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testAccountsTxSql_SingleNode_CoordinatorFails_Persistence() throws Exception { persistence = true; @@ -48,6 +55,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups0_RestartCoordinator_ScanDml() throws Exception { putAllGetAll(RestartMode.RESTART_CRD , 2, 1, 0, 64, new InitIndexing(Integer.class, Integer.class), SCAN, DML); @@ -56,6 +64,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_SingleNode_RestartCoordinator_ScanDml_Persistence() throws Exception { persistence = true; @@ -66,6 +75,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups0_RestartCoordinator_SqlDml() throws Exception { putAllGetAll(RestartMode.RESTART_CRD, 2, 1, 0, DFLT_PARTITION_COUNT, new InitIndexing(Integer.class, Integer.class), SQL, DML); @@ -74,6 +84,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_SingleNode_RestartCoordinator_SqlDml_Persistence() throws Exception { persistence = true; @@ -84,6 +95,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_ClientServer_Backups0_Sql_Persistence() throws Exception { persistence = true; @@ -94,6 +106,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_SingleNode_Sql_Persistence() throws Exception { updateNObjectsTest(3, 1, 0, 0, 1, DFLT_TEST_TIME, new InitIndexing(Integer.class, Integer.class), SQL, DML, RestartMode.RESTART_CRD); @@ -102,6 +115,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testCoordinatorFailureSimplePessimisticTxSql() throws Exception { coordinatorFailureSimple(PESSIMISTIC, REPEATABLE_READ, SQL, DML); } @@ -109,6 +123,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testTxInProgressCoordinatorChangeSimple_Readonly() throws Exception { txInProgressCoordinatorChangeSimple(PESSIMISTIC, REPEATABLE_READ, new InitIndexing(Integer.class, Integer.class), SQL, DML); @@ -117,6 +132,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testReadInProgressCoordinatorFailsSimple_FromClient() throws Exception { readInProgressCoordinatorFailsSimple(true, new InitIndexing(Integer.class, Integer.class), SQL, DML); } @@ -124,6 +140,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testCoordinatorChangeActiveQueryClientFails_Simple() throws Exception { checkCoordinatorChangeActiveQueryClientFails_Simple(new InitIndexing(Integer.class, Integer.class), SQL, DML); } @@ -131,6 +148,7 @@ public abstract class CacheMvccAbstractSqlCoordinatorFailoverTest extends CacheM /** * @throws Exception If failed. */ + @Test public void testCoordinatorChangeActiveQueryClientFails_SimpleScan() throws Exception { checkCoordinatorChangeActiveQueryClientFails_Simple(new InitIndexing(Integer.class, Integer.class), SCAN, DML); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java index 894e4bb..b0573b9 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java @@ -46,6 +46,9 @@ import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.internal.processors.cache.mvcc.CacheMvccAbstractTest.ReadMode.SQL; @@ -58,6 +61,7 @@ import static org.junit.Assert.assertArrayEquals; * Backups tests. */ @SuppressWarnings("unchecked") +@RunWith(JUnit4.class) public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest { /** Test timeout. */ @@ -68,6 +72,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest * * @throws Exception If fails. */ + @Test public void testBackupsCoherenceSimple() throws Exception { disableScheduledVacuum = true; @@ -181,6 +186,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest * * @throws Exception If failed. */ + @Test public void testBackupsCoherenceWithLargeOperations() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-10104";); @@ -279,6 +285,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest * * @throws Exception If failed. */ + @Test public void testBackupsCoherenceWithInFlightBatchesOverflow() throws Exception { testSpi = true; @@ -389,6 +396,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest * * @throws Exception If failed. */ + @Test public void testBackupsCoherenceWithConcurrentUpdates2ServersNoClients() throws Exception { checkBackupsCoherenceWithConcurrentUpdates(2, 0); } @@ -398,6 +406,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest * * @throws Exception If failed. */ + @Test public void testBackupsCoherenceWithConcurrentUpdates4ServersNoClients() throws Exception { checkBackupsCoherenceWithConcurrentUpdates(4, 0); } @@ -407,6 +416,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest * * @throws Exception If failed. */ + @Test public void testBackupsCoherenceWithConcurrentUpdates3Servers1Client() throws Exception { checkBackupsCoherenceWithConcurrentUpdates(3, 1); } @@ -416,6 +426,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest * * @throws Exception If failed. */ + @Test public void testBackupsCoherenceWithConcurrentUpdates5Servers2Clients() throws Exception { checkBackupsCoherenceWithConcurrentUpdates(5, 2); } @@ -463,6 +474,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest /** * @throws Exception If failed. */ + @Test public void testNoForceKeyRequestDelayedRebalanceNoVacuum() throws Exception { disableScheduledVacuum = true; @@ -472,6 +484,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest /** * @throws Exception If failed. */ + @Test public void testNoForceKeyRequestDelayedRebalance() throws Exception { doTestRebalanceNodeAdd(true); } @@ -479,6 +492,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest /** * @throws Exception If failed. */ + @Test public void testNoForceKeyRequestNoVacuum() throws Exception { disableScheduledVacuum = true; @@ -488,6 +502,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest /** * @throws Exception If failed. */ + @Test public void testNoForceKeyRequest() throws Exception { doTestRebalanceNodeAdd(false); } @@ -571,6 +586,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest /** * @throws Exception If failed. */ + @Test public void testRebalanceNodeLeaveClient() throws Exception { doTestRebalanceNodeLeave(true); } @@ -578,6 +594,7 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest /** * @throws Exception If failed. */ + @Test public void testRebalanceNodeLeaveServer() throws Exception { doTestRebalanceNodeLeave(false); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBasicContinuousQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBasicContinuousQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBasicContinuousQueryTest.java index e08341a..5df177a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBasicContinuousQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBasicContinuousQueryTest.java @@ -52,6 +52,9 @@ import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; @@ -65,6 +68,7 @@ import static org.apache.ignite.transactions.TransactionState.ROLLED_BACK; /** * Basic continuous queries test with enabled mvcc. */ +@RunWith(JUnit4.class) public class CacheMvccBasicContinuousQueryTest extends CacheMvccAbstractTest { /** */ private static final long LATCH_TIMEOUT = 5000; @@ -115,6 +119,7 @@ public class CacheMvccBasicContinuousQueryTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAllEntries() throws Exception { Ignite node = startGrids(3); @@ -211,6 +216,7 @@ public class CacheMvccBasicContinuousQueryTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCachingMaxSize() throws Exception { Ignite node = startGrids(1); @@ -246,6 +252,7 @@ public class CacheMvccBasicContinuousQueryTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdateCountersGapClosedSimplePartitioned() throws Exception { checkUpdateCountersGapIsProcessedSimple(CacheMode.PARTITIONED); } @@ -253,6 +260,7 @@ public class CacheMvccBasicContinuousQueryTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdateCountersGapClosedSimpleReplicated() throws Exception { checkUpdateCountersGapIsProcessedSimple(CacheMode.REPLICATED); } @@ -383,6 +391,7 @@ public class CacheMvccBasicContinuousQueryTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdateCountersGapClosedPartitioned() throws Exception { checkUpdateCountersGapsClosed(CacheMode.PARTITIONED); } @@ -390,6 +399,7 @@ public class CacheMvccBasicContinuousQueryTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdateCountersGapClosedReplicated() throws Exception { checkUpdateCountersGapsClosed(CacheMode.REPLICATED); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBulkLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBulkLoadTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBulkLoadTest.java index 98bbdfc..bff6e97 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBulkLoadTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBulkLoadTest.java @@ -28,6 +28,9 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.configuration.CacheConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -35,6 +38,7 @@ import static java.util.Collections.singletonList; /** * */ +@RunWith(JUnit4.class) public class CacheMvccBulkLoadTest extends CacheMvccAbstractTest { /** */ private IgniteCache<Object, Object> sqlNexus; @@ -65,6 +69,7 @@ public class CacheMvccBulkLoadTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCopyStoresData() throws Exception { String csvFilePath = new File(getClass().getResource("mvcc_person.csv").toURI()).getAbsolutePath(); stmt.executeUpdate("copy from '" + csvFilePath + "' into person (id, name) format csv"); @@ -81,6 +86,7 @@ public class CacheMvccBulkLoadTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCopyDoesNotOverwrite() throws Exception { sqlNexus.query(q("insert into person values(1, 'Old')")); String csvFilePath = new File(getClass().getResource("mvcc_person.csv").toURI()).getAbsolutePath(); @@ -98,6 +104,7 @@ public class CacheMvccBulkLoadTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCopyLeavesPartialResultsInCaseOfFailure() throws Exception { String csvFilePath = new File(getClass().getResource("mvcc_person_broken.csv").toURI()).getAbsolutePath(); try { http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java index a3ea0e8..ae1e375 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java @@ -18,10 +18,14 @@ package org.apache.ignite.internal.processors.cache.mvcc; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousWithTransformerClientSelfTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheMvccContinuousWithTransformerClientSelfTest extends CacheContinuousWithTransformerClientSelfTest { /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { @@ -29,6 +33,7 @@ public class CacheMvccContinuousWithTransformerClientSelfTest extends CacheConti } /** {@inheritDoc} */ + @Test @Override public void testExpired() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7311";); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java index d029143..c38cc7c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java @@ -19,10 +19,14 @@ package org.apache.ignite.internal.processors.cache.mvcc; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousWithTransformerReplicatedSelfTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheMvccContinuousWithTransformerPartitionedSelfTest extends CacheContinuousWithTransformerReplicatedSelfTest { /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { @@ -35,6 +39,7 @@ public class CacheMvccContinuousWithTransformerPartitionedSelfTest extends Cache } /** {@inheritDoc} */ + @Test @Override public void testExpired() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7311";); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java index a294e17..b40972b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java @@ -18,10 +18,14 @@ package org.apache.ignite.internal.processors.cache.mvcc; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousWithTransformerReplicatedSelfTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheMvccContinuousWithTransformerReplicatedSelfTest extends CacheContinuousWithTransformerReplicatedSelfTest { /** {@inheritDoc} */ @@ -30,6 +34,7 @@ public class CacheMvccContinuousWithTransformerReplicatedSelfTest } /** {@inheritDoc} */ + @Test @Override public void testExpired() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7311";); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccDmlSimpleTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccDmlSimpleTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccDmlSimpleTest.java index 7f141ca..dcd19a6 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccDmlSimpleTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccDmlSimpleTest.java @@ -28,12 +28,16 @@ import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode; import org.apache.ignite.internal.processors.query.IgniteSQLException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.Arrays.asList; /** * */ +@RunWith(JUnit4.class) public class CacheMvccDmlSimpleTest extends CacheMvccAbstractTest { /** */ private IgniteCache<?, ?> cache; @@ -58,6 +62,7 @@ public class CacheMvccDmlSimpleTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testInsert() throws Exception { int cnt = update("insert into Integer(_key, _val) values(1, 1),(2, 2)"); @@ -78,6 +83,7 @@ public class CacheMvccDmlSimpleTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testMerge() throws Exception { { int cnt = update("merge into Integer(_key, _val) values(1, 1),(2, 2)"); @@ -97,6 +103,7 @@ public class CacheMvccDmlSimpleTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testUpdate() throws Exception { { int cnt = update("update Integer set _val = 42 where _key = 42"); @@ -139,6 +146,7 @@ public class CacheMvccDmlSimpleTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testDelete() throws Exception { { int cnt = update("delete from Integer where _key = 42");
