You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2023/05/19 05:12:37 UTC
[jmeter] branch master updated: chore: remove unused kotlin-test-junit5 dependency from the test classpath
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new c6c363c511 chore: remove unused kotlin-test-junit5 dependency from the test classpath
c6c363c511 is described below
commit c6c363c511a53472aaa472a2356db48b5e0cd1db
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Thu May 18 19:31:06 2023 +0300
chore: remove unused kotlin-test-junit5 dependency from the test classpath
Too many testing libraries make it hard to select the right `@Test` annotation.
---
build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts | 4 ----
.../org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt | 2 +-
.../org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt | 2 +-
.../jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt | 2 +-
.../kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt | 2 +-
.../test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt | 2 +-
6 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
index 59a63eb01d..62e8d6daaf 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.kotlin.gradle.kts
@@ -28,10 +28,6 @@ plugins {
kotlin("kapt") apply false
}
-dependencies {
- testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
-}
-
val String.v: String get() = rootProject.extra["$this.version"] as String
kotlin {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt
index 7f9ea58f16..ce42a67133 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/EvenArrivalsRampTest.kt
@@ -17,12 +17,12 @@
package org.apache.jmeter.threads.openmodel
+import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.MethodSource
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
import java.util.Locale
-import kotlin.test.assertEquals
class EvenArrivalsRampTest {
class Case(val beginRate: Double, val endRate: Double, val duration: Double, val expected: String) {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt
index 29123629e7..6a9bb0cb92 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/PoissonArrivalsRampTest.kt
@@ -17,13 +17,13 @@
package org.apache.jmeter.threads.openmodel
+import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.MethodSource
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
import java.util.Locale
import java.util.Random
-import kotlin.test.assertEquals
class PoissonArrivalsRampTest {
class Case(
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt
index b889ccf3f6..952b738360 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleProcessGeneratorTest.kt
@@ -17,13 +17,13 @@
package org.apache.jmeter.threads.openmodel
+import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.MethodSource
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
import java.util.Locale
import java.util.Random
-import kotlin.test.assertEquals
class ThreadScheduleProcessGeneratorTest {
class Case(val schedule: String, val expected: String) {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt
index e2ee2ab143..fc82210946 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/ThreadScheduleTest.kt
@@ -17,9 +17,9 @@
package org.apache.jmeter.threads.openmodel
+import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.MethodSource
-import kotlin.test.assertEquals
class ThreadScheduleTest {
class Case(val input: String, val expected: String) {
diff --git a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt
index 438bcc494d..2d49c540a1 100644
--- a/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt
+++ b/src/core/src/test/kotlin/org/apache/jmeter/threads/openmodel/TokenizerTest.kt
@@ -17,9 +17,9 @@
package org.apache.jmeter.threads.openmodel
+import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.MethodSource
-import kotlin.test.assertEquals
class TokenizerTest {
class Case(val input: String, val expected: String) {