You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/12/11 08:29:07 UTC
[20/51] [partial] ignite git commit: IGNITE-10175 migrate core
modules tests from Junit 3 to 4 - Fixes #5562.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
index 37f6fce..49014a9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
@@ -37,6 +37,9 @@ import org.apache.ignite.lang.IgniteBiInClosure;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
+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.CacheMode.REPLICATED;
@@ -44,6 +47,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
/**
* Test for configuration property {@link CacheConfiguration#isReadThrough}.
*/
+@RunWith(JUnit4.class)
public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAbstractTest {
/** */
private Integer lastKey = 0;
@@ -86,6 +90,7 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb
/**
* @throws Exception If failed.
*/
+ @Test
public void testNoReadThrough() throws Exception {
IgniteCache<Integer, Integer> cache = jcache(0);
@@ -340,4 +345,4 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb
};
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
index 5ab86ec..e7664dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java
@@ -33,6 +33,9 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
+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.CacheMode.REPLICATED;
@@ -40,6 +43,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
/**
* Test for configuration property {@link CacheConfiguration#isWriteThrough}.
*/
+@RunWith(JUnit4.class)
public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheAbstractTest {
/** */
private Integer lastKey = 0;
@@ -75,6 +79,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA
* @throws Exception If failed.
*/
@SuppressWarnings("UnnecessaryLocalVariable")
+ @Test
public void testNoWriteThrough() throws Exception {
IgniteCache<Integer, Integer> cache = jcache(0);
@@ -349,4 +354,4 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA
return keys;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java
index 9c455b6..25c20da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreNodeRestartAbstractTest.java
@@ -22,10 +22,14 @@ import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
*
*/
+@RunWith(JUnit4.class)
public abstract class IgniteCacheStoreNodeRestartAbstractTest extends IgniteCacheAbstractTest {
/** */
protected static final String CACHE_NAME1 = "cache1";
@@ -73,6 +77,7 @@ public abstract class IgniteCacheStoreNodeRestartAbstractTest extends IgniteCach
/**
* @throws Exception If failed.
*/
+ @Test
public void testMarshaller() throws Exception {
grid(0).cache(CACHE_NAME1).put("key1", new UserObject("key1"));
@@ -113,4 +118,4 @@ public abstract class IgniteCacheStoreNodeRestartAbstractTest extends IgniteCach
return field;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
index 40e36c2..0a6d936 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
@@ -43,12 +43,16 @@ import org.apache.ignite.resources.CacheStoreSessionResource;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
/**
*
*/
+@RunWith(JUnit4.class)
public abstract class IgniteCacheStoreSessionAbstractTest extends IgniteCacheAbstractTest {
/** */
protected static volatile List<ExpectedData> expData;
@@ -113,6 +117,7 @@ public abstract class IgniteCacheStoreSessionAbstractTest extends IgniteCacheAbs
/**
* @throws Exception If failed.
*/
+ @Test
public void testStoreSession() throws Exception {
assertEquals(DEFAULT_CACHE_NAME, jcache(0).getName());
@@ -365,4 +370,4 @@ public abstract class IgniteCacheStoreSessionAbstractTest extends IgniteCacheAbs
assertEquals(exp.expCacheName, ses.cacheName());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
index a327fa9..8b20541 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
@@ -37,10 +37,14 @@ import org.apache.ignite.lang.IgniteBiInClosure;
import org.apache.ignite.resources.CacheStoreSessionResource;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
*
*/
+@RunWith(JUnit4.class)
public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends IgniteCacheAbstractTest {
/** */
private static final String CACHE_NAME1 = "cache1";
@@ -113,6 +117,7 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign
/**
* @throws Exception If failed.
*/
+ @Test
public void testSession() throws Exception {
testCache(DEFAULT_CACHE_NAME);
@@ -208,7 +213,7 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign
/** {@inheritDoc} */
@Override public void writeAll(Collection<Cache.Entry<?, ?>> entries) throws CacheWriterException {
log.info("writeAll: " + entries);
-
+
assertTrue("Unexpected entries: " + entries, entries.size() == 10 || entries.size() == 1);
checkSession("writeAll");
@@ -292,4 +297,4 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign
this.expCacheName = expCacheName;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java
index 75a4cd9..fb77b87 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLoaderWriterTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -30,6 +31,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
*/
public class IgniteCacheTxLoaderWriterTest extends IgniteCacheLoaderWriterAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE);
@@ -55,4 +57,4 @@ public class IgniteCacheTxLoaderWriterTest extends IgniteCacheLoaderWriterAbstra
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java
index 645a9ff..240e6f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalLoadAllTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -30,6 +31,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class IgniteCacheTxLocalLoadAllTest extends IgniteCacheLoadAllAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -54,4 +56,4 @@ public class IgniteCacheTxLocalLoadAllTest extends IgniteCacheLoadAllAbstractTes
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java
index 2e52a63..82ac791 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoLoadPreviousValueTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -30,6 +31,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class IgniteCacheTxLocalNoLoadPreviousValueTest extends IgniteCacheNoLoadPreviousValueAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -55,4 +57,4 @@ public class IgniteCacheTxLocalNoLoadPreviousValueTest extends IgniteCacheNoLoad
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java
index e25a965..2b42ac5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoReadThroughTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -30,6 +31,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class IgniteCacheTxLocalNoReadThroughTest extends IgniteCacheNoReadThroughAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -55,4 +57,4 @@ public class IgniteCacheTxLocalNoReadThroughTest extends IgniteCacheNoReadThroug
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java
index ddc9352..515f01b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxLocalNoWriteThroughTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -30,6 +31,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class IgniteCacheTxLocalNoWriteThroughTest extends IgniteCacheNoWriteThroughAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -55,4 +57,4 @@ public class IgniteCacheTxLocalNoWriteThroughTest extends IgniteCacheNoWriteThro
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java
index c343402..f5f89c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoLoadPreviousValueTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.integration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
/**
*
*/
public class IgniteCacheTxNearEnabledNoLoadPreviousValueTest extends IgniteCacheTxNoLoadPreviousValueTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.NEAR_CACHE);
@@ -35,4 +37,4 @@ public class IgniteCacheTxNearEnabledNoLoadPreviousValueTest extends IgniteCache
@Override protected NearCacheConfiguration nearConfiguration() {
return new NearCacheConfiguration();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java
index be9bc34..5ed67db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNearEnabledNoWriteThroughTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.integration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
/**
*
*/
public class IgniteCacheTxNearEnabledNoWriteThroughTest extends IgniteCacheTxNoWriteThroughTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.NEAR_CACHE);
@@ -35,4 +37,4 @@ public class IgniteCacheTxNearEnabledNoWriteThroughTest extends IgniteCacheTxNoW
@Override protected NearCacheConfiguration nearConfiguration() {
return new NearCacheConfiguration();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java
index 094aa1a..bee02ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoLoadPreviousValueTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -30,6 +31,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
*/
public class IgniteCacheTxNoLoadPreviousValueTest extends IgniteCacheNoLoadPreviousValueAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE);
@@ -55,4 +57,4 @@ public class IgniteCacheTxNoLoadPreviousValueTest extends IgniteCacheNoLoadPrevi
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java
index a94caff..915350d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoReadThroughTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -30,6 +31,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
*/
public class IgniteCacheTxNoReadThroughTest extends IgniteCacheNoReadThroughAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE);
@@ -55,4 +57,4 @@ public class IgniteCacheTxNoReadThroughTest extends IgniteCacheNoReadThroughAbst
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java
index e984dfb..a54d7ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxNoWriteThroughTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -30,6 +31,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
*/
public class IgniteCacheTxNoWriteThroughTest extends IgniteCacheNoWriteThroughAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE);
@@ -55,4 +57,4 @@ public class IgniteCacheTxNoWriteThroughTest extends IgniteCacheNoWriteThroughAb
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
index 77f54af..0fd51ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
@@ -29,6 +29,10 @@ import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
+import org.junit.Before;
+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.CacheMode.PARTITIONED;
@@ -38,8 +42,10 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
/**
*
*/
+@RunWith(JUnit4.class)
public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE);
@@ -69,6 +75,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra
/**
* @throws Exception If failed.
*/
+ @Test
public void testStoreSessionTx() throws Exception {
testTxPut(jcache(0), null, null);
@@ -264,6 +271,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra
/**
* @throws Exception If failed.
*/
+ @Test
public void testSessionCrossCacheTx() throws Exception {
IgniteCache<Object, Object> cache0 = ignite(0).cache(DEFAULT_CACHE_NAME);
@@ -300,4 +308,4 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra
assertEquals(0, expData.size());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindCoalescingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindCoalescingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindCoalescingTest.java
index ea2b8a3..12f827b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindCoalescingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindCoalescingTest.java
@@ -23,6 +23,7 @@ import javax.cache.integration.CacheWriterException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -32,6 +33,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
*/
public class IgniteCacheTxStoreSessionWriteBehindCoalescingTest extends IgniteCacheStoreSessionWriteBehindAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE);
@@ -93,4 +95,4 @@ public class IgniteCacheTxStoreSessionWriteBehindCoalescingTest extends IgniteCa
entLatch.countDown();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindTest.java
index ae6bcae..c57caaa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionWriteBehindTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.integration;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -27,6 +28,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
*/
public class IgniteCacheTxStoreSessionWriteBehindTest extends IgniteCacheStoreSessionWriteBehindAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE);
@@ -37,4 +39,4 @@ public class IgniteCacheTxStoreSessionWriteBehindTest extends IgniteCacheStoreSe
@Override protected CacheAtomicityMode atomicityMode() {
return TRANSACTIONAL;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java
index 23e7a8b..f2d73eb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java
@@ -21,14 +21,19 @@ import javax.cache.processor.EntryProcessor;
import javax.cache.processor.EntryProcessorException;
import javax.cache.processor.MutableEntry;
import org.apache.ignite.IgniteCache;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* Local atomic cache metrics test with tck specific.
*/
+@RunWith(JUnit4.class)
public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicLocalMetricsSelfTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testEntryProcessorRemove() throws Exception {
IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
@@ -63,6 +68,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL
/**
* @throws Exception If failed.
*/
+ @Test
public void testCacheStatistics() throws Exception {
IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
@@ -103,6 +109,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL
/**
* @throws Exception If failed.
*/
+ @Test
public void testConditionReplace() throws Exception {
IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
@@ -153,6 +160,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL
/**
* @throws Exception If failed.
*/
+ @Test
public void testPutIfAbsent() throws Exception {
IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME);
@@ -180,4 +188,4 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL
assertEquals(putCount, cache.localMetrics().getCachePuts());
assertEquals(missCount, cache.localMetrics().getCacheMisses());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java
index aa63fe6..c1ad352 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java
@@ -28,14 +28,14 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class GridCacheDaemonNodeLocalSelfTest extends GridCacheDaemonNodeAbstractSelfTest {
/** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
+ @Override protected void beforeTest() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
- super.beforeTestsStarted();
+ super.beforeTest();
}
/** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
return LOCAL;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java
index 91df599..86ea47d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicApiSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheBasicApiAbstractTest;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -29,6 +30,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class GridCacheLocalBasicApiSelfTest extends GridCacheBasicApiAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -47,4 +49,4 @@ public class GridCacheLocalBasicApiSelfTest extends GridCacheBasicApiAbstractTes
return cfg;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java
index 5d6492b..430a911 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalBasicStoreSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.local;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.GridCacheBasicStoreAbstractTest;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -28,6 +29,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class GridCacheLocalBasicStoreSelfTest extends GridCacheBasicStoreAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -38,4 +40,4 @@ public class GridCacheLocalBasicStoreSelfTest extends GridCacheBasicStoreAbstrac
@Override protected CacheMode cacheMode() {
return LOCAL;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
index 63f910f..8a76f6d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
@@ -30,6 +30,9 @@ import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.jetbrains.annotations.Nullable;
+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.CacheMode.LOCAL;
@@ -41,6 +44,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
/**
* Byte values test for LOCAL cache.
*/
+@RunWith(JUnit4.class)
public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByteArrayValuesSelfTest {
/** Grid. */
private static Ignite ignite;
@@ -75,6 +79,11 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
}
/** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
+ }
+
+ /** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
cache = null;
@@ -86,6 +95,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
*
* @throws Exception If failed.
*/
+ @Test
public void testPessimistic() throws Exception {
testTransaction(cache, PESSIMISTIC, KEY_1, wrap(1));
}
@@ -95,6 +105,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
*
* @throws Exception If failed.
*/
+ @Test
public void testPessimisticMixed() throws Exception {
testTransactionMixed(cache, PESSIMISTIC, KEY_1, wrap(1), KEY_2, 1);
}
@@ -104,6 +115,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
*
* @throws Exception If failed.
*/
+ @Test
public void testOptimistic() throws Exception {
testTransaction(cache, OPTIMISTIC, KEY_1, wrap(1));
}
@@ -113,6 +125,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
*
* @throws Exception If failed.
*/
+ @Test
public void testOptimisticMixed() throws Exception {
testTransactionMixed(cache, OPTIMISTIC, KEY_1, wrap(1), KEY_2, 1);
}
@@ -123,6 +136,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
* @throws Exception If failed.
*/
@SuppressWarnings("TooBroadScope")
+ @Test
public void testSwap() throws Exception {
// TODO GG-11148.
// assert cache.getConfiguration(CacheConfiguration.class).isSwapEnabled();
@@ -199,4 +213,4 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
tx.close();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java
index 716e5dd..02439d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java
@@ -28,11 +28,11 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class GridCacheLocalEventSelfTest extends GridCacheEventAbstractTest {
/** {@inheritDoc} */
- @Override public void beforeTestsStarted() throws Exception {
+ @Override public void beforeTest() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_EVENTS);
- super.beforeTestsStarted();
+ super.beforeTest();
}
/** {@inheritDoc} */
@@ -44,4 +44,4 @@ public class GridCacheLocalEventSelfTest extends GridCacheEventAbstractTest {
@Override protected int gridCount() {
return 1;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java
index 7406689..f808ede 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEvictionEventSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.GridCacheEvictionEventAbstractTest;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -29,6 +30,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
*/
public class GridCacheLocalEvictionEventSelfTest extends GridCacheEvictionEventAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -44,4 +46,4 @@ public class GridCacheLocalEvictionEventSelfTest extends GridCacheEvictionEventA
@Override protected CacheAtomicityMode atomicityMode() {
return TRANSACTIONAL;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
index aaf69c9..c55be31 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalFullApiSelfTest.java
@@ -27,12 +27,16 @@ import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfTest;
import org.apache.ignite.internal.util.typedef.F;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheMode.LOCAL;
/**
* Tests for local cache.
*/
+@RunWith(JUnit4.class)
public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfTest {
/** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
@@ -51,6 +55,7 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT
/**
* @throws Exception In case of error.
*/
+ @Test
public void testMapKeysToNodes() throws Exception {
IgniteCache<String, Integer> cache = jcache();
@@ -85,6 +90,7 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT
/**
* @throws Exception If failed.
*/
+ @Test
public void testLocalClearAsync() throws Exception {
localCacheClear(true);
}
@@ -92,6 +98,7 @@ public class GridCacheLocalFullApiSelfTest extends GridCacheAbstractFullApiSelfT
/**
* @throws Exception If failed.
*/
+ @Test
public void testLocalClear() throws Exception {
localCacheClear(false);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java
index 9752b7e..0cb5333 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalGetAndTransformStoreSelfTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.local;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.processors.cache.GridCacheGetAndTransformStoreAbstractTest;
import org.apache.ignite.testframework.MvccFeatureChecker;
+import org.junit.Before;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -28,6 +29,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class GridCacheLocalGetAndTransformStoreSelfTest extends GridCacheGetAndTransformStoreAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -38,4 +40,4 @@ public class GridCacheLocalGetAndTransformStoreSelfTest extends GridCacheGetAndT
@Override protected CacheMode cacheMode() {
return LOCAL;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
index e5d3b48..31d7170 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java
@@ -25,20 +25,17 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.testframework.MvccFeatureChecker;
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;
/**
* Isolated nodes LOCAL cache self test.
*/
+@RunWith(JUnit4.class)
public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest {
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
-
- super.beforeTestsStarted();
- }
-
/**
*
*/
@@ -48,6 +45,8 @@ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
+ MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
+
startGrids(3);
}
@@ -60,6 +59,7 @@ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest
*
* @throws Exception If test failed.
*/
+ @Test
public void testIsolatedNodes() throws Exception {
Ignite g1 = grid(0);
UUID nid1 = g1.cluster().localNode().id();
@@ -123,4 +123,4 @@ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
index 647027f..f5e453c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
@@ -29,14 +29,20 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheMode.LOCAL;
/**
* Load-All self test.
*/
+@RunWith(JUnit4.class)
public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -54,6 +60,7 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest {
*
* @throws Exception If test failed.
*/
+ @Test
public void testCacheGetAll() throws Exception {
Ignite ignite = grid();
@@ -115,4 +122,4 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest {
// No-op.
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java
index 8f27b1b..1dbb8b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java
@@ -31,14 +31,20 @@ import org.apache.ignite.testframework.GridTestThread;
import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.Nullable;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheMode.LOCAL;
/**
* Test cases for multi-threaded tests.
*/
+@RunWith(JUnit4.class)
public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -87,6 +93,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testLockReentry() throws IgniteCheckedException {
IgniteCache<Integer, String> cache = ignite.cache(DEFAULT_CACHE_NAME);
@@ -132,6 +139,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If test failed.
*/
+ @Test
public void testLock() throws Throwable {
final IgniteCache<Integer, String> cache = ignite.cache(DEFAULT_CACHE_NAME);
@@ -248,6 +256,7 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If test failed.
*/
+ @Test
public void testLockAndPut() throws Throwable {
final IgniteCache<Integer, String> cache = ignite.cache(DEFAULT_CACHE_NAME);
@@ -326,4 +335,4 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest {
assert !cache.isLocalLocked(1, true);
assert !cache.isLocalLocked(1, false);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
index 4911631..a10f674 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
@@ -36,14 +36,20 @@ import org.apache.ignite.testframework.GridTestThread;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheMode.LOCAL;
/**
* Multithreaded local cache locking test.
*/
+@RunWith(JUnit4.class)
public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -96,6 +102,7 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If test fails.
*/
+ @Test
public void testBasicLocks() throws Throwable {
GridTestUtils.runMultiThreaded(new Callable<Object>() {
/** {@inheritDoc} */
@@ -122,6 +129,7 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If test fails.
*/
+ @Test
public void testMultiLocks() throws Throwable {
GridTestUtils.runMultiThreaded(new Callable<Object>() {
/** {@inheritDoc} */
@@ -150,6 +158,7 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If test fails.
*/
+ @Test
public void testSlidingKeysLocks() throws Throwable {
final AtomicInteger cnt = new AtomicInteger();
@@ -182,6 +191,7 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If test fails.
*/
+ @Test
public void testSingleLockTimeout() throws Exception {
final CountDownLatch l1 = new CountDownLatch(1);
final CountDownLatch l2 = new CountDownLatch(1);
@@ -248,6 +258,7 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
/**
* @throws Exception If test fails.
*/
+ @Test
public void testMultiLockTimeout() throws Exception {
final CountDownLatch l1 = new CountDownLatch(1);
final CountDownLatch l2 = new CountDownLatch(1);
@@ -358,4 +369,4 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest
private String thread() {
return "Thread [id=" + Thread.currentThread().getId() + ", name=" + Thread.currentThread().getName() + ']';
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
index 816168f..5babd8f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
@@ -35,10 +35,8 @@ public class GridCacheLocalTxMultiThreadedSelfTest extends IgniteTxMultiThreaded
private static final boolean CACHE_DEBUG = false;
/** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
+ @Override protected void beforeTest() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
-
- super.beforeTestsStarted();
}
/** {@inheritDoc} */
@@ -98,4 +96,4 @@ public class GridCacheLocalTxMultiThreadedSelfTest extends IgniteTxMultiThreaded
@Override protected boolean printMemoryStats() {
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
index 27ce919..5727c57 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
@@ -32,10 +32,8 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*/
public class GridCacheLocalTxSingleThreadedSelfTest extends IgniteTxSingleThreadedAbstractTest {
/** {@inheritDoc} */
- @Override public void beforeTestsStarted() throws Exception {
+ @Override public void beforeTest() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
-
- super.beforeTestsStarted();
}
/** Cache debug flag. */
@@ -92,4 +90,4 @@ public class GridCacheLocalTxSingleThreadedSelfTest extends IgniteTxSingleThread
@Override protected boolean printMemoryStats() {
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
index 62af452..ec87f67 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
@@ -31,6 +31,10 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.transactions.TransactionTimeoutException;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheMode.LOCAL;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
@@ -42,8 +46,10 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
/**
*
*/
+@RunWith(JUnit4.class)
public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE);
@@ -97,6 +103,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testPessimisticReadCommitted() throws Exception {
checkTransactionTimeout(PESSIMISTIC, READ_COMMITTED);
}
@@ -104,6 +111,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testPessimisticRepeatableRead() throws Exception {
checkTransactionTimeout(PESSIMISTIC, REPEATABLE_READ);
}
@@ -111,6 +119,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testPessimisticSerializable() throws Exception {
checkTransactionTimeout(PESSIMISTIC, SERIALIZABLE);
}
@@ -118,6 +127,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testOptimisticReadCommitted() throws Exception {
checkTransactionTimeout(OPTIMISTIC, READ_COMMITTED);
}
@@ -125,6 +135,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testOptimisticRepeatableRead() throws Exception {
checkTransactionTimeout(OPTIMISTIC, REPEATABLE_READ);
}
@@ -132,6 +143,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testOptimisticSerializable() throws Exception {
checkTransactionTimeout(OPTIMISTIC, SERIALIZABLE);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java
index 5d28cb7..a72f80c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest.java
@@ -18,10 +18,14 @@
package org.apache.ignite.internal.processors.cache.multijvm;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* Multi-JVM tests.
*/
+@RunWith(JUnit4.class)
public class GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest extends
GridCacheAtomicNearEnabledMultiNodeFullApiSelfTest {
/** {@inheritDoc} */
@@ -30,7 +34,8 @@ public class GridCacheAtomicNearEnabledMultiJvmFullApiSelfTest extends
}
/** {@inheritDoc} */
+ @Test
@Override public void testPutAllPutAll() throws Exception {
fail("https://issues.apache.org/jira/browse/IGNITE-1112");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java
index 9b4db5b..6e0eba2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest.java
@@ -18,10 +18,14 @@
package org.apache.ignite.internal.processors.cache.multijvm;
import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedNearOnlyMultiNodeFullApiSelfTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* Multi-JVM tests.
*/
+@RunWith(JUnit4.class)
public class GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest extends
GridCacheReplicatedNearOnlyMultiNodeFullApiSelfTest {
/** {@inheritDoc} */
@@ -30,8 +34,9 @@ public class GridCacheReplicatedNearOnlyMultiJvmFullApiSelfTest extends
}
/** {@inheritDoc} */
+ @Test
@Override public void testNearDhtKeySize() throws Exception {
if (isMultiJvm())
fail("https://issues.apache.org/jira/browse/IGNITE-648");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
index 62ea12c..6e9f9e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
@@ -59,6 +59,9 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
+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.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -67,6 +70,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
/**
* Base class for Mvcc coordinator failover test.
*/
+@RunWith(JUnit4.class)
public abstract class CacheMvccAbstractBasicCoordinatorFailoverTest extends CacheMvccAbstractTest {
/**
* @param concurrency Transaction concurrency.
@@ -688,6 +692,7 @@ public abstract class CacheMvccAbstractBasicCoordinatorFailoverTest extends Cach
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultipleCoordinatorsLeft2Persistence() throws Exception {
persistence = true;
@@ -697,6 +702,7 @@ public abstract class CacheMvccAbstractBasicCoordinatorFailoverTest extends Cach
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultipleCoordinatorsLeft3Persistence() throws Exception {
persistence = true;
@@ -706,6 +712,7 @@ public abstract class CacheMvccAbstractBasicCoordinatorFailoverTest extends Cach
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultipleCoordinatorsLeft4() throws Exception {
checkCoordinatorsLeft(4, true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractCoordinatorFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractCoordinatorFailoverTest.java
index 4cddae6..ca7b1fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractCoordinatorFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractCoordinatorFailoverTest.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.GET;
import static org.apache.ignite.internal.processors.cache.mvcc.CacheMvccAbstractTest.ReadMode.SCAN;
import static org.apache.ignite.internal.processors.cache.mvcc.CacheMvccAbstractTest.WriteMode.PUT;
@@ -26,10 +30,12 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
/**
* Mvcc cache API coordinator failover test.
*/
+@RunWith(JUnit4.class)
public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvccAbstractBasicCoordinatorFailoverTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testAccountsTxGet_Server_Backups0_CoordinatorFails_Persistence() throws Exception {
persistence = true;
@@ -40,6 +46,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testAccountsTxGet_SingleNode_CoordinatorFails() throws Exception {
accountsTxReadAll(1, 0, 0, 1,
null, true, GET, PUT, DFLT_TEST_TIME, RestartMode.RESTART_CRD);
@@ -48,6 +55,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testAccountsTxScan_Server_Backups0_CoordinatorFails() throws Exception {
accountsTxReadAll(2, 0, 0, 64,
null, true, SCAN, PUT, DFLT_TEST_TIME, RestartMode.RESTART_CRD);
@@ -56,6 +64,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testAccountsTxScan_SingleNode_CoordinatorFails_Persistence() throws Exception {
persistence = true;
@@ -67,6 +76,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testPutAllGetAll_Server_Backups0_RestartCoordinator_GetPut() throws Exception {
putAllGetAll(RestartMode.RESTART_CRD , 2, 0, 0, 64,
null, GET, PUT);
@@ -75,6 +85,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testPutAllGetAll_SingleNode_RestartCoordinator_GetPut_Persistence() throws Exception {
persistence = true;
@@ -85,6 +96,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testUpdate_N_Objects_Servers_Backups0__PutGet_CoordinatorFails_Persistence() throws Exception {
persistence = true;
@@ -95,6 +107,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testUpdate_N_Objects_SingleNode__PutGet_CoordinatorFails() throws Exception {
updateNObjectsTest(7, 1, 0, 0, 1, DFLT_TEST_TIME,
@@ -104,6 +117,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testCoordinatorFailureSimplePessimisticTxPutGet() throws Exception {
coordinatorFailureSimple(PESSIMISTIC, REPEATABLE_READ, GET, PUT);
}
@@ -111,6 +125,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testReadInProgressCoordinatorFailsSimple_FromClientPutGet() throws Exception {
readInProgressCoordinatorFailsSimple(true, null, GET, PUT);
}
@@ -118,6 +133,7 @@ public abstract class CacheMvccAbstractCoordinatorFailoverTest extends CacheMvcc
/**
* @throws Exception If failed.
*/
+ @Test
public void testCoordinatorChangeActiveQueryClientFails_Simple() throws Exception {
checkCoordinatorChangeActiveQueryClientFails_Simple(null, GET, PUT);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClusterRestartTest.java
index 5cabffc..d83734a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccClusterRestartTest.java
@@ -32,6 +32,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
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.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -41,6 +44,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
/**
*
*/
+@RunWith(JUnit4.class)
public class CacheMvccClusterRestartTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -100,6 +104,7 @@ public class CacheMvccClusterRestartTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testRestart1() throws Exception {
restart1(3, 3);
}
@@ -107,6 +112,7 @@ public class CacheMvccClusterRestartTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testRestart2() throws Exception {
restart1(1, 3);
}
@@ -114,6 +120,7 @@ public class CacheMvccClusterRestartTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testRestart3() throws Exception {
restart1(3, 1);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
index f8a81ed..9c53588 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
@@ -43,6 +43,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
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;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -53,6 +56,7 @@ import static org.apache.ignite.cache.CacheMode.LOCAL;
*
*/
@SuppressWarnings("unchecked")
+@RunWith(JUnit4.class)
public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -77,6 +81,7 @@ public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
@SuppressWarnings("ThrowableNotThrown")
+ @Test
public void testMvccModeMismatchForGroup1() throws Exception {
final Ignite node = startGrid(0);
@@ -98,6 +103,7 @@ public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
@SuppressWarnings("ThrowableNotThrown")
+ @Test
public void testMvccModeMismatchForGroup2() throws Exception {
final Ignite node = startGrid(0);
@@ -120,6 +126,7 @@ public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
@SuppressWarnings("ThrowableNotThrown")
+ @Test
public void testMvccLocalCacheDisabled() throws Exception {
final Ignite node1 = startGrid(1);
final Ignite node2 = startGrid(2);
@@ -152,6 +159,7 @@ public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
@SuppressWarnings("ThrowableNotThrown")
+ @Test
public void testNodeRestartWithCacheModeChangedTxToMvcc() throws Exception {
cleanPersistenceDir();
@@ -199,6 +207,7 @@ public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
@SuppressWarnings("ThrowableNotThrown")
+ @Test
public void testNodeRestartWithCacheModeChangedMvccToTx() throws Exception {
cleanPersistenceDir();
@@ -248,6 +257,7 @@ public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testTransactionalSnapshotLimitations() throws Exception {
assertCannotStart(
mvccCacheConfig().setCacheMode(LOCAL),
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccIteratorWithConcurrentTransactionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccIteratorWithConcurrentTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccIteratorWithConcurrentTransactionTest.java
index 90c5b6e..db5e151 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccIteratorWithConcurrentTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccIteratorWithConcurrentTransactionTest.java
@@ -25,14 +25,19 @@ import javax.cache.Cache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.util.lang.IgniteClosure2X;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
*
*/
+@RunWith(JUnit4.class)
public class CacheMvccIteratorWithConcurrentTransactionTest extends CacheMvccAbstractFeatureTest {
/**
* @throws Exception if failed.
*/
+ @Test
public void testScanQuery() throws Exception {
doTestConsistency(clo);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccLocalEntriesWithConcurrentTransactionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccLocalEntriesWithConcurrentTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccLocalEntriesWithConcurrentTransactionTest.java
index f4c9781..0040093 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccLocalEntriesWithConcurrentTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccLocalEntriesWithConcurrentTransactionTest.java
@@ -26,14 +26,19 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.internal.util.lang.IgniteClosure2X;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
*
*/
+@RunWith(JUnit4.class)
public class CacheMvccLocalEntriesWithConcurrentTransactionTest extends CacheMvccAbstractFeatureTest {
/**
* @throws Exception if failed.
*/
+ @Test
public void testLocalEntries() throws Exception {
doTestConsistency(clo);
}