diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c8425526e..8800a8c9ca9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,10 @@ Update dependencies: #### Test: - [#422](https://github.com/influxdata/influxdb-client-java/pull/422): `logback-classic` to `1.3.1` - [#417](https://github.com/influxdata/influxdb-client-java/pull/417): `mockito` to `4.8.0` + +Remove dependencies: +#### Test: + - [#418](https://github.com/influxdata/influxdb-client-java/pull/418): `junit-platform-runner` ## 6.5.0 [2022-08-29] diff --git a/client-core/pom.xml b/client-core/pom.xml index 4cc8cda6dd4..79b63399f0f 100644 --- a/client-core/pom.xml +++ b/client-core/pom.xml @@ -171,10 +171,6 @@ com.squareup.okhttp3 mockwebserver - - junit - junit - com.squareup.okhttp3 okhttp @@ -193,12 +189,6 @@ test - - org.junit.platform - junit-platform-runner - test - - org.assertj assertj-core diff --git a/client-core/src/test/java/com/influxdb/exceptions/InfluxExceptionTest.java b/client-core/src/test/java/com/influxdb/exceptions/InfluxExceptionTest.java index 941f07986a3..df1619a379f 100644 --- a/client-core/src/test/java/com/influxdb/exceptions/InfluxExceptionTest.java +++ b/client-core/src/test/java/com/influxdb/exceptions/InfluxExceptionTest.java @@ -34,15 +34,12 @@ import okhttp3.ResponseBody; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import retrofit2.HttpException; import retrofit2.Response; /** * @author Jakub Bednar (bednar@github) (02/08/2018 08:58) */ -@RunWith(JUnitPlatform.class) class InfluxExceptionTest { @Test diff --git a/client-core/src/test/java/com/influxdb/internal/ITUserAgentInterceptor.java b/client-core/src/test/java/com/influxdb/internal/ITUserAgentInterceptor.java index aa1afc2f49c..20c38a35c05 100644 --- a/client-core/src/test/java/com/influxdb/internal/ITUserAgentInterceptor.java +++ b/client-core/src/test/java/com/influxdb/internal/ITUserAgentInterceptor.java @@ -33,13 +33,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (02/03/2020 10:18) */ -@RunWith(JUnitPlatform.class) class ITUserAgentInterceptor extends AbstractMockServerTest { private OkHttpClient client; diff --git a/client-core/src/test/java/com/influxdb/internal/QueryAbstractApiTest.java b/client-core/src/test/java/com/influxdb/internal/QueryAbstractApiTest.java index a7401f71c19..b63bf74f1a8 100644 --- a/client-core/src/test/java/com/influxdb/internal/QueryAbstractApiTest.java +++ b/client-core/src/test/java/com/influxdb/internal/QueryAbstractApiTest.java @@ -27,12 +27,12 @@ import java.util.function.BiConsumer; import javax.annotation.Nonnull; -import com.google.gson.JsonParser; import com.influxdb.Cancellable; import com.influxdb.exceptions.InfluxException; import com.influxdb.query.internal.FluxCsvParser; import com.influxdb.test.AbstractMockServerTest; +import com.google.gson.JsonParser; import okhttp3.OkHttpClient; import okhttp3.RequestBody; import okhttp3.ResponseBody; @@ -41,8 +41,6 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import retrofit2.Call; import retrofit2.Retrofit; import retrofit2.http.Body; @@ -53,7 +51,6 @@ /** * @author Jakub Bednar (bednar@github) (17/10/2018 09:44) */ -@RunWith(JUnitPlatform.class) class QueryAbstractApiTest extends AbstractMockServerTest { private AbstractQueryApi queryClient; diff --git a/client-core/src/test/java/com/influxdb/internal/RestClientTest.java b/client-core/src/test/java/com/influxdb/internal/RestClientTest.java index 3db33d8759f..0da95f5be9d 100644 --- a/client-core/src/test/java/com/influxdb/internal/RestClientTest.java +++ b/client-core/src/test/java/com/influxdb/internal/RestClientTest.java @@ -58,8 +58,6 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import retrofit2.Call; import retrofit2.Response; import retrofit2.Retrofit; @@ -70,7 +68,6 @@ /** * @author Jakub Bednar (bednar@github) (04/10/2018 07:57) */ -@RunWith(JUnitPlatform.class) class RestClientTest extends AbstractMockServerTest { private AbstractRestClient restClient; diff --git a/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java b/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java index b98a6d9c93c..11f55fea1d9 100644 --- a/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java +++ b/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java @@ -44,15 +44,12 @@ import org.assertj.core.util.Lists; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import static java.nio.charset.StandardCharsets.UTF_8; /** * @author Jakub Bednar (bednar@github) (16/07/2018 12:26) */ -@RunWith(JUnitPlatform.class) class FluxCsvParserTest { private static final Logger LOG = Logger.getLogger(FluxCsvParserTest.class.getName()); diff --git a/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java b/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java index f2e41b05ee5..4c8ef932490 100644 --- a/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java +++ b/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java @@ -30,13 +30,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (01/02/2019 09:01) */ -@RunWith(JUnitPlatform.class) class FluxResultMapperTest { private FluxResultMapper mapper; diff --git a/client-core/src/test/java/com/influxdb/query/internal/FluxStructureSerializationTest.java b/client-core/src/test/java/com/influxdb/query/internal/FluxStructureSerializationTest.java index e7fb7339388..ace20b5547f 100644 --- a/client-core/src/test/java/com/influxdb/query/internal/FluxStructureSerializationTest.java +++ b/client-core/src/test/java/com/influxdb/query/internal/FluxStructureSerializationTest.java @@ -35,10 +35,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; -@RunWith(JUnitPlatform.class) class FluxStructureSerializationTest { @Test diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITInfluxDBClientKotlin.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITInfluxDBClientKotlin.kt index 75f0754d060..cc67fed6d8f 100644 --- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITInfluxDBClientKotlin.kt +++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITInfluxDBClientKotlin.kt @@ -26,14 +26,11 @@ import com.influxdb.client.domain.HealthCheck import com.influxdb.exceptions.InfluxException import org.assertj.core.api.Assertions import org.junit.jupiter.api.Test -import org.junit.platform.runner.JUnitPlatform -import org.junit.runner.RunWith /** * @author Jakub Bednar (bednar@github) (30/10/2018 09:19) */ -@RunWith(JUnitPlatform::class) internal class ITInfluxDBClientKotlin : AbstractITInfluxDBClientKotlin() { @Test diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt index cb2e5a18ca1..ad717df6dd2 100644 --- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt +++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt @@ -46,8 +46,6 @@ import kotlinx.coroutines.channels.toList import kotlinx.coroutines.runBlocking import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import org.junit.platform.runner.JUnitPlatform -import org.junit.runner.RunWith import java.net.ConnectException import java.time.Instant import java.util.* @@ -55,7 +53,6 @@ import java.util.* /** * @author Jakub Bednar (bednar@github) (31/10/2018 07:16) */ -@RunWith(JUnitPlatform::class) internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() { private lateinit var bucket: Bucket diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactoryTest.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactoryTest.kt index 7786b0f5222..5bc9bfac7d5 100644 --- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactoryTest.kt +++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactoryTest.kt @@ -29,14 +29,11 @@ import okhttp3.OkHttpClient import org.assertj.core.api.Assertions import org.assertj.core.api.AssertionsForClassTypes import org.junit.jupiter.api.Test -import org.junit.platform.runner.JUnitPlatform -import org.junit.runner.RunWith import retrofit2.Retrofit /** * @author Jakub Bednar (bednar@github) (30/10/2018 08:32) */ -@RunWith(JUnitPlatform::class) class InfluxDBClientKotlinFactoryTest : AbstractTest() { @Test diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinTest.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinTest.kt index 3ec4fb6a8e9..b1e99fed4fd 100644 --- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinTest.kt +++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinTest.kt @@ -26,14 +26,11 @@ import org.assertj.core.api.Assertions import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import org.junit.platform.runner.JUnitPlatform -import org.junit.runner.RunWith import java.util.concurrent.TimeUnit /** * @author Jakub Bednar (09/06/2020 07:11) */ -@RunWith(JUnitPlatform::class) class InfluxDBClientKotlinTest : AbstractMockServerTest() { private lateinit var client: InfluxDBClientKotlin diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/WriteKotlinApiTest.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/WriteKotlinApiTest.kt index 1c8c8d2c0ef..fb1ac84a4a7 100644 --- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/WriteKotlinApiTest.kt +++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/WriteKotlinApiTest.kt @@ -29,7 +29,6 @@ import com.influxdb.exceptions.UnauthorizedException import com.influxdb.test.AbstractMockServerTest import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow import kotlinx.coroutines.runBlocking import okhttp3.mockwebserver.RecordedRequest @@ -37,15 +36,12 @@ import org.assertj.core.api.Assertions import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import org.junit.platform.runner.JUnitPlatform -import org.junit.runner.RunWith import java.time.Instant import java.util.concurrent.TimeUnit /** * @author Jakub Bednar (20/04/2021 13:58) */ -@RunWith(JUnitPlatform::class) class WriteKotlinApiTest : AbstractMockServerTest() { private lateinit var client: InfluxDBClientKotlin diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientFactoryTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientFactoryTest.java index b93de267956..a660cc1b26d 100644 --- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientFactoryTest.java +++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientFactoryTest.java @@ -23,13 +23,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (31/07/2018 13:12) */ -@RunWith(JUnitPlatform.class) class FluxClientFactoryTest { @Test diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientPingTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientPingTest.java index 4cd7ff6b633..5545d391b45 100644 --- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientPingTest.java +++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientPingTest.java @@ -26,13 +26,10 @@ import okhttp3.mockwebserver.MockResponse; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (31/07/2018 09:19) */ -@RunWith(JUnitPlatform.class) class FluxClientPingTest extends AbstractFluxClientTest { @Test diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryRawTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryRawTest.java index 2966a0327d6..b0c57b6920c 100644 --- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryRawTest.java +++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryRawTest.java @@ -33,13 +33,10 @@ import okhttp3.mockwebserver.MockResponse; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (03/08/2018 12:14) */ -@RunWith(JUnitPlatform.class) class FluxClientQueryRawTest extends AbstractFluxClientTest { @Test diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryTest.java index 50efbbcf0a7..756d683279f 100644 --- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryTest.java +++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryTest.java @@ -34,13 +34,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (31/07/2018 07:05) */ -@RunWith(JUnitPlatform.class) class FluxClientQueryTest extends AbstractFluxClientTest { @Test diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientVersionTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientVersionTest.java index 64bd3e3870e..85f426ee523 100644 --- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientVersionTest.java +++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientVersionTest.java @@ -28,13 +28,10 @@ import okhttp3.mockwebserver.MockResponse; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (03/10/2018 15:08) */ -@RunWith(JUnitPlatform.class) class FluxClientVersionTest extends AbstractFluxClientTest { @Test diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxConnectionOptionsTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxConnectionOptionsTest.java index 58a8309c1a1..827fe194f20 100644 --- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxConnectionOptionsTest.java +++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxConnectionOptionsTest.java @@ -27,13 +27,10 @@ import okhttp3.Protocol; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (26/06/2018 09:09) */ -@RunWith(JUnitPlatform.class) class FluxConnectionOptionsTest { @Test diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/ITFluxClient.java b/client-legacy/src/test/java/com/influxdb/client/flux/ITFluxClient.java index be3b47bf401..899b3f5b415 100644 --- a/client-legacy/src/test/java/com/influxdb/client/flux/ITFluxClient.java +++ b/client-legacy/src/test/java/com/influxdb/client/flux/ITFluxClient.java @@ -38,13 +38,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (31/07/2018 09:30) */ -@RunWith(JUnitPlatform.class) class ITFluxClient extends AbstractITFluxClient { private static final Logger LOG = Logger.getLogger(ITFluxClient.class.getName()); diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/TestConnectionString.java b/client-legacy/src/test/java/com/influxdb/client/flux/TestConnectionString.java index 844c5826668..1a182bf0c29 100644 --- a/client-legacy/src/test/java/com/influxdb/client/flux/TestConnectionString.java +++ b/client-legacy/src/test/java/com/influxdb/client/flux/TestConnectionString.java @@ -26,10 +26,7 @@ import okhttp3.OkHttpClient; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; -@RunWith(JUnitPlatform.class) class TestConnectionString extends AbstractITFluxClient { @Test void connectionStringTest() { diff --git a/client-osgi/src/test/java/com/influxdb/client/osgi/ITConnectionTest.java b/client-osgi/src/test/java/com/influxdb/client/osgi/ITConnectionTest.java index 7f4e2593fb0..dd4be830808 100644 --- a/client-osgi/src/test/java/com/influxdb/client/osgi/ITConnectionTest.java +++ b/client-osgi/src/test/java/com/influxdb/client/osgi/ITConnectionTest.java @@ -21,15 +21,11 @@ */ package com.influxdb.client.osgi; -import com.influxdb.client.domain.HealthCheck; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -@RunWith(JUnitPlatform.class) public class ITConnectionTest extends InfluxDBConnectorTest { @Test diff --git a/client-osgi/src/test/java/com/influxdb/client/osgi/InfluxDBConnectorTest.java b/client-osgi/src/test/java/com/influxdb/client/osgi/InfluxDBConnectorTest.java index b243aacf032..e2b9e5edf6a 100644 --- a/client-osgi/src/test/java/com/influxdb/client/osgi/InfluxDBConnectorTest.java +++ b/client-osgi/src/test/java/com/influxdb/client/osgi/InfluxDBConnectorTest.java @@ -21,13 +21,15 @@ */ package com.influxdb.client.osgi; +import java.util.Dictionary; +import java.util.Hashtable; + import com.influxdb.client.InfluxDBClient; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -35,9 +37,6 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; -import java.util.Dictionary; -import java.util.Hashtable; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -45,7 +44,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(JUnitPlatform.class) @ExtendWith(MockitoExtension.class) public class InfluxDBConnectorTest { diff --git a/client-osgi/src/test/java/com/influxdb/client/osgi/LineProtocolWriterTest.java b/client-osgi/src/test/java/com/influxdb/client/osgi/LineProtocolWriterTest.java index 5ed48dccce4..6481002b675 100644 --- a/client-osgi/src/test/java/com/influxdb/client/osgi/LineProtocolWriterTest.java +++ b/client-osgi/src/test/java/com/influxdb/client/osgi/LineProtocolWriterTest.java @@ -21,20 +21,20 @@ */ package com.influxdb.client.osgi; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; import java.util.stream.Collectors; import java.util.stream.IntStream; import com.influxdb.client.InfluxDBClient; -import com.influxdb.client.WriteApi; import com.influxdb.client.WriteApiBlocking; import com.influxdb.client.domain.WritePrecision; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -54,7 +54,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(JUnitPlatform.class) @ExtendWith(MockitoExtension.class) public class LineProtocolWriterTest { diff --git a/client-osgi/src/test/java/com/influxdb/client/osgi/PointWriterTest.java b/client-osgi/src/test/java/com/influxdb/client/osgi/PointWriterTest.java index bb6a5e9d0a5..bd20529e10f 100644 --- a/client-osgi/src/test/java/com/influxdb/client/osgi/PointWriterTest.java +++ b/client-osgi/src/test/java/com/influxdb/client/osgi/PointWriterTest.java @@ -21,17 +21,29 @@ */ package com.influxdb.client.osgi; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.function.Supplier; +import java.util.stream.IntStream; + import com.influxdb.client.InfluxDBClient; -import com.influxdb.client.WriteApi; import com.influxdb.client.WriteApiBlocking; import com.influxdb.client.domain.WritePrecision; import com.influxdb.client.write.Point; + import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -39,20 +51,18 @@ import org.osgi.service.event.Event; import org.osgi.service.event.EventConstants; -import java.time.*; -import java.util.*; -import java.util.function.Supplier; -import java.util.stream.IntStream; - import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.core.AllOf.allOf; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -@RunWith(JUnitPlatform.class) @ExtendWith(MockitoExtension.class) public class PointWriterTest { diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java index c6ad71c3650..bbb118922bc 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java @@ -27,14 +27,11 @@ import io.reactivex.rxjava3.core.Single; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import org.reactivestreams.Publisher; /** * @author Jakub Bednar (bednar@github) (20/11/2018 08:06) */ -@RunWith(JUnitPlatform.class) class ITInfluxDBReactiveClient extends AbstractITInfluxDBClientTest { @Test diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java index 1402a7f153c..86b0bed50de 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java @@ -41,23 +41,18 @@ import com.influxdb.exceptions.BadRequestException; import com.influxdb.query.FluxRecord; - import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.schedulers.Schedulers; - import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import org.reactivestreams.Publisher; /** * @author Jakub Bednar (bednar@github) (22/11/2018 06:59) */ -@RunWith(JUnitPlatform.class) class ITWriteQueryReactiveApi extends AbstractITInfluxDBClientTest { private WriteReactiveApi writeClient; diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/InfluxDBClientReactiveFactoryTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/InfluxDBClientReactiveFactoryTest.java index 13072eac936..fa0288697d0 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/InfluxDBClientReactiveFactoryTest.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/InfluxDBClientReactiveFactoryTest.java @@ -29,14 +29,11 @@ import okhttp3.OkHttpClient; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import retrofit2.Retrofit; /** * @author Jakub Bednar (bednar@github) (20/11/2018 07:21) */ -@RunWith(JUnitPlatform.class) class InfluxDBClientReactiveFactoryTest extends AbstractTest { @Test diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java index f92d2ca8c22..c2a908edc49 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java @@ -36,13 +36,10 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (03/16/2022 08:28) */ -@RunWith(JUnitPlatform.class) class QueryReactiveApiTest extends AbstractMockServerTest { private InfluxDBClientReactive influxDBClient; diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java index 6975e734dcb..72b3cbd40e7 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java @@ -24,13 +24,10 @@ import io.reactivex.rxjava3.schedulers.Schedulers; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (05/08/2021 9:23) */ -@RunWith(JUnitPlatform.class) class WriteOptionsReactiveTest { @Test void configure() { diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java index bc5bab1d7df..c0dec32cd21 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java @@ -45,14 +45,11 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import org.reactivestreams.Publisher; /** * @author Jakub Bednar (02/08/2021 12:28) */ -@RunWith(JUnitPlatform.class) class WriteReactiveApiTest extends AbstractMockServerTest { private TestScheduler testScheduler; diff --git a/client-test/pom.xml b/client-test/pom.xml index 0a69d6e4712..2918c6586da 100644 --- a/client-test/pom.xml +++ b/client-test/pom.xml @@ -106,10 +106,6 @@ com.squareup.okhttp3 mockwebserver - - junit - junit - com.squareup.okhttp3 okhttp @@ -137,11 +133,6 @@ junit-jupiter-engine - - org.junit.platform - junit-platform-runner - - org.assertj assertj-core diff --git a/client-utils/pom.xml b/client-utils/pom.xml index 2b674723948..d1df0ac0508 100644 --- a/client-utils/pom.xml +++ b/client-utils/pom.xml @@ -96,12 +96,6 @@ test - - org.junit.platform - junit-platform-runner - test - - org.assertj assertj-core diff --git a/client-utils/src/test/java/com/influxdb/utils/ArgumentsDurationTest.java b/client-utils/src/test/java/com/influxdb/utils/ArgumentsDurationTest.java index 2095a55db7e..9f9adc6f1b1 100644 --- a/client-utils/src/test/java/com/influxdb/utils/ArgumentsDurationTest.java +++ b/client-utils/src/test/java/com/influxdb/utils/ArgumentsDurationTest.java @@ -23,14 +23,11 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (20/08/2018 12:31) */ @SuppressWarnings("ConstantConditions") -@RunWith(JUnitPlatform.class) class ArgumentsDurationTest { @Test diff --git a/client-utils/src/test/java/com/influxdb/utils/ArgumentsTest.java b/client-utils/src/test/java/com/influxdb/utils/ArgumentsTest.java index ee789b86c61..4e001470ca9 100644 --- a/client-utils/src/test/java/com/influxdb/utils/ArgumentsTest.java +++ b/client-utils/src/test/java/com/influxdb/utils/ArgumentsTest.java @@ -25,14 +25,11 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (01/08/2018 15:29) */ @SuppressWarnings("ConstantConditions") -@RunWith(JUnitPlatform.class) class ArgumentsTest { @Test diff --git a/client/src/test/java/com/influxdb/client/FindOptionsTest.java b/client/src/test/java/com/influxdb/client/FindOptionsTest.java index 919652f4cda..694a2c23edc 100644 --- a/client/src/test/java/com/influxdb/client/FindOptionsTest.java +++ b/client/src/test/java/com/influxdb/client/FindOptionsTest.java @@ -23,13 +23,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (18/03/2019 11:53) */ -@RunWith(JUnitPlatform.class) class FindOptionsTest { @Test diff --git a/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java b/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java index 04fd513ea9f..34de5771a45 100644 --- a/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java +++ b/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (26/08/2021 6:24) */ -@RunWith(JUnitPlatform.class) class GeneratedCodeTest { @Test void adapterCanBeInstantiateWithoutParameters() { diff --git a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java index 681332e0070..fbfaed8bd4a 100644 --- a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java +++ b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java @@ -39,13 +39,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (17/09/2018 12:02) */ -@RunWith(JUnitPlatform.class) class ITAuthorizationsApi extends AbstractITClientTest { private static final Logger LOG = Logger.getLogger(ITAuthorizationsApi.class.getName()); diff --git a/client/src/test/java/com/influxdb/client/ITBackpressure.java b/client/src/test/java/com/influxdb/client/ITBackpressure.java index 04a1c7b13bc..e3159c83047 100644 --- a/client/src/test/java/com/influxdb/client/ITBackpressure.java +++ b/client/src/test/java/com/influxdb/client/ITBackpressure.java @@ -53,13 +53,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (24/01/2020 09:40) */ -@RunWith(JUnitPlatform.class) @EnabledIfSystemProperty(named = "clientBackpressure", matches = "true") class ITBackpressure extends AbstractITWrite { diff --git a/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java b/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java index 8b15a40805e..e4f169c7b58 100644 --- a/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java +++ b/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java @@ -28,18 +28,16 @@ import com.influxdb.client.benchmark.BenchmarkOptions; import com.influxdb.client.benchmark.ClientBenchmark; import com.influxdb.client.domain.Bucket; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * Client benchmark test */ -@RunWith(JUnitPlatform.class) class ITBenchmarkTest extends AbstractITClientTest { private BucketsApi bucketsApi; diff --git a/client/src/test/java/com/influxdb/client/ITBucketsApi.java b/client/src/test/java/com/influxdb/client/ITBucketsApi.java index 7d90fa1421d..01421ba52ed 100644 --- a/client/src/test/java/com/influxdb/client/ITBucketsApi.java +++ b/client/src/test/java/com/influxdb/client/ITBucketsApi.java @@ -42,13 +42,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (13/09/2018 10:49) */ -@RunWith(JUnitPlatform.class) class ITBucketsApi extends AbstractITClientTest { private Organization organization; diff --git a/client/src/test/java/com/influxdb/client/ITChecksApi.java b/client/src/test/java/com/influxdb/client/ITChecksApi.java index c1354de77aa..9251ecd814f 100644 --- a/client/src/test/java/com/influxdb/client/ITChecksApi.java +++ b/client/src/test/java/com/influxdb/client/ITChecksApi.java @@ -48,13 +48,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (18/09/2019 08:30) */ -@RunWith(JUnitPlatform.class) class ITChecksApi extends AbstractITClientTest { private ChecksApi checksApi; diff --git a/client/src/test/java/com/influxdb/client/ITDashboardsApi.java b/client/src/test/java/com/influxdb/client/ITDashboardsApi.java index de7abd8f558..8545f487275 100644 --- a/client/src/test/java/com/influxdb/client/ITDashboardsApi.java +++ b/client/src/test/java/com/influxdb/client/ITDashboardsApi.java @@ -45,13 +45,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (01/04/2019 10:58) */ -@RunWith(JUnitPlatform.class) class ITDashboardsApi extends AbstractITClientTest { private DashboardsApi dashboardsApi; diff --git a/client/src/test/java/com/influxdb/client/ITDeleteApi.java b/client/src/test/java/com/influxdb/client/ITDeleteApi.java index 56c47580ac0..8d940a955b1 100644 --- a/client/src/test/java/com/influxdb/client/ITDeleteApi.java +++ b/client/src/test/java/com/influxdb/client/ITDeleteApi.java @@ -39,13 +39,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Pavlina Rolincova (rolincova@github) (30/10/2019). */ -@RunWith(JUnitPlatform.class) class ITDeleteApi extends AbstractITClientTest { private DeleteApi deleteApi; diff --git a/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java b/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java index 18133689022..96e35b94d55 100644 --- a/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java +++ b/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java @@ -26,7 +26,6 @@ import java.time.ZoneOffset; import java.util.List; -import com.influxdb.LogLevel; import com.influxdb.client.domain.HealthCheck; import com.influxdb.client.domain.OnboardingRequest; import com.influxdb.client.domain.OnboardingResponse; @@ -41,13 +40,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (20/11/2018 07:37) */ -@RunWith(JUnitPlatform.class) class ITInfluxDBClient extends AbstractITClientTest { @Test diff --git a/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java b/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java index 38f341a8e10..39d77274b08 100644 --- a/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java +++ b/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java @@ -37,14 +37,11 @@ import org.assertj.core.api.ListAssert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import static org.assertj.core.api.InstanceOfAssertFactories.BIG_DECIMAL; import static org.assertj.core.api.InstanceOfAssertFactories.INSTANT; import static org.assertj.core.api.InstanceOfAssertFactories.list; -@RunWith(JUnitPlatform.class) class ITInfluxQLQueryApi extends AbstractITClientTest { private static final String DATABASE_NAME = "my-database"; diff --git a/client/src/test/java/com/influxdb/client/ITLabelsApi.java b/client/src/test/java/com/influxdb/client/ITLabelsApi.java index 16cb6ca7ea0..4e2f6516e2a 100644 --- a/client/src/test/java/com/influxdb/client/ITLabelsApi.java +++ b/client/src/test/java/com/influxdb/client/ITLabelsApi.java @@ -33,13 +33,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (28/01/2019 10:52) */ -@RunWith(JUnitPlatform.class) class ITLabelsApi extends AbstractITClientTest { private LabelsApi labelsApi; diff --git a/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java b/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java index b73b7988659..60c4aa6f61d 100644 --- a/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java +++ b/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java @@ -45,13 +45,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (25/09/2019 09:41) */ -@RunWith(JUnitPlatform.class) class ITMonitoringAlerting extends AbstractITClientTest { private MockServerExtension mockServerExtension; diff --git a/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java b/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java index 79fe2475082..4bb7ff06dff 100644 --- a/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java +++ b/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java @@ -44,13 +44,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (10/09/2019 08:50) */ -@RunWith(JUnitPlatform.class) class ITNotificationEndpointsApi extends AbstractITClientTest { private NotificationEndpointsApi notificationEndpointsApi; diff --git a/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java b/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java index ed50b969b9e..a6780b3afeb 100644 --- a/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java +++ b/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java @@ -54,13 +54,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (24/09/2019 09:34) */ -@RunWith(JUnitPlatform.class) class ITNotificationRulesApi extends AbstractITClientTest { private NotificationRulesApi notificationRulesApi; diff --git a/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java b/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java index 6d4b97b17bb..5a8a4637c98 100644 --- a/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java +++ b/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java @@ -41,13 +41,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (12/09/2018 09:51) */ -@RunWith(JUnitPlatform.class) class ITOrganizationsApi extends AbstractITClientTest { private static final Logger LOG = Logger.getLogger(ITOrganizationsApi.class.getName()); diff --git a/client/src/test/java/com/influxdb/client/ITQueryService.java b/client/src/test/java/com/influxdb/client/ITQueryService.java index 2a8027b39d0..1c7d50c28e7 100644 --- a/client/src/test/java/com/influxdb/client/ITQueryService.java +++ b/client/src/test/java/com/influxdb/client/ITQueryService.java @@ -43,13 +43,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (08/04/2019 09:41) */ -@RunWith(JUnitPlatform.class) class ITQueryService extends AbstractITClientTest { private QueryService queryService; diff --git a/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java b/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java index 35f6a4de10a..605d1d33d9f 100644 --- a/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java +++ b/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java @@ -38,13 +38,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (22/01/2019 08:23) */ -@RunWith(JUnitPlatform.class) class ITScraperTargetsApi extends AbstractITClientTest { private ScraperTargetsApi scraperTargetsApi; diff --git a/client/src/test/java/com/influxdb/client/ITSourcesApi.java b/client/src/test/java/com/influxdb/client/ITSourcesApi.java index 14acd8f404f..f6f00f89b6a 100644 --- a/client/src/test/java/com/influxdb/client/ITSourcesApi.java +++ b/client/src/test/java/com/influxdb/client/ITSourcesApi.java @@ -36,13 +36,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (18/09/2018 09:42) */ -@RunWith(JUnitPlatform.class) class ITSourcesApi extends AbstractITClientTest { private static final Logger LOG = Logger.getLogger(ITSourcesApi.class.getName()); diff --git a/client/src/test/java/com/influxdb/client/ITTasksApi.java b/client/src/test/java/com/influxdb/client/ITTasksApi.java index 487a592f167..15d703610a4 100644 --- a/client/src/test/java/com/influxdb/client/ITTasksApi.java +++ b/client/src/test/java/com/influxdb/client/ITTasksApi.java @@ -52,13 +52,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (05/09/2018 15:54) */ -@RunWith(JUnitPlatform.class) class ITTasksApi extends AbstractITClientTest { private static final Logger LOG = Logger.getLogger(ITTasksApi.class.getName()); diff --git a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java b/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java index 87d868f48e0..d70a11e35b6 100644 --- a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java +++ b/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java @@ -43,13 +43,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (28/02/2019 10:31) */ -@RunWith(JUnitPlatform.class) class ITTelegrafsApi extends AbstractITClientTest { private TelegrafsApi telegrafsApi; diff --git a/client/src/test/java/com/influxdb/client/ITUsersApi.java b/client/src/test/java/com/influxdb/client/ITUsersApi.java index 50ecf32fb83..1456cd2ae69 100644 --- a/client/src/test/java/com/influxdb/client/ITUsersApi.java +++ b/client/src/test/java/com/influxdb/client/ITUsersApi.java @@ -34,13 +34,10 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (11/09/2018 11:26) */ -@RunWith(JUnitPlatform.class) class ITUsersApi extends AbstractITClientTest { private static final Logger LOG = Logger.getLogger(ITUsersApi.class.getName()); diff --git a/client/src/test/java/com/influxdb/client/ITVariablesApi.java b/client/src/test/java/com/influxdb/client/ITVariablesApi.java index 541debb582d..0fce637383d 100644 --- a/client/src/test/java/com/influxdb/client/ITVariablesApi.java +++ b/client/src/test/java/com/influxdb/client/ITVariablesApi.java @@ -40,13 +40,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (27/03/2019 09:46) */ -@RunWith(JUnitPlatform.class) class ITVariablesApi extends AbstractITClientTest { private VariablesApi variablesApi; diff --git a/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java b/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java index 149141b30dc..d9910f221eb 100644 --- a/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java +++ b/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java @@ -34,13 +34,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (16/07/2019 07:13) */ -@RunWith(JUnitPlatform.class) class ITWriteApiBlocking extends AbstractITWrite { @Test diff --git a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java index c05d04680e6..51835c7cccf 100644 --- a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java +++ b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java @@ -49,13 +49,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/09/2018 13:39) */ -@RunWith(JUnitPlatform.class) class ITWriteQueryApi extends AbstractITClientTest { private static final Logger LOG = Logger.getLogger(ITWriteQueryApi.class.getName()); diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java index f801a8bca88..93837557ffb 100644 --- a/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java +++ b/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java @@ -32,14 +32,11 @@ import okhttp3.OkHttpClient; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import retrofit2.Retrofit; /** * @author Jakub Bednar (bednar@github) (05/09/2018 10:59) */ -@RunWith(JUnitPlatform.class) class InfluxDBClientFactoryTest extends AbstractTest { @Test diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java index 1b7f05befaa..5c18f75c3ee 100644 --- a/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java +++ b/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java @@ -30,13 +30,10 @@ import okhttp3.Protocol; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (05/09/2018 10:38) */ -@RunWith(JUnitPlatform.class) class InfluxDBClientOptionsTest { @Test diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java index dd1c7fea6be..ee163c12c9a 100644 --- a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java +++ b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java @@ -49,13 +49,10 @@ import okhttp3.mockwebserver.RecordedRequest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (05/09/2018 14:00) */ -@RunWith(JUnitPlatform.class) class InfluxDBClientTest extends AbstractInfluxDBClientTest { @Test diff --git a/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java b/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java index 656b48d9b6f..306aaefbd6a 100644 --- a/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java +++ b/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java @@ -34,10 +34,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; -@RunWith(JUnitPlatform.class) class InvokableScriptsApiTest extends AbstractInfluxDBClientTest { static final String SUCCESS_DATA = ",result,table,_start,_stop,_time,_value,_field,_measurement,host,value\n" diff --git a/client/src/test/java/com/influxdb/client/QueryApiTest.java b/client/src/test/java/com/influxdb/client/QueryApiTest.java index 446dfb58910..a6e6e04e6b9 100644 --- a/client/src/test/java/com/influxdb/client/QueryApiTest.java +++ b/client/src/test/java/com/influxdb/client/QueryApiTest.java @@ -26,22 +26,20 @@ import java.util.HashMap; import java.util.Map; -import com.google.gson.Gson; import com.influxdb.client.domain.Dialect; import com.influxdb.client.domain.Query; -import static com.influxdb.client.internal.AbstractInfluxDBClient.DEFAULT_DIALECT; import com.influxdb.client.internal.AbstractInfluxDBClientTest; +import com.google.gson.Gson; import okhttp3.mockwebserver.RecordedRequest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; + +import static com.influxdb.client.internal.AbstractInfluxDBClient.DEFAULT_DIALECT; /** * @author Jakub Bednar (bednar@github) (07/05/2019 09:17) */ -@RunWith(JUnitPlatform.class) class QueryApiTest extends AbstractInfluxDBClientTest { @Test diff --git a/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java b/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java index af60b115c3b..dc8ed2b20fc 100644 --- a/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java +++ b/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java @@ -33,13 +33,10 @@ import okhttp3.mockwebserver.RecordedRequest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (12/11/2020 10:25) */ -@RunWith(JUnitPlatform.class) class WriteApiBlockingTest extends AbstractInfluxDBClientTest { @Test diff --git a/client/src/test/java/com/influxdb/client/WriteApiTest.java b/client/src/test/java/com/influxdb/client/WriteApiTest.java index 9c3456e2c1a..59cf9ad3819 100644 --- a/client/src/test/java/com/influxdb/client/WriteApiTest.java +++ b/client/src/test/java/com/influxdb/client/WriteApiTest.java @@ -54,13 +54,10 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (21/09/2018 11:36) */ -@RunWith(JUnitPlatform.class) class WriteApiTest extends AbstractInfluxDBClientTest { private WriteApi writeApi; diff --git a/client/src/test/java/com/influxdb/client/WriteOptionsTest.java b/client/src/test/java/com/influxdb/client/WriteOptionsTest.java index 90a60e2b5db..5afe2c8735e 100644 --- a/client/src/test/java/com/influxdb/client/WriteOptionsTest.java +++ b/client/src/test/java/com/influxdb/client/WriteOptionsTest.java @@ -25,13 +25,10 @@ import io.reactivex.rxjava3.schedulers.Schedulers; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (21/09/2018 10:35) */ -@RunWith(JUnitPlatform.class) class WriteOptionsTest { @Test diff --git a/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java b/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java index d4a128c42b1..eef94b7aa48 100644 --- a/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java +++ b/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java @@ -37,13 +37,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (12/10/2018 12:50) */ -@RunWith(JUnitPlatform.class) class AuthenticateInterceptorTest extends AbstractMockServerTest { private String influxDB_URL; diff --git a/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java b/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java index 4ac8660486a..7630b83abcd 100644 --- a/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java +++ b/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java @@ -36,13 +36,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (15/10/2018 11:27) */ -@RunWith(JUnitPlatform.class) class GzipInterceptorTest extends AbstractMockServerTest { private String url; diff --git a/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java b/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java index da7c30433d4..c26b77031b3 100644 --- a/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java +++ b/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java @@ -31,13 +31,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (15/10/2018 13:36) */ -@RunWith(JUnitPlatform.class) class MeasurementMapperTest { private MeasurementMapper mapper; diff --git a/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java b/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java index 6b6fda5ecb7..f0957388996 100644 --- a/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java +++ b/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java @@ -39,15 +39,12 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import retrofit2.HttpException; import retrofit2.Response; /** * @author Jakub Bednar (29/09/2020 11:21) */ -@RunWith(JUnitPlatform.class) class RetryAttemptTest { private final WriteOptions DEFAULT = WriteOptions.builder().build(); diff --git a/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java b/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java index f8f3871e980..b135d46ce56 100644 --- a/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java +++ b/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java @@ -31,13 +31,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (28/01/2020 14:47) */ -@RunWith(JUnitPlatform.class) class WaitToConditionTest { @Test diff --git a/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java b/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java index 2baa20984d6..5cf5613c315 100644 --- a/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java +++ b/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java @@ -13,15 +13,12 @@ import io.reactivex.rxjava3.subscribers.TestSubscriber; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import static io.reactivex.rxjava3.core.BackpressureOverflowStrategy.DROP_OLDEST; /** * @author Jakub Bednar (bednar@github) (29/06/2022 07:54) */ -@RunWith(JUnitPlatform.class) class BackpressureBatchesBufferStrategyTest { @Test diff --git a/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java b/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java index 46eb49f34b3..4d9b248df8a 100644 --- a/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java +++ b/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java @@ -13,13 +13,10 @@ import io.reactivex.rxjava3.schedulers.TestScheduler; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (29/06/2022 07:40) */ -@RunWith(JUnitPlatform.class) class FlowableBufferTimedFlushableTest { @Test diff --git a/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java b/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java index 3054a851fd7..f8a0aae8216 100644 --- a/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java +++ b/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java @@ -26,13 +26,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (28/06/2019 09:35) */ -@RunWith(JUnitPlatform.class) class PointSettingsTest { private PointSettings defaults; diff --git a/client/src/test/java/com/influxdb/client/write/PointTest.java b/client/src/test/java/com/influxdb/client/write/PointTest.java index 2f5c9f68b82..e93827055e5 100644 --- a/client/src/test/java/com/influxdb/client/write/PointTest.java +++ b/client/src/test/java/com/influxdb/client/write/PointTest.java @@ -30,13 +30,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (11/10/2018 12:57) */ -@RunWith(JUnitPlatform.class) class PointTest { @Test diff --git a/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java b/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java index 749e3c2a972..48432edcca1 100644 --- a/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java +++ b/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java @@ -28,10 +28,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; -@RunWith(JUnitPlatform.class) class WriteParametersTest { private InfluxDBClientOptions.Builder optionsBuilder; diff --git a/flux-dsl/src/test/java/com/example/flux/CustomFunction.java b/flux-dsl/src/test/java/com/example/flux/CustomFunction.java index 32b19d47736..e80c2d065b0 100644 --- a/flux-dsl/src/test/java/com/example/flux/CustomFunction.java +++ b/flux-dsl/src/test/java/com/example/flux/CustomFunction.java @@ -29,13 +29,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (02/07/2018 13:55) */ -@RunWith(JUnitPlatform.class) class CustomFunction { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java index 3ff93c25f7a..e2a2a14de1f 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java @@ -27,12 +27,10 @@ import com.influxdb.query.dsl.functions.AbstractFunctionCallFlux; import com.influxdb.query.dsl.functions.AbstractFunctionFlux; import com.influxdb.query.dsl.functions.FreestyleExpression; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; -@RunWith(JUnitPlatform.class) public class AbstractFunctionFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java index 52e36be28a0..d2668ee3fb0 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (22/06/2018 10:27) */ -@RunWith(JUnitPlatform.class) class FluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java index 3f1255d297f..2fd06b8cf91 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java @@ -24,15 +24,13 @@ import java.time.temporal.ChronoUnit; import com.influxdb.query.dsl.Flux; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (13/05/2020 15:07) */ -@RunWith(JUnitPlatform.class) class AggregateWindowTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java index b1597eff672..86667429e8e 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java @@ -25,12 +25,10 @@ import java.util.Map; import com.influxdb.query.dsl.Flux; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; -@RunWith(JUnitPlatform.class) class ArrayFromFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java index f4839f854de..7c40776ba3b 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (19/04/2022 09:49) */ -@RunWith(JUnitPlatform.class) class ColumnsFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java index e0d9e9a66f0..fe5ddfda3da 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (22/06/2018 12:04) */ -@RunWith(JUnitPlatform.class) class CountFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java index d2b6c4340a5..c1cd5097a20 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java @@ -28,13 +28,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (17/07/2018 13:51) */ -@RunWith(JUnitPlatform.class) class CovarianceFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java index 7959c270704..e280f6af781 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java @@ -28,13 +28,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (10/10/2018 07:45) */ -@RunWith(JUnitPlatform.class) class CumulativeSumFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java index 7d7714f6a35..56b169c80a7 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java @@ -29,13 +29,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (03/07/2018 15:05) */ -@RunWith(JUnitPlatform.class) class DerivativeFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java index 6f3a05a8d28..6f0f1a4460d 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java @@ -29,13 +29,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (17/07/2018 12:57) */ -@RunWith(JUnitPlatform.class) class DifferenceFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java index 38906c79f4e..1eb4863eabe 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (17/07/2018 12:15) */ -@RunWith(JUnitPlatform.class) class DistinctFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java index c93f5c257c3..ddbd7564020 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java @@ -28,13 +28,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (02/08/2018 11:09) */ -@RunWith(JUnitPlatform.class) class DropFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java index 7fa9ddac276..9c9ded62ebe 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (09/10/2018 13:27) */ -@RunWith(JUnitPlatform.class) class DuplicateFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java index 3f860fb6c0c..91e399f5d22 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (27/06/2018 11:30) */ -@RunWith(JUnitPlatform.class) class ExpressionFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java index 60d9564fa76..34252c0a34e 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java @@ -24,15 +24,13 @@ import java.time.Instant; import com.influxdb.query.dsl.Flux; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (09/10/2018 13:27) */ -@RunWith(JUnitPlatform.class) class FillFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java index 20e34d54821..ec37da8ce14 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java @@ -30,13 +30,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (28/06/2018 11:46) */ -@RunWith(JUnitPlatform.class) class FilterFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java index 33914413f8b..92c4b88d70c 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java @@ -21,19 +21,14 @@ */ package com.influxdb.query.dsl.functions; -import java.util.HashMap; - import com.influxdb.query.dsl.Flux; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 09:40) */ -@RunWith(JUnitPlatform.class) class FirstFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java index 5714f888383..b2ef3fcb9d4 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java @@ -29,13 +29,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (22/06/2018 12:04) */ -@RunWith(JUnitPlatform.class) class FromFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java index 20de5543e0a..2c1e59e27d3 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java @@ -29,13 +29,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 15:16) */ -@RunWith(JUnitPlatform.class) class GroupFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java index e329d1d4175..beb8c3b6cc0 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (03/07/2018 12:48) */ -@RunWith(JUnitPlatform.class) class IntegralFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java index 4d06d88eab6..99f75067ca3 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java @@ -24,12 +24,10 @@ import java.time.temporal.ChronoUnit; import com.influxdb.query.dsl.Flux; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; -@RunWith(JUnitPlatform.class) class InterpolateLinearTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java index 37fc144dafa..79f54c84f88 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java @@ -31,13 +31,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (19/07/2018 12:59) */ -@RunWith(JUnitPlatform.class) class JoinFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java index 39c456e49e5..23306daa548 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java @@ -28,13 +28,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (02/08/2018 11:43) */ -@RunWith(JUnitPlatform.class) class KeepFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java index bf0862be2ce..f0acb686c82 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 09:47) */ -@RunWith(JUnitPlatform.class) class LastFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java index e4aaf094709..89a5b3af4ac 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 11:55) */ -@RunWith(JUnitPlatform.class) class LimitFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java index 819121bdfa1..37872b8b67a 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java @@ -30,13 +30,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (17/07/2018 07:58) */ -@RunWith(JUnitPlatform.class) class MapFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java index 5be1e192d54..9c6539382d2 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 09:52) */ -@RunWith(JUnitPlatform.class) class MaxFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java index 64d7bc65612..224d1df3842 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 09:58) */ -@RunWith(JUnitPlatform.class) class MeanFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java index 4bd74e29eb1..e23405d7332 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 10:03) */ -@RunWith(JUnitPlatform.class) class MinFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java index 12961805140..ae7749d25c3 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java @@ -28,13 +28,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (10/10/2018 06:59) */ -@RunWith(JUnitPlatform.class) class PivotFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java index 3866e7bb5a5..6677d1c5693 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java @@ -21,19 +21,14 @@ */ package com.influxdb.query.dsl.functions; -import java.util.Arrays; - import com.influxdb.query.dsl.Flux; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (10/10/2018 12:38) */ -@RunWith(JUnitPlatform.class) class QuantileFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java index d55ec958b40..f3a19431305 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java @@ -29,13 +29,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (26/06/2018 07:23) */ -@RunWith(JUnitPlatform.class) class RangeFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java index 373291072ae..5dc3458c7e5 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java @@ -28,13 +28,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (24/02/2020 13:26) */ -@RunWith(JUnitPlatform.class) class ReduceFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java index 45744c9f236..06eacf29980 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java @@ -28,13 +28,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (02/08/2018 12:01) */ -@RunWith(JUnitPlatform.class) class RenameFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java index 3f759616c11..a69e35e0226 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java @@ -28,13 +28,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (29/06/2018 07:37) */ -@RunWith(JUnitPlatform.class) class SampleFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java index 04175b7fc0d..6d866ec312a 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (29/06/2018 09:32) */ -@RunWith(JUnitPlatform.class) class SetFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java index fc251ee789b..cd534a47363 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 10:08) */ -@RunWith(JUnitPlatform.class) class SkewFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java index 82a8b004732..e1ad00ad03b 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java @@ -29,13 +29,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 13:54) */ -@RunWith(JUnitPlatform.class) class SortFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java index 62febe4140e..450aa738102 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 10:13) */ -@RunWith(JUnitPlatform.class) class SpreadFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java index c30c3d7e9b2..13d9e8704e5 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 10:18) */ -@RunWith(JUnitPlatform.class) class StddevFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java index 347acc1ac15..a76203b8ba4 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 10:22) */ -@RunWith(JUnitPlatform.class) class SumFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java index a2627c2fdc0..abcf2f0d344 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java @@ -27,13 +27,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (14/12/2020 10:24) */ -@RunWith(JUnitPlatform.class) class TailFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java index db26fc574da..19d89c61a45 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java @@ -29,13 +29,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (29/06/2018 10:46) */ -@RunWith(JUnitPlatform.class) class TimeShiftFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java index 432894fde1b..8a62544f66b 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 16:01) */ -@RunWith(JUnitPlatform.class) class ToBoolFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java index 6d9903974fa..a50e628339c 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (26/06/2018 06:30) */ -@RunWith(JUnitPlatform.class) class ToDurationFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java index 473b8267e56..c45fb08f82b 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 16:09) */ -@RunWith(JUnitPlatform.class) class ToFloatFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java index 2bc8c74c415..31a47c9b36f 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java @@ -28,13 +28,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (10/10/2018 09:35) */ -@RunWith(JUnitPlatform.class) class ToFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java index ce9917184d9..cf5d6a12343 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (25/06/2018 16:09) */ -@RunWith(JUnitPlatform.class) class ToIntFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java index 09890ac9bd0..f94d6870272 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (26/06/2018 06:35) */ -@RunWith(JUnitPlatform.class) class ToStringFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java index 8afe019e7ba..22f3cedaf4e 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (26/06/2018 06:39) */ -@RunWith(JUnitPlatform.class) class ToTimeFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java index 7b7ba7fb914..2a7bfe6f9de 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (26/06/2018 06:43) */ -@RunWith(JUnitPlatform.class) class ToUIntFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java index 1c60b7de7b6..b18f114deb2 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java @@ -24,13 +24,11 @@ import java.time.temporal.ChronoUnit; import com.influxdb.query.dsl.Flux; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; -@RunWith(JUnitPlatform.class) class TruncateTimeColumnTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java index ea2824ee53f..3622e0607dc 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java @@ -23,15 +23,13 @@ import com.influxdb.query.dsl.Expressions; import com.influxdb.query.dsl.Flux; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (29/06/2018 10:03) */ -@RunWith(JUnitPlatform.class) class UnionFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java index 01f0ef72238..9c198d66b9f 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java @@ -30,13 +30,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (27/06/2018 12:42) */ -@RunWith(JUnitPlatform.class) class WindowFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java index 50568da1dd2..ae889eae567 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (29/06/2018 10:03) */ -@RunWith(JUnitPlatform.class) class YieldFluxTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java index 4a31ce13b58..16b847591d3 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java @@ -25,13 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; /** * @author Jakub Bednar (bednar@github) (09/10/2018 12:24) */ -@RunWith(JUnitPlatform.class) class TimeIntervalTest { @Test diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java index e0151c5b433..7a700535602 100644 --- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java +++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java @@ -21,19 +21,17 @@ */ package com.influxdb.query.dsl.functions.restriction; +import java.util.HashMap; +import java.util.Map; + import com.influxdb.query.dsl.Flux; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; - -import java.util.HashMap; -import java.util.Map; /** * @author Jakub Bednar (bednar@github) (09/10/2018 10:33) */ -@RunWith(JUnitPlatform.class) class RestrictionsTest { @Test diff --git a/pom.xml b/pom.xml index d0e677c62fd..5238bfb2586 100644 --- a/pom.xml +++ b/pom.xml @@ -254,6 +254,13 @@ org.apache.maven.plugins maven-surefire-plugin ${plugin.surefire.version} + + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + + @@ -268,6 +275,13 @@ + + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + + @@ -623,12 +637,6 @@ ${junit-jupiter.version} - - org.junit.platform - junit-platform-runner - 1.9.0 - - org.hamcrest hamcrest diff --git a/spring/pom.xml b/spring/pom.xml index d1dfe6a8091..3ce4e70cee2 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -153,12 +153,6 @@ test - - org.junit.platform - junit-platform-runner - test - - org.assertj assertj-core diff --git a/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java b/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java index 1fc74551d69..d57fe38e515 100644 --- a/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java +++ b/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java @@ -24,8 +24,6 @@ import com.influxdb.client.InfluxDBClient; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -40,7 +38,6 @@ * * @author Jakub Bednar (bednar@github) (07/05/2019 14:59) */ -@RunWith(JUnitPlatform.class) class InfluxDB2HealthIndicatorAutoConfigurationTest { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() diff --git a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java index d0f81029c73..0d2e2069af2 100644 --- a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java +++ b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java @@ -26,8 +26,6 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -36,7 +34,6 @@ * * @author Jakub Bednar (bednar@github) (07/05/2019 12:59) */ -@RunWith(JUnitPlatform.class) class InfluxDB2AutoConfigurationReactiveTest { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() diff --git a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java index c38b212e2dc..b38810bf447 100644 --- a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java +++ b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java @@ -31,8 +31,6 @@ import okhttp3.Protocol; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -46,7 +44,6 @@ * * @author Jakub Bednar (bednar@github) (07/05/2019 12:59) */ -@RunWith(JUnitPlatform.class) class InfluxDB2AutoConfigurationTest { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()