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 dbdd63b4a4eb64173407d69b4f379ecabfeeb611
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Tue Jul 3 07:23:25 2018 -0700
GEODE-5363: Moves geode-protobuf tests into new source sets.
---
geode-protobuf/build.gradle | 45 ++++++++++++++++++++++
.../v1/acceptance/CacheConnectionJUnitTest.java | 0
.../CacheConnectionTimeoutJUnitTest.java | 0
.../v1/acceptance/CacheMaxConnectionJUnitTest.java | 0
.../v1/acceptance/CacheOperationsJUnitTest.java | 0
.../LocatorConnectionAuthenticationDUnitTest.java | 0
.../v1/acceptance/LocatorConnectionDUnitTest.java | 0
.../GetAndPutJsonDocumentsDUnitTest.java | 0
.../protobuf/v1/AuthenticationIntegrationTest.java | 0
.../protobuf/v1/AuthorizationIntegrationTest.java | 0
.../v1/DisconnectClientIntegrationTest.java | 0
.../v1/ExecuteFunctionOnGroupIntegrationTest.java | 0
.../v1/ExecuteFunctionOnMemberIntegrationTest.java | 0
.../v1/ExecuteFunctionOnRegionIntegrationTest.java | 0
.../v1/ProtocolVersionIntegrationTest.java | 0
.../v1/ValueSerializerIntegrationTest.java | 0
.../PutIfAbsentRequestIntegrationTest.java | 0
.../PutAllRequestOperationHandlerJUnitTest.java | 3 +-
18 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index f0a0c49..a5cba86 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -30,3 +30,48 @@ dependencies {
compile 'com.google.protobuf:protobuf-java:' +
project.'protobuf-java.version'
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)
+}
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
rename to
geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
rename to
geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
rename to
geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
rename to
geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
rename to
geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
rename to
geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
b/geode-protobuf/src/distributedTest/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
rename to
geode-protobuf/src/distributedTest/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
rename to
geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
rename to
geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
rename to
geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
rename to
geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
rename to
geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
rename to
geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
rename to
geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
rename to
geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
similarity index 100%
rename from
geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
rename to
geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
diff --git
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandlerJUnitTest.java
b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandlerJUnitTest.java
index cc91ad6..21e99bb 100644
---
a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandlerJUnitTest.java
+++
b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutAllRequestOperationHandlerJUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.internal.protocol.protobuf.v1.Success;
import
org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
import
org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
import
org.apache.geode.internal.protocol.protobuf.v1.utilities.ProtobufUtilities;
-import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -107,7 +106,7 @@ public class PutAllRequestOperationHandlerJUnitTest extends
OperationHandlerJUni
Result result = operationHandler.process(serializationService,
generateTestRequest(false, true),
getNoAuthCacheExecutionContext(cacheStub));
- Assert.assertTrue(result instanceof Success);
+ assertTrue(result instanceof Success);
verify(regionMock).put(TEST_KEY1, TEST_VALUE1);
verify(regionMock).put(TEST_KEY2, TEST_VALUE2);
