You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/08/14 20:16:38 UTC
[geode] branch develop updated: GEODE-5530 Add geode-protobuf-test
subproject for test-structure reuse (#2324)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 83c6c09 GEODE-5530 Add geode-protobuf-test subproject for test-structure reuse (#2324)
83c6c09 is described below
commit 83c6c0929e748646fd22871f6726746235b2a5cb
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Aug 14 13:16:33 2018 -0700
GEODE-5530 Add geode-protobuf-test subproject for test-structure reuse (#2324)
Co-authored-by: Robert Houghton <rh...@pivotal.io>
Co-authored-by: Jacob Barrett <jb...@pivotal.io>
---
geode-protobuf/build.gradle | 7 +++----
.../{ => geode-protobuf-test}/build.gradle | 21 ++++++++-------------
.../internal/protocol/TestExecutionContext.java | 0
.../internal/protocol/protobuf/v1/MessageUtil.java | 0
.../protobuf/v1/ProtobufRequestUtilities.java | 0
.../protobuf/v1/TestSerializeAllSerializer.java | 0
.../protocol/protobuf/v1/TestValueSerializer.java | 0
...he.geode.protocol.serialization.ValueSerializer | 0
.../protobuf/v1/acceptance/default.keystore | Bin
settings.gradle | 1 +
10 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index 33d57fa..d319b97 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -23,12 +23,11 @@ dependencies {
testCompile project(':geode-core')
testCompile project(':geode-junit')
+ testCompile project(":geode-protobuf/geode-protobuf-test")
integrationTestCompile project(":geode-dunit")
- // TODO remove common source dependency
- integrationTestCompile sourceSets.test.output
+ integrationTestCompile project(":geode-protobuf/geode-protobuf-test")
- // TODO remove common source dependency
- distributedTestCompile sourceSets.test.output
+ distributedTestCompile project(":geode-protobuf/geode-protobuf-test")
}
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/geode-protobuf-test/build.gradle
old mode 100644
new mode 100755
similarity index 62%
copy from geode-protobuf/build.gradle
copy to geode-protobuf/geode-protobuf-test/build.gradle
index 33d57fa..dfc4e2f
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/geode-protobuf-test/build.gradle
@@ -15,20 +15,15 @@
* limitations under the License.
*/
-dependencies {
- compileOnly project(':geode-core')
- compile project(':geode-protobuf-messages')
- compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
-
-
- testCompile project(':geode-core')
- testCompile project(':geode-junit')
+dependencies {
+ compileOnly project(':geode-protobuf')
+ compileOnly project(':geode-core')
- integrationTestCompile project(":geode-dunit")
- // TODO remove common source dependency
- integrationTestCompile sourceSets.test.output
+ compile project(':geode-common')
+ compile 'junit:junit:' + project.'junit.version'
+ compile 'org.mockito:mockito-core:' + project.'mockito-core.version'
- // TODO remove common source dependency
- distributedTestCompile sourceSets.test.output
}
+
+disableMavenPublishing()
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/TestExecutionContext.java b/geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/TestExecutionContext.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/TestExecutionContext.java
rename to geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/TestExecutionContext.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/MessageUtil.java b/geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/MessageUtil.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/MessageUtil.java
rename to geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/MessageUtil.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufRequestUtilities.java b/geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufRequestUtilities.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufRequestUtilities.java
rename to geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufRequestUtilities.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/TestSerializeAllSerializer.java b/geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/TestSerializeAllSerializer.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/TestSerializeAllSerializer.java
rename to geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/TestSerializeAllSerializer.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/TestValueSerializer.java b/geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/TestValueSerializer.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/TestValueSerializer.java
rename to geode-protobuf/geode-protobuf-test/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/TestValueSerializer.java
diff --git a/geode-protobuf/src/test/resources/META-INF/services/org.apache.geode.protocol.serialization.ValueSerializer b/geode-protobuf/src/integrationTest/resources/META-INF/services/org.apache.geode.protocol.serialization.ValueSerializer
similarity index 100%
rename from geode-protobuf/src/test/resources/META-INF/services/org.apache.geode.protocol.serialization.ValueSerializer
rename to geode-protobuf/src/integrationTest/resources/META-INF/services/org.apache.geode.protocol.serialization.ValueSerializer
diff --git a/geode-protobuf/src/test/resources/org/apache/geode/internal/protocol/protobuf/v1/acceptance/default.keystore b/geode-protobuf/src/integrationTest/resources/org/apache/geode/internal/protocol/protobuf/v1/acceptance/default.keystore
similarity index 100%
rename from geode-protobuf/src/test/resources/org/apache/geode/internal/protocol/protobuf/v1/acceptance/default.keystore
rename to geode-protobuf/src/integrationTest/resources/org/apache/geode/internal/protocol/protobuf/v1/acceptance/default.keystore
diff --git a/settings.gradle b/settings.gradle
index e8e56e9..b74da7f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -41,6 +41,7 @@ include 'extensions/geode-modules-session-internal'
include 'extensions/geode-modules-session'
include 'extensions/geode-modules-assembly'
include 'geode-protobuf'
+include 'geode-protobuf/geode-protobuf-test'
include 'geode-experimental-driver'
include 'geode-protobuf-messages'
include 'extensions/session-testing-war'