You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2018/12/12 04:34:21 UTC
[geode-benchmarks] branch develop updated: GEODE-6138: Using
gradle's support for JUnit 5
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/develop by this push:
new 89d5f31 GEODE-6138: Using gradle's support for JUnit 5
89d5f31 is described below
commit 89d5f3187b075d8b0a356413d55e77dcf2361ac6
Author: nabarun <na...@cs.wisc.edu>
AuthorDate: Tue Dec 11 20:32:44 2018 -0800
GEODE-6138: Using gradle's support for JUnit 5
* Also fixed the missing engine to run the tests.
---
geode-benchmarks/build.gradle | 9 ++++++---
.../apache/geode/benchmark/tests/PartitionedGetBenchmark.java | 2 +-
.../apache/geode/benchmark/tests/PartitionedPutBenchmark.java | 2 +-
.../org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java | 2 +-
.../org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java | 2 +-
.../geode/benchmark/tests/PartitionedGetBenchmarkTest.java | 4 +++-
.../geode/benchmark/tests/PartitionedPutBenchmarkTest.java | 4 +++-
.../apache/geode/benchmark/tests/ReplicatedGetBenchmarkTest.java | 4 +++-
.../apache/geode/benchmark/tests/ReplicatedPutBenchmarkTest.java | 4 +++-
harness/build.gradle | 7 +++++--
10 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/geode-benchmarks/build.gradle b/geode-benchmarks/build.gradle
index a4fa8bd..56b57e7 100644
--- a/geode-benchmarks/build.gradle
+++ b/geode-benchmarks/build.gradle
@@ -37,19 +37,22 @@ repositories {
}
dependencies {
- testImplementation(group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: project.'junit-jupiter-api.version')
- testRuntimeOnly(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: project.'junit-jupiter-engine.version')
+ compile(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: project.'junit-jupiter-engine.version')
compile(group: 'org.junit-pioneer', name: 'junit-pioneer', version: project.'junit-pioneer.version')
compile(group: 'org.apache.geode', name: 'geode-core', version: geodeVersion)
compile(group: 'org.slf4j', name: 'slf4j-simple', version: project.'slf4j-simple.version')
compile(project(':harness'))
}
+test{
+ useJUnitPlatform()
+}
+
task benchmark(type: Test) {
outputs.upToDateWhen { false }
testClassesDirs = project.sourceSets.main.output.classesDirs
classpath = project.sourceSets.main.runtimeClasspath
-
+ useJUnitPlatform()
testLogging {
exceptionFormat = 'full'
}
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmark.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmark.java
index 7f2a402..cd9d9b8 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmark.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmark.java
@@ -46,7 +46,7 @@ public class PartitionedGetBenchmark implements PerformanceTest {
public PartitionedGetBenchmark() {}
- PartitionedGetBenchmark(long keyRange) {
+ public void setKeyRange(long keyRange) {
this.keyRange = keyRange;
}
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
index a8cc918..56fdd0e 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
@@ -40,7 +40,7 @@ public class PartitionedPutBenchmark implements PerformanceTest {
public PartitionedPutBenchmark() {}
- PartitionedPutBenchmark(long keyRange) {
+ public void setKeyRange(long keyRange) {
this.keyRange = keyRange;
}
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java
index ef4b8ae..e75b752 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java
@@ -46,7 +46,7 @@ public class ReplicatedGetBenchmark implements PerformanceTest {
public ReplicatedGetBenchmark() {}
- ReplicatedGetBenchmark(long keyRange) {
+ public void setKeyRange(long keyRange) {
this.keyRange = keyRange;
}
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java
index 0706eec..cf6341a 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java
@@ -40,7 +40,7 @@ public class ReplicatedPutBenchmark implements PerformanceTest {
public ReplicatedPutBenchmark() {}
- ReplicatedPutBenchmark(long keyRange) {
+ public void setKeyRange(long keyRange) {
this.keyRange = keyRange;
}
diff --git a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmarkTest.java b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmarkTest.java
index 5ce2cdb..f228131 100644
--- a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmarkTest.java
+++ b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmarkTest.java
@@ -38,7 +38,9 @@ public class PartitionedGetBenchmarkTest {
@Test
public void benchmarkRunsSuccessfully()
throws Exception {
+ PartitionedGetBenchmark test = new PartitionedGetBenchmark();
+ test.setKeyRange(100);
TestRunners.minimalRunner(folder)
- .runTest(new PartitionedGetBenchmark(100));
+ .runTest(test);
}
}
diff --git a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmarkTest.java b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmarkTest.java
index a016c53..d724508 100644
--- a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmarkTest.java
+++ b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmarkTest.java
@@ -42,7 +42,9 @@ public class PartitionedPutBenchmarkTest {
@Test
public void benchmarkRunsSuccessfully()
throws Exception {
+ PartitionedPutBenchmark test = new PartitionedPutBenchmark();
+ test.setKeyRange(100);
TestRunners.minimalRunner(folder)
- .runTest(new PartitionedPutBenchmark(100));
+ .runTest(test);
}
}
diff --git a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmarkTest.java b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmarkTest.java
index f9283de..1b35746 100644
--- a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmarkTest.java
+++ b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmarkTest.java
@@ -38,7 +38,9 @@ public class ReplicatedGetBenchmarkTest {
@Test
public void benchmarkRunsSuccessfully()
throws Exception {
+ ReplicatedGetBenchmark test = new ReplicatedGetBenchmark();
+ test.setKeyRange(100);
TestRunners.minimalRunner(folder)
- .runTest(new ReplicatedGetBenchmark(100));
+ .runTest(test);
}
}
diff --git a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmarkTest.java b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmarkTest.java
index fad7351..0421d53 100644
--- a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmarkTest.java
+++ b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmarkTest.java
@@ -40,7 +40,9 @@ public class ReplicatedPutBenchmarkTest {
@Test
public void benchmarkRunsSuccessfully()
throws Exception {
+ ReplicatedPutBenchmark test = new ReplicatedPutBenchmark();
+ test.setKeyRange(100);
TestRunners.minimalRunner(folder)
- .runTest(new ReplicatedPutBenchmark(100));
+ .runTest(test);
}
}
diff --git a/harness/build.gradle b/harness/build.gradle
index c75ee52..a4c6cce 100644
--- a/harness/build.gradle
+++ b/harness/build.gradle
@@ -35,8 +35,7 @@ task(analyzeRun, dependsOn: 'classes', type: JavaExec) {
}
dependencies {
- testImplementation(group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: project.'junit-jupiter-api.version')
- testRuntimeOnly(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: project.'junit-jupiter-engine.version')
+ compile(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: project.'junit-jupiter-engine.version')
compile(group: 'org.junit-pioneer', name: 'junit-pioneer', version: project.'junit-pioneer.version')
compile(group: 'com.hierynomus', name: 'sshj', version: project.'sshj.version')
compile(group: 'commons-io', name: 'commons-io', version: project.'commons-io.version')
@@ -48,3 +47,7 @@ dependencies {
testCompile(group: 'org.apache.sshd', name: 'sshd-core', version: project.'sshd-core.version')
testCompile(group: 'org.assertj', name: 'assertj-core', version: project.'assertj-core.version')
}
+
+test{
+ useJUnitPlatform()
+}