You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/11/29 12:16:31 UTC
[35/50] [abbrv] ignite git commit: IGNITE-10158 Some tests in
IgniteCacheAbstractQuerySelfTest are incorrectly muted - Fixes #5344.
IGNITE-10158 Some tests in IgniteCacheAbstractQuerySelfTest are incorrectly muted - Fixes #5344.
Signed-off-by: Pavel Kovalenko <jo...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/be97bcdc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be97bcdc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be97bcdc
Branch: refs/heads/ignite-10044
Commit: be97bcdcfa6f0ae0bc37d156806bbac4c09259dc
Parents: 07f1dbf
Author: Oleg Ignatenko <oi...@gridgain.com>
Authored: Tue Nov 27 20:02:47 2018 +0300
Committer: Pavel Kovalenko <jo...@gmail.com>
Committed: Tue Nov 27 20:02:47 2018 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheAbstractQuerySelfTest.java | 54 +++-----------------
.../IgniteCacheQueryMultiThreadedSelfTest.java | 6 +--
2 files changed, 8 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/be97bcdc/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 1c1b879..d5b8ccc 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
@@ -286,21 +286,12 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
*
* @throws Exception In case of error.
*/
- public void _testDifferentKeyTypes() throws Exception {
- fail("http://atlassian.gridgain.com/jira/browse/GG-11216");
-
+ public void testDifferentKeyTypes() throws Exception {
final IgniteCache<Object, Object> cache = jcache(Object.class, Object.class);
cache.put(1, "value");
- try {
- cache.put("key", "value");
-
- fail();
- }
- catch (CacheException ignored) {
- // No-op.
- }
+ cache.put("key", "value");
}
/**
@@ -521,7 +512,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
QueryCursor<Cache.Entry<Key, GridCacheQueryTestValue>> qry = cache
.query(new SqlQuery<Key, GridCacheQueryTestValue>(GridCacheQueryTestValue.class,
- "fieldName='field1' and field2=1 and field3=1 and id=100500 and embeddedField2=11 and x=3"));
+ "fieldName='field1' and field2=1 and field3=1 and id=100500 and embeddedField2=11 and x=3"));
Cache.Entry<Key, GridCacheQueryTestValue> entry = F.first(qry.getAll());
@@ -2232,39 +2223,6 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
}
/**
- * Empty test object.
- */
- private static class EmptyObject {
- /** */
- private int val;
-
- /**
- * @param val Value.
- */
- private EmptyObject(int val) {
- this.val = val;
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return val;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o)
- return true;
-
- if (!(o instanceof EmptyObject))
- return false;
-
- EmptyObject that = (EmptyObject)o;
-
- return val == that.val;
- }
- }
-
- /**
*
*/
private static class BadHashKeyObject implements Serializable, Comparable<BadHashKeyObject> {
@@ -2404,9 +2362,9 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
*/
@Override public String toString() {
return "EnumObject{" +
- "id=" + id +
- ", type=" + type +
- '}';
+ "id=" + id +
+ ", type=" + type +
+ '}';
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/be97bcdc/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
index 8f28501..e9ebc18 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
@@ -360,9 +360,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
* @throws Exception If failed.
*/
@SuppressWarnings({"TooBroadScope"})
- public void _testMultiThreadedSwapUnswapLongString() throws Exception {
- fail("http://atlassian.gridgain.com/jira/browse/GG-11216");
-
+ public void testMultiThreadedSwapUnswapLongString() throws Exception {
int threadCnt = 50;
final int keyCnt = 2000;
final int valCnt = 10000;
@@ -758,4 +756,4 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
return val;
}
}
-}
\ No newline at end of file
+}