#ignite-565: remove GridCache from tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cfef5943 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cfef5943 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cfef5943 Branch: refs/heads/ignite-611 Commit: cfef5943a5c29142bb2fd18c23f72d5d3593a879 Parents: 15c9b3f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Mar 25 14:32:50 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Mar 25 14:32:50 2015 +0300 ---------------------------------------------------------------------- .../processors/query/h2/GridH2IndexingGeoSelfTest.java | 9 +++++++-- .../processors/cache/IgniteCacheAbstractQuerySelfTest.java | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfef5943/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java index 7d60aeb..36cdd7c 100644 --- a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java +++ b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java @@ -77,8 +77,13 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest { SqlQuery<Integer, EnemyCamp> query = new SqlQuery(EnemyCamp.class, "coords && ?"); - Collection<Cache.Entry<Integer, EnemyCamp>> res = cache.query( - query.setArgs(r.read("POLYGON((5 70, 5 80, 30 80, 30 70, 5 70))"))).getAll(); + Geometry geom = r.read("POLYGON((5 70, 5 80, 30 80, 30 70, 5 70))"); + + query.setArgs(geom); + + QueryCursor<Cache.Entry<Integer, EnemyCamp>> cursor = cache.query(query); + + Collection<Cache.Entry<Integer, EnemyCamp>> res = cursor.getAll(); checkPoints(res, "A"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfef5943/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 fa44fcc..4502dff 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 @@ -493,12 +493,12 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac for (int i = 0; i < cnt; i++) { if (i % 2 == 0) { - assertNotNull(c.localPeek(i)); + assertNotNull(c.localPeek(i, CachePeekMode.ONHEAP)); c.localEvict(Collections.singleton(i)); // Swap. if (!partitioned || g.affinity(null).mapKeyToNode(i).isLocal()) { - ObjectValue peekVal = c.localPeek(i); + ObjectValue peekVal = c.localPeek(i, CachePeekMode.ONHEAP); assertNull("Non-null value for peek [key=" + i + ", val=" + peekVal + ']', peekVal); }
