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/11/20 18:04:27 UTC
[34/50] [abbrv] ignite git commit: IGNITE-10159 Fixed muted
IgniteCacheAbstractQuerySelfTest.testObjectQueryWithSwap - Fixes #5336.
IGNITE-10159 Fixed muted IgniteCacheAbstractQuerySelfTest.testObjectQueryWithSwap - Fixes #5336.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2c23d680
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2c23d680
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2c23d680
Branch: refs/heads/ignite-9720
Commit: 2c23d68071e6cd2a604c92bf5bb94c75c7da522b
Parents: 2a59d83
Author: Alexey Platonov <ap...@gmail.com>
Authored: Tue Nov 20 11:20:58 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Nov 20 11:25:23 2018 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheAbstractQuerySelfTest.java | 37 +++++++++++---------
.../IgniteCacheReplicatedQuerySelfTest.java | 17 ++-------
2 files changed, 22 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2c23d680/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index bf6d6da..1c1b879 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -266,7 +266,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
super.afterTest();
for(String cacheName : ignite().cacheNames())
- ignite().cache(cacheName).removeAll();
+ ignite().cache(cacheName).destroy();
}
/** {@inheritDoc} */
@@ -621,11 +621,16 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
/**
* JUnit.
- *
- * @throws Exception In case of error.
*/
- public void testSimpleCustomTableName() throws Exception {
- final IgniteCache<Integer, Object> cache = ignite().cache(DEFAULT_CACHE_NAME);
+ public void testSimpleCustomTableName() {
+ CacheConfiguration<Integer, Object> cacheConf = new CacheConfiguration<Integer, Object>(cacheConfiguration())
+ .setName(DEFAULT_CACHE_NAME)
+ .setQueryEntities(Arrays.asList(
+ new QueryEntity(Integer.class, Type1.class),
+ new QueryEntity(Integer.class, Type2.class)
+ ));
+
+ final IgniteCache<Integer, Object> cache = ignite().getOrCreateCache(cacheConf);
cache.put(10, new Type1(1, "Type1 record #1"));
cache.put(20, new Type1(2, "Type1 record #2"));
@@ -937,13 +942,13 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
/**
* JUnit.
- *
- * @throws Exception In case of error.
*/
- public void _testObjectQueryWithSwap() throws Exception {
- fail("http://atlassian.gridgain.com/jira/browse/GG-11216");
+ public void testObjectQueryWithSwap() {
+ CacheConfiguration<Integer, ObjectValue> config = new CacheConfiguration<Integer, ObjectValue>(cacheConfiguration());
- IgniteCache<Integer, ObjectValue> cache = jcache(Integer.class, ObjectValue.class);
+ config.setOnheapCacheEnabled(true);
+
+ IgniteCache<Integer, ObjectValue> cache = jcache(ignite(), config, Integer.class, ObjectValue.class);
boolean partitioned = cache.getConfiguration(CacheConfiguration.class).getCacheMode() == PARTITIONED;
@@ -956,16 +961,14 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
IgniteCache<Integer, ObjectValue> c = g.cache(cache.getName());
for (int i = 0; i < cnt; i++) {
- if (i % 2 == 0) {
- assertNotNull(c.localPeek(i, CachePeekMode.ONHEAP));
+ assertNotNull(c.localPeek(i, CachePeekMode.ONHEAP));
- c.localEvict(Collections.singleton(i)); // Swap.
+ c.localEvict(Collections.singleton(i)); // Swap.
- if (!partitioned || g.affinity(cache.getName()).mapKeyToNode(i).isLocal()) {
- ObjectValue peekVal = c.localPeek(i, CachePeekMode.ONHEAP);
+ if (!partitioned || g.affinity(cache.getName()).mapKeyToNode(i).isLocal()) {
+ ObjectValue peekVal = c.localPeek(i, CachePeekMode.ONHEAP);
- assertNull("Non-null value for peek [key=" + i + ", val=" + peekVal + ']', peekVal);
- }
+ assertNull("Non-null value for peek [key=" + i + ", val=" + peekVal + ']', peekVal);
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2c23d680/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
index b9af3b6..8635416 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
@@ -101,8 +101,8 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery
}
/** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- super.beforeTestsStarted();
+ @Override protected void beforeTest() throws Exception {
+ super.beforeTest();
ignite1 = grid(0);
ignite2 = grid(1);
@@ -113,19 +113,6 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery
cache3 = jcache(ignite3, CacheKey.class, CacheValue.class);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- ignite1 = null;
- ignite2 = null;
- ignite3 = null;
-
- cache1 = null;
- cache2 = null;
- cache3 = null;
- }
-
/**
* @throws Exception If failed.
*/