ignite-sql-tests - test fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/202f90fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/202f90fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/202f90fa Branch: refs/heads/ignite-sql-tests Commit: 202f90fa73c15b1402cff300fbc159a0d88ae6ef Parents: af5abd0 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Feb 5 13:53:53 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Feb 5 13:53:53 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/cache/query/QuerySqlPredicate.java | 2 +- .../java/org/apache/ignite/cache/query/QueryTextPredicate.java | 2 +- .../processors/cache/local/IgniteCacheLocalQuerySelfTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/202f90fa/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySqlPredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySqlPredicate.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySqlPredicate.java index c61dd07..061b2a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySqlPredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QuerySqlPredicate.java @@ -134,7 +134,7 @@ public final class QuerySqlPredicate extends QueryPredicate { * @param type Type. */ public void setType(Class<?> type) { - this.type = type == null ? null : type.getName(); + this.type = type == null ? null : type.getSimpleName(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/202f90fa/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTextPredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTextPredicate.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTextPredicate.java index e69db2c..4064f64 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTextPredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTextPredicate.java @@ -62,7 +62,7 @@ public final class QueryTextPredicate extends QueryPredicate { * @param type Type. */ public void setType(Class<?> type) { - setType(type == null ? null : type.getName()); + setType(type == null ? null : type.getSimpleName()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/202f90fa/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java index e1d29b3..3dfbb1d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQuerySelfTest.java @@ -61,7 +61,7 @@ public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfT Cache.Entry<Integer, String> entry = iter.next(); - assert iter.next() == null; + assert !iter.hasNext(); assert entry != null; assert entry.getKey() == 1; @@ -77,6 +77,6 @@ public class IgniteCacheLocalQuerySelfTest extends IgniteCacheAbstractQuerySelfT assert iter.next() != null; assert iter.next() != null; assert iter.next() != null; - assert iter.next() == null; + assert !iter.hasNext(); } }
