This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
The following commit(s) were added to refs/heads/master by this push:
new 77a3c72 move some tests to integration tests
77a3c72 is described below
commit 77a3c72ddd33f8620ad2193a191267c9fbb8e61d
Author: Antoine Toulme <[email protected]>
AuthorDate: Mon Apr 27 00:06:29 2020 -0700
move some tests to integration tests
---
devp2p/build.gradle | 27 ++++++++++++++++++++++
.../tuweni/devp2p/DiscoveryServiceJavaTest.java | 0
.../tuweni/devp2p/v5/NodeDiscoveryServiceTest.java | 0
.../apache/tuweni/devp2p/DiscoveryServiceTest.kt | 0
.../tuweni/devp2p/v5/AbstractIntegrationTest.kt | 0
.../org/apache/tuweni/devp2p/v5/IntegrationTest.kt | 0
.../tuweni/devp2p/v5/topic/TopicIntegrationTest.kt | 0
gossip/build.gradle | 20 ++++++++++++++++
.../tuweni/gossip/GossipIntegrationTest.java | 0
.../org/apache/tuweni/gossip/GossipLoadTest.java | 0
hobbits-relayer/build.gradle | 20 ++++++++++++++++
.../org/apache/tuweni/relayer/RelayerAppTest.kt | 0
12 files changed, 67 insertions(+)
diff --git a/devp2p/build.gradle b/devp2p/build.gradle
index 77704b2..bfec25b 100644
--- a/devp2p/build.gradle
+++ b/devp2p/build.gradle
@@ -12,6 +12,16 @@
*/
description = 'Ethereum ÐΞVp2p implementation.'
+sourceSets {
+ integrationTest {
+ java.srcDir 'src/integrationTest/java'
+ kotlin.srcDir 'src/integrationTest/kotlin'
+ resources.srcDir 'src/integrationTest/resources'
+ compileClasspath += main.output
+ runtimeClasspath += main.output
+ }
+}
+
dependencies {
compile project(':bytes')
compile project(':concurrent')
@@ -32,4 +42,21 @@ dependencies {
testCompile 'org.junit.jupiter:junit-jupiter-params'
testRuntime 'org.junit.jupiter:junit-jupiter-engine'
+
+ integrationTestCompile project(':junit')
+ integrationTestCompile 'org.bouncycastle:bcprov-jdk15on'
+ integrationTestCompile 'org.junit.jupiter:junit-jupiter-api'
+ integrationTestCompile 'org.junit.jupiter:junit-jupiter-params'
+
+ integrationTestRuntime 'org.junit.jupiter:junit-jupiter-engine'
}
+
+configurations {
+ integrationTestImplementation.extendsFrom testImplementation
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+task integrationTest(type: Test) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
\ No newline at end of file
diff --git
a/devp2p/src/test/java/org/apache/tuweni/devp2p/DiscoveryServiceJavaTest.java
b/devp2p/src/integration-test/java/org/apache/tuweni/devp2p/DiscoveryServiceJavaTest.java
similarity index 100%
rename from
devp2p/src/test/java/org/apache/tuweni/devp2p/DiscoveryServiceJavaTest.java
rename to
devp2p/src/integration-test/java/org/apache/tuweni/devp2p/DiscoveryServiceJavaTest.java
diff --git
a/devp2p/src/test/java/org/apache/tuweni/devp2p/v5/NodeDiscoveryServiceTest.java
b/devp2p/src/integration-test/java/org/apache/tuweni/devp2p/v5/NodeDiscoveryServiceTest.java
similarity index 100%
rename from
devp2p/src/test/java/org/apache/tuweni/devp2p/v5/NodeDiscoveryServiceTest.java
rename to
devp2p/src/integration-test/java/org/apache/tuweni/devp2p/v5/NodeDiscoveryServiceTest.java
diff --git
a/devp2p/src/test/kotlin/org/apache/tuweni/devp2p/DiscoveryServiceTest.kt
b/devp2p/src/integration-test/kotlin/org/apache/tuweni/devp2p/DiscoveryServiceTest.kt
similarity index 100%
rename from
devp2p/src/test/kotlin/org/apache/tuweni/devp2p/DiscoveryServiceTest.kt
rename to
devp2p/src/integration-test/kotlin/org/apache/tuweni/devp2p/DiscoveryServiceTest.kt
diff --git
a/devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/AbstractIntegrationTest.kt
b/devp2p/src/integration-test/kotlin/org/apache/tuweni/devp2p/v5/AbstractIntegrationTest.kt
similarity index 100%
rename from
devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/AbstractIntegrationTest.kt
rename to
devp2p/src/integration-test/kotlin/org/apache/tuweni/devp2p/v5/AbstractIntegrationTest.kt
diff --git
a/devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/IntegrationTest.kt
b/devp2p/src/integration-test/kotlin/org/apache/tuweni/devp2p/v5/IntegrationTest.kt
similarity index 100%
rename from
devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/IntegrationTest.kt
rename to
devp2p/src/integration-test/kotlin/org/apache/tuweni/devp2p/v5/IntegrationTest.kt
diff --git
a/devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/topic/TopicIntegrationTest.kt
b/devp2p/src/integration-test/kotlin/org/apache/tuweni/devp2p/v5/topic/TopicIntegrationTest.kt
similarity index 100%
rename from
devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/topic/TopicIntegrationTest.kt
rename to
devp2p/src/integration-test/kotlin/org/apache/tuweni/devp2p/v5/topic/TopicIntegrationTest.kt
diff --git a/gossip/build.gradle b/gossip/build.gradle
index daae430..396f639 100644
--- a/gossip/build.gradle
+++ b/gossip/build.gradle
@@ -35,3 +35,23 @@ dependencies {
application { mainClassName = 'org.apache.tuweni.gossip.GossipApp' }
applicationDefaultJvmArgs = ["-Xms512m", "-Xmx1g"]
+
+sourceSets {
+ integrationTest {
+ java.srcDir 'src/integrationTest/java'
+ kotlin.srcDir 'src/integrationTest/kotlin'
+ resources.srcDir 'src/integrationTest/resources'
+ compileClasspath += main.output
+ runtimeClasspath += main.output
+ }
+}
+
+configurations {
+ integrationTestImplementation.extendsFrom testImplementation
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+task integrationTest(type: Test) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
\ No newline at end of file
diff --git
a/gossip/src/test/java/org/apache/tuweni/gossip/GossipIntegrationTest.java
b/gossip/src/integration-test/java/org/apache/tuweni/gossip/GossipIntegrationTest.java
similarity index 100%
rename from
gossip/src/test/java/org/apache/tuweni/gossip/GossipIntegrationTest.java
rename to
gossip/src/integration-test/java/org/apache/tuweni/gossip/GossipIntegrationTest.java
diff --git a/gossip/src/test/java/org/apache/tuweni/gossip/GossipLoadTest.java
b/gossip/src/integration-test/java/org/apache/tuweni/gossip/GossipLoadTest.java
similarity index 100%
rename from gossip/src/test/java/org/apache/tuweni/gossip/GossipLoadTest.java
rename to
gossip/src/integration-test/java/org/apache/tuweni/gossip/GossipLoadTest.java
diff --git a/hobbits-relayer/build.gradle b/hobbits-relayer/build.gradle
index d07a64b..e005750 100644
--- a/hobbits-relayer/build.gradle
+++ b/hobbits-relayer/build.gradle
@@ -33,3 +33,23 @@ dependencies {
application { mainClassName = 'org.apache.tuweni.relayer.RelayerApp' }
applicationDefaultJvmArgs = ["-Xms512m", "-Xmx1g"]
+
+sourceSets {
+ integrationTest {
+ java.srcDir 'src/integrationTest/java'
+ kotlin.srcDir 'src/integrationTest/kotlin'
+ resources.srcDir 'src/integrationTest/resources'
+ compileClasspath += main.output
+ runtimeClasspath += main.output
+ }
+}
+
+configurations {
+ integrationTestImplementation.extendsFrom testImplementation
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+task integrationTest(type: Test) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
\ No newline at end of file
diff --git
a/hobbits-relayer/src/test/kotlin/org/apache/tuweni/relayer/RelayerAppTest.kt
b/hobbits-relayer/src/integration-test/kotlin/org/apache/tuweni/relayer/RelayerAppTest.kt
similarity index 100%
rename from
hobbits-relayer/src/test/kotlin/org/apache/tuweni/relayer/RelayerAppTest.kt
rename to
hobbits-relayer/src/integration-test/kotlin/org/apache/tuweni/relayer/RelayerAppTest.kt
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
