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 10ecd0a431c8be9035f85f4cd08e0f22f7b694ac
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Tue Jul 3 07:30:31 2018 -0700
GEODE-5363: Moves geode-old-client-support tests into new source sets.
---
geode-connectors/build.gradle | 46 ++++++++++++++++++++++
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 0
.../geode/connectors/jdbc/JdbcDistributedTest.java | 0
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 0
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 0
.../jdbc/MySqlJdbcAsyncWriterIntegrationTest.java | 0
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 0
.../jdbc/MySqlJdbcLoaderIntegrationTest.java | 0
.../jdbc/MySqlJdbcWriterIntegrationTest.java | 0
.../PostgresJdbcAsyncWriterIntegrationTest.java | 0
.../jdbc/PostgresJdbcDistributedTest.java | 0
.../jdbc/PostgresJdbcLoaderIntegrationTest.java | 0
.../jdbc/PostgresJdbcWriterIntegrationTest.java | 0
.../MySqlTableMetaDataManagerIntegrationTest.java | 0
...ostgresTableMetaDataManagerIntegrationTest.java | 0
.../TableMetaDataManagerIntegrationTest.java | 0
.../cli/AlterConnectionCommandDUnitTest.java | 0
.../internal/cli/AlterMappingCommandDUnitTest.java | 0
.../cli/CreateConnectionCommandDUnitTest.java | 0
.../cli/CreateMappingCommandDUnitTest.java | 0
.../cli/DescribeConnectionCommandDUnitTest.java | 0
.../cli/DescribeMappingCommandDUnitTest.java | 0
.../cli/DestroyConnectionCommandDUnitTest.java | 0
.../cli/DestroyMappingCommandDunitTest.java | 0
.../cli/JdbcClusterConfigDistributedTest.java | 0
.../cli/ListConnectionCommandDUnitTest.java | 0
.../internal/cli/ListMappingCommandDUnitTest.java | 0
.../AnalyzeConnectorsSerializablesJUnitTest.java | 0
.../cli/AlterConnectionCommandIntegrationTest.java | 0
.../cli/AlterMappingCommandIntegrationTest.java | 0
.../CreateConnectionCommandIntegrationTest.java | 0
.../cli/CreateMappingCommandIntegrationTest.java | 0
.../DestroyConnectionCommandIntegrationTest.java | 0
.../cli/DestroyMappingCommandIntegrationTest.java | 0
.../cli/JDBCConnectorFunctionsSecurityTest.java | 0
geode-old-client-support/build.gradle | 22 +++++++++++
.../gemfire/ClientDataSerializableObject.java | 0
.../gemfire/ClientPDXSerializableObject.java | 0
.../gemstone/gemfire/ClientSerializableObject.java | 0
.../apache/geode/ClientDataSerializableObject.java | 0
.../apache/geode/ClientPDXSerializableObject.java | 0
.../org/apache/geode/ClientSerializableObject.java | 0
.../apache/geode/OldClientSupportDUnitTest.java | 0
43 files changed, 68 insertions(+)
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index c5423b9..f9e4c88 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -41,4 +41,50 @@ dependencies {
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+ acceptanceTestCompile.extendsFrom testCompile
+ acceptanceTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+ acceptanceTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/acceptanceTest/java')
+ }
+ resources.srcDir file('src/acceptanceTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ acceptanceTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ acceptanceTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
+
integrationTest.forkEvery 0
+
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
rename to
geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
rename to
geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
rename to
geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
rename to
geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
rename to
geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
rename to
geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
rename to
geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
rename to
geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
rename to
geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
similarity index 100%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
rename to
geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
diff --git a/geode-old-client-support/build.gradle
b/geode-old-client-support/build.gradle
index f5d967a..02b6d2a 100644
--- a/geode-old-client-support/build.gradle
+++ b/geode-old-client-support/build.gradle
@@ -24,3 +24,25 @@ dependencies {
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+
+configurations {
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git
a/geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientDataSerializableObject.java
b/geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientDataSerializableObject.java
similarity index 100%
rename from
geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientDataSerializableObject.java
rename to
geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientDataSerializableObject.java
diff --git
a/geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientPDXSerializableObject.java
b/geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientPDXSerializableObject.java
similarity index 100%
rename from
geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientPDXSerializableObject.java
rename to
geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientPDXSerializableObject.java
diff --git
a/geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientSerializableObject.java
b/geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientSerializableObject.java
similarity index 100%
rename from
geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientSerializableObject.java
rename to
geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientSerializableObject.java
diff --git
a/geode-old-client-support/src/test/java/org/apache/geode/ClientDataSerializableObject.java
b/geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientDataSerializableObject.java
similarity index 100%
rename from
geode-old-client-support/src/test/java/org/apache/geode/ClientDataSerializableObject.java
rename to
geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientDataSerializableObject.java
diff --git
a/geode-old-client-support/src/test/java/org/apache/geode/ClientPDXSerializableObject.java
b/geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientPDXSerializableObject.java
similarity index 100%
rename from
geode-old-client-support/src/test/java/org/apache/geode/ClientPDXSerializableObject.java
rename to
geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientPDXSerializableObject.java
diff --git
a/geode-old-client-support/src/test/java/org/apache/geode/ClientSerializableObject.java
b/geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientSerializableObject.java
similarity index 100%
rename from
geode-old-client-support/src/test/java/org/apache/geode/ClientSerializableObject.java
rename to
geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientSerializableObject.java
diff --git
a/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
b/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
similarity index 100%
rename from
geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
rename to
geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
