Repository: incubator-geode Updated Branches: refs/heads/develop 426f1ae22 -> d2d62d680
GEODE-1832: remove dependency on cacheRunner package Comment out disabled test with note about how to rewrite the test. See GEODE-1837. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/68e770f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/68e770f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/68e770f4 Branch: refs/heads/develop Commit: 68e770f422f2671bb60db79d7bb7999adcef2bfd Parents: 426f1ae Author: Kirk Lund <[email protected]> Authored: Thu Sep 1 17:07:36 2016 -0700 Committer: Kirk Lund <[email protected]> Committed: Fri Sep 2 09:43:20 2016 -0700 ---------------------------------------------------------------------- .../cache/query/dunit/RemoteQueryDUnitTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/68e770f4/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java index 3ab90c9..686efb0 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java @@ -29,9 +29,6 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -import cacheRunner.Portfolio; -import cacheRunner.Position; - import com.gemstone.gemfire.DataSerializable; import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.cache.AttributesFactory; @@ -53,7 +50,6 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.DistributedTestUtils; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -486,10 +482,10 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase { /** * Tests remote complex query execution. */ - @Ignore("TODO: test is disabled") + @Ignore("GEODE-1837: rewrite this test using Portfolio and Position in package com.gemstone.gemfire.cache.query.data") @Test public void testRemoteComplexQueries() throws CacheException { - +/* final String name = this.getName(); final Host host = Host.getHost(0); VM vm0 = host.getVM(0); @@ -655,7 +651,7 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase { SelectResults results = null; queryString = - "IMPORT cacheRunner.Position; " + + "IMPORT Position; " + "SELECT DISTINCT id, status FROM " + region.getFullPath() + "WHERE NOT (SELECT DISTINCT * FROM positions.values posnVal TYPE Position " + "WHERE posnVal.secId='AOL' OR posnVal.secId='SAP').isEmpty"; @@ -676,7 +672,7 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase { public void run() { stopBridgeServer(getCache()); } - }); + });*/ } /** @@ -1484,7 +1480,7 @@ public class RemoteQueryDUnitTest extends JUnit4CacheTestCase { String queryString = "import TestObject; select distinct * from /trade"; String queryString = - "IMPORT cacheRunner.Position; " + + "IMPORT Position; " + "SELECT DISTINCT id, status FROM /root/portfolios " + "WHERE NOT (SELECT DISTINCT * FROM positions.values posnVal TYPE Position " + "WHERE posnVal.secId='AOL' OR posnVal.secId='SAP').isEmpty";
