This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2b6d2563088382230e2a2980950b7d432a7e254d
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Mon Jul 2 16:07:31 2018 -0700
GEODE-5363: Moves distributed tests into new source set.
---
geode-core/build.gradle | 12 ++--
.../cache/query/dunit/QueryUsingPoolDUnitTest.java | 72 --------------------
.../index/IndexTrackingQueryObserverDUnitTest.java | 50 +-------------
.../cache/CustomerIDPartitionResolver.java | 76 ++++++++++++++++++++++
.../java/hydra/MethExecutor.java | 0
.../java/hydra/MethExecutorResult.java | 0
.../java/hydra/SchedulingOrder.java | 0
.../apache/geode/cache/query/QueryTestUtils.java | 0
.../apache/geode/cache/query/dunit/TestObject.java | 76 ++++++++++++++++++++++
.../functional/OrderByPartitionedJUnitTest.java | 2 +-
.../index/IndexTrackingQueryObserverJUnitTest.java | 1 -
.../internal/index/IndexTrackingTestHook.java | 63 ++++++++++++++++++
.../geode/cache30/CacheSerializableRunnable.java | 0
.../apache/geode/cache30/ClientServerTestCase.java | 0
.../geode/cache30/GlobalLockingDUnitTest.java | 0
.../geode/cache30/MultiVMRegionTestCase.java | 0
.../org/apache/geode/cache30/RegionTestCase.java | 0
.../apache/geode/cache30/TestCacheCallback.java | 0
.../apache/geode/cache30/TestCacheListener.java | 0
.../org/apache/geode/cache30/TestCacheLoader.java | 0
.../org/apache/geode/cache30/TestCacheWriter.java | 0
.../distributed/LauncherIntegrationTestCase.java | 0
.../apache/geode/distributed/LocatorCommand.java | 0
.../LocatorLauncherIntegrationTestCase.java | 0
.../LocatorLauncherRemoteIntegrationTestCase.java | 0
.../apache/geode/distributed/ServerCommand.java | 0
.../ServerLauncherIntegrationTestCase.java | 0
.../ServerLauncherLocalIntegrationTestCase.java | 0
.../ServerLauncherRemoteIntegrationTestCase.java | 0
.../TestServerLauncherCacheProvider.java | 0
.../geode/distributed/UsesLocatorCommand.java | 0
.../geode/distributed/UsesServerCommand.java | 0
.../membership/gms/MembershipManagerHelper.java | 0
.../gms/membership/GMSJoinLeaveTestHelper.java | 0
.../membership/gms/messenger/InterceptUDP.java | 0
.../cache/tier/sockets/CacheServerTestUtil.java | 0
.../geode/internal/offheap/OffHeapRegionBase.java | 0
.../java/org/apache/geode/test/dunit/Assert.java | 0
.../apache/geode/test/dunit/AsyncInvocation.java | 0
.../apache/geode/test/dunit/DUnitBlackboard.java | 0
.../java/org/apache/geode/test/dunit/DUnitEnv.java | 0
.../org/apache/geode/test/dunit/Disconnect.java | 0
.../geode/test/dunit/DistributedTestUtils.java | 0
.../java/org/apache/geode/test/dunit/Host.java | 0
.../apache/geode/test/dunit/IgnoredException.java | 0
.../java/org/apache/geode/test/dunit/Invoke.java | 0
.../java/org/apache/geode/test/dunit/Jitter.java | 0
.../apache/geode/test/dunit/LogWriterUtils.java | 0
.../org/apache/geode/test/dunit/NamedCallable.java | 0
.../org/apache/geode/test/dunit/NamedRunnable.java | 0
.../org/apache/geode/test/dunit/RMIException.java | 0
.../geode/test/dunit/RepeatableRunnable.java | 0
.../geode/test/dunit/SerializableCallable.java | 0
.../geode/test/dunit/SerializableCallableIF.java | 0
.../geode/test/dunit/SerializableRunnable.java | 0
.../geode/test/dunit/SerializableRunnableIF.java | 0
.../geode/test/dunit/StoppableWaitCriterion.java | 0
.../org/apache/geode/test/dunit/ThreadUtils.java | 0
.../java/org/apache/geode/test/dunit/VM.java | 0
.../java/org/apache/geode/test/dunit/Wait.java | 0
.../org/apache/geode/test/dunit/WaitCriterion.java | 0
.../dunit/cache/internal/CacheTestFixture.java | 0
.../dunit/cache/internal/JUnit4CacheTestCase.java | 0
.../dunit/internal/DistributedTestFixture.java | 0
.../test/dunit/internal/InternalBlackboard.java | 0
.../dunit/internal/InternalBlackboardImpl.java | 0
.../dunit/internal/JUnit4DistributedTestCase.java | 0
.../dunit/rules/AbstractDistributedTestRule.java | 0
.../test/dunit/rules/DistributedTestRule.java | 0
.../geode/test/dunit/rules/RemoteInvoker.java | 0
.../geode/test/dunit/standalone/BounceResult.java | 0
.../geode/test/dunit/standalone/ChildVM.java | 0
.../geode/test/dunit/standalone/DUnitLauncher.java | 0
.../test/dunit/standalone/ProcessManager.java | 0
.../geode/test/dunit/standalone/RemoteDUnitVM.java | 0
.../test/dunit/standalone/RemoteDUnitVMIF.java | 0
.../test/dunit/standalone/StandAloneDUnitEnv.java | 0
.../geode/test/junit/rules/GfshCommandRule.java | 0
.../geode/test/junit/rules/LocatorStarterRule.java | 0
.../geode/test/junit/rules/MemberStarterRule.java | 0
.../geode/test/junit/rules/ServerStarterRule.java | 0
81 files changed, 225 insertions(+), 127 deletions(-)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 97e983e..b404df5 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -166,10 +166,6 @@ dependencies {
testRuntime 'xerces:xercesImpl:' + project.'xercesImpl.version'
testCompile project(':geode-concurrency-test')
-
- // Integration Tests
-
-
}
def generatedResources = "$buildDir/generated-resources/main"
@@ -204,6 +200,14 @@ jmh {
duplicateClassesStrategy = 'warn'
}
+dependencies {
+ // Integration Tests
+ integrationTestCompile sourceSets.test.output
+
+ // Distributed Tests
+ distributedTestCompile sourceSets.integrationTest.output
+}
+
// Creates the version properties file and writes it to the classes dir
task createVersionPropertiesFile {
def propertiesFile = file(generatedResources +
"/org/apache/geode/internal/GemFireVersion.properties");
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index c295bf1..f90a2bf 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import java.util.Comparator;
import java.util.Iterator;
@@ -35,8 +33,6 @@ import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -1848,74 +1844,6 @@ public class QueryUsingPoolDUnitTest extends
JUnit4CacheTestCase {
return bridgeServerPort;
}
- public static class TestObject implements DataSerializable {
- protected String _ticker;
- protected int _price;
- public int id;
- public int important;
- public int selection;
- public int select;
-
- public TestObject() {}
-
- public TestObject(int id, String ticker) {
- this.id = id;
- this._ticker = ticker;
- this._price = id;
- this.important = id;
- this.selection = id;
- this.select = id;
- }
-
- public int getId() {
- return this.id;
- }
-
- public String getTicker() {
- return this._ticker;
- }
-
- public int getPrice() {
- return this._price;
- }
-
- public void toData(DataOutput out) throws IOException {
- out.writeInt(this.id);
- DataSerializer.writeString(this._ticker, out);
- out.writeInt(this._price);
- }
-
- public void fromData(DataInput in) throws IOException,
ClassNotFoundException {
- this.id = in.readInt();
- this._ticker = DataSerializer.readString(in);
- this._price = in.readInt();
- }
-
- @Override
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("TestObject [").append("id=").append(this.id).append(";
ticker=")
- .append(this._ticker).append(";
price=").append(this._price).append("]");
- return buffer.toString();
- }
-
- @Override
- public boolean equals(Object o) {
- TestObject other = (TestObject) o;
- if ((id == other.id) && (_ticker.equals(other._ticker))) {
- return true;
- } else {
- return false;
- }
- }
-
- @Override
- public int hashCode() {
- return this.id;
- }
-
- }
-
private static class IdComparator implements Comparator {
public int compare(Object obj1, Object obj2) {
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 7525cc2..7992b54 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.Collection;
-import java.util.Map;
import org.junit.Ignore;
import org.junit.Test;
@@ -39,9 +38,6 @@ import
org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
import
org.apache.geode.cache.query.internal.IndexTrackingQueryObserver.IndexInfo;
import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import
org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator.TestHook;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
@@ -60,7 +56,6 @@ public class IndexTrackingQueryObserverDUnitTest extends
JUnit4CacheTestCase {
private final int NUM_BKTS = 10;
private static final String queryStr = "select * from /portfolio where ID >=
0";
protected static final int TOTAL_OBJECTS = 1000;
- public static final String INDEX_NAME = "keyIndex1";
public IndexTrackingQueryObserverDUnitTest() {
super();
@@ -191,7 +186,7 @@ public class IndexTrackingQueryObserverDUnitTest extends
JUnit4CacheTestCase {
Index keyIndex1 = null;
try {
if (create) {
- keyIndex1 = (IndexProtocol) qs.createIndex(INDEX_NAME,
IndexType.FUNCTIONAL, "ID",
+ keyIndex1 = (IndexProtocol)
qs.createIndex(IndexTrackingTestHook.INDEX_NAME, IndexType.FUNCTIONAL, "ID",
"/portfolio ");
assertNotNull(keyIndex1);
assertTrue(keyIndex1 instanceof PartitionedIndex);
@@ -281,47 +276,4 @@ public class IndexTrackingQueryObserverDUnitTest extends
JUnit4CacheTestCase {
return asyncInv;
}
- /**
- * TODO: Not implemented fully for all the hooks.
- *
- */
- public static class IndexTrackingTestHook implements TestHook {
- IndexInfo rMap;
- Region regn;
- int bkts;
-
- public IndexTrackingTestHook(Region region, int bukts) {
- this.regn = region;
- this.bkts = bukts;
- }
-
-
- public void hook(int spot) throws RuntimeException {
-
- QueryObserver observer = QueryObserverHolder.getInstance();
- assertTrue(observer instanceof IndexTrackingQueryObserver);
- IndexTrackingQueryObserver gfObserver = (IndexTrackingQueryObserver)
observer;
-
- if (spot == 1) { // before index lookup
- } else if (spot == 2) { // before key range index lookup
- } else if (spot == 3) { // End of afterIndexLookup call
- } else if (spot == 4) { // Before resetting indexInfoMap
- Map map = gfObserver.getUsedIndexes();
- assertEquals(1, map.size());
-
- assertTrue(map.get(INDEX_NAME) instanceof IndexInfo);
- rMap = (IndexInfo) map.get(INDEX_NAME);
-
- if (this.regn instanceof PartitionedRegion) {
- assertEquals(1, rMap.getResults().size());
- } else if (this.regn instanceof LocalRegion) {
- assertEquals(1, rMap.getResults().size());
- }
- }
- }
-
- public IndexInfo getRegionMap() {
- return rMap;
- }
- }
}
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
new file mode 100755
index 0000000..19ae77b
--- /dev/null
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.io.Serializable;
+
+import org.apache.geode.cache.EntryOperation;
+import org.apache.geode.cache.PartitionResolver;
+import org.apache.geode.internal.cache.execute.data.CustId;
+import org.apache.geode.internal.cache.execute.data.OrderId;
+import org.apache.geode.internal.cache.execute.data.ShipmentId;
+
+public class CustomerIDPartitionResolver implements PartitionResolver {
+
+ private static CustomerIDPartitionResolver customerIDPartitionResolver =
null;
+
+ private String id;
+
+
+ private String resolverName;
+
+ public CustomerIDPartitionResolver() {}
+
+ public CustomerIDPartitionResolver(String resolverID) {
+ id = resolverID;
+ }
+
+ public String getName() {
+ return this.resolverName;
+ }
+
+ public Serializable getRoutingObject(EntryOperation opDetails) {
+
+ Serializable routingbject = null;
+
+ if (opDetails.getKey() instanceof ShipmentId) {
+ ShipmentId shipmentId = (ShipmentId) opDetails.getKey();
+ routingbject = shipmentId.getOrderId().getCustId();
+ }
+ if (opDetails.getKey() instanceof OrderId) {
+ OrderId orderId = (OrderId) opDetails.getKey();
+ routingbject = orderId.getCustId();
+ } else if (opDetails.getKey() instanceof CustId) {
+ CustId custId = (CustId) opDetails.getKey();
+ routingbject = custId.getCustId();
+ }
+ return routingbject;
+ }
+
+ public void close() {}
+
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (!(o instanceof CustomerIDPartitionResolver))
+ return false;
+
+ CustomerIDPartitionResolver otherCustomerIDPartitionResolver =
(CustomerIDPartitionResolver) o;
+ return otherCustomerIDPartitionResolver.id.equals(this.id);
+
+ }
+
+}
diff --git a/geode-core/src/distributedTest/java/hydra/MethExecutor.java
b/geode-core/src/integrationTest/java/hydra/MethExecutor.java
similarity index 100%
rename from geode-core/src/distributedTest/java/hydra/MethExecutor.java
rename to geode-core/src/integrationTest/java/hydra/MethExecutor.java
diff --git a/geode-core/src/distributedTest/java/hydra/MethExecutorResult.java
b/geode-core/src/integrationTest/java/hydra/MethExecutorResult.java
similarity index 100%
rename from geode-core/src/distributedTest/java/hydra/MethExecutorResult.java
rename to geode-core/src/integrationTest/java/hydra/MethExecutorResult.java
diff --git a/geode-core/src/distributedTest/java/hydra/SchedulingOrder.java
b/geode-core/src/integrationTest/java/hydra/SchedulingOrder.java
similarity index 100%
rename from geode-core/src/distributedTest/java/hydra/SchedulingOrder.java
rename to geode-core/src/integrationTest/java/hydra/SchedulingOrder.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtils.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtils.java
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
new file mode 100644
index 0000000..91b7353
--- /dev/null
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
@@ -0,0 +1,76 @@
+package org.apache.geode.cache.query.dunit;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+
+public class TestObject implements DataSerializable {
+ protected String _ticker;
+ protected int _price;
+ public int id;
+ public int important;
+ public int selection;
+ public int select;
+
+ public TestObject() {}
+
+ public TestObject(int id, String ticker) {
+ this.id = id;
+ this._ticker = ticker;
+ this._price = id;
+ this.important = id;
+ this.selection = id;
+ this.select = id;
+ }
+
+ public int getId() {
+ return this.id;
+ }
+
+ public String getTicker() {
+ return this._ticker;
+ }
+
+ public int getPrice() {
+ return this._price;
+ }
+
+ public void toData(DataOutput out) throws IOException {
+ out.writeInt(this.id);
+ DataSerializer.writeString(this._ticker, out);
+ out.writeInt(this._price);
+ }
+
+ public void fromData(DataInput in) throws IOException,
ClassNotFoundException {
+ this.id = in.readInt();
+ this._ticker = DataSerializer.readString(in);
+ this._price = in.readInt();
+ }
+
+ @Override
+ public String toString() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("TestObject [").append("id=").append(this.id).append(";
ticker=")
+ .append(this._ticker).append(";
price=").append(this._price).append("]");
+ return buffer.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ TestObject other = (TestObject) o;
+ if ((id == other.id) && (_ticker.equals(other._ticker))) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ return this.id;
+ }
+
+}
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
index 57d65696..5a7d779 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
-import org.apache.geode.cache.query.dunit.QueryUsingPoolDUnitTest.TestObject;
+import org.apache.geode.cache.query.dunit.TestObject;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
index 1b556ac..0aa9071 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
@@ -39,7 +39,6 @@ import
org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
import
org.apache.geode.cache.query.internal.IndexTrackingQueryObserver.IndexInfo;
import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import
org.apache.geode.cache.query.internal.index.IndexTrackingQueryObserverDUnitTest.IndexTrackingTestHook;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
new file mode 100644
index 0000000..612e8c1
--- /dev/null
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
@@ -0,0 +1,63 @@
+package org.apache.geode.cache.query.internal.index;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
+import org.apache.geode.cache.query.internal.QueryObserver;
+import org.apache.geode.cache.query.internal.QueryObserverHolder;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator;
+
+/**
+ * TODO: Not implemented fully for all the hooks.
+ *
+ */
+public class IndexTrackingTestHook implements
PartitionedRegionQueryEvaluator.TestHook {
+
+ public static final String INDEX_NAME = "keyIndex1";
+
+ IndexTrackingQueryObserver.IndexInfo rMap;
+ Region regn;
+ int bkts;
+
+ public IndexTrackingTestHook(Region region, int bukts) {
+ this.regn = region;
+ this.bkts = bukts;
+ }
+
+
+ public void hook(int spot) throws RuntimeException {
+
+ QueryObserver observer = QueryObserverHolder.getInstance();
+ assertTrue(observer instanceof IndexTrackingQueryObserver);
+ IndexTrackingQueryObserver gfObserver = (IndexTrackingQueryObserver)
observer;
+
+ if (spot == 1) { // before index lookup
+ } else if (spot == 2) { // before key range index lookup
+ } else if (spot == 3) { // End of afterIndexLookup call
+ } else if (spot == 4) { // Before resetting indexInfoMap
+ Map map = gfObserver.getUsedIndexes();
+ assertEquals(1, map.size());
+
+ assertTrue(map.get(
+ INDEX_NAME) instanceof IndexTrackingQueryObserver.IndexInfo);
+ rMap = (IndexTrackingQueryObserver.IndexInfo) map.get(
+ INDEX_NAME);
+
+ if (this.regn instanceof PartitionedRegion) {
+ assertEquals(1, rMap.getResults().size());
+ } else if (this.regn instanceof LocalRegion) {
+ assertEquals(1, rMap.getResults().size());
+ }
+ }
+ }
+
+ public IndexTrackingQueryObserver.IndexInfo getRegionMap() {
+ return rMap;
+ }
+}
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache30/ClientServerTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache30/ClientServerTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache30/RegionTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache30/RegionTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheCallback.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheCallback.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheCallback.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheCallback.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheListener.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheListener.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheListener.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheListener.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheLoader.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheLoader.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheLoader.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheLoader.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheWriter.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheWriter.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheWriter.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheWriter.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorCommand.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorCommand.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorCommand.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorCommand.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerCommand.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerCommand.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerCommand.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerCommand.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesLocatorCommand.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesLocatorCommand.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesLocatorCommand.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesLocatorCommand.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesServerCommand.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesServerCommand.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesServerCommand.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesServerCommand.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Assert.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Assert.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Assert.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Assert.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/AsyncInvocation.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/AsyncInvocation.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/AsyncInvocation.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/AsyncInvocation.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitEnv.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DUnitEnv.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitEnv.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DUnitEnv.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Disconnect.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Disconnect.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Disconnect.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Disconnect.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Host.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Host.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Host.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Host.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/IgnoredException.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/IgnoredException.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/IgnoredException.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/IgnoredException.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Invoke.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Invoke.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Invoke.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Invoke.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Jitter.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Jitter.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Jitter.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Jitter.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/LogWriterUtils.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/LogWriterUtils.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/LogWriterUtils.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/LogWriterUtils.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedCallable.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/NamedCallable.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedCallable.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/NamedCallable.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedRunnable.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/NamedRunnable.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedRunnable.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/NamedRunnable.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RMIException.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/RMIException.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RMIException.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/RMIException.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallable.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableCallable.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallable.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableCallable.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnable.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableRunnable.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnable.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableRunnable.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/ThreadUtils.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/ThreadUtils.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/ThreadUtils.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/ThreadUtils.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/VM.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/VM.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/VM.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/VM.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Wait.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Wait.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Wait.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Wait.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/WaitCriterion.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/WaitCriterion.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/WaitCriterion.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/WaitCriterion.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
b/geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
rename to
geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
