diff --git a/api/build.gradle b/api/build.gradle index 42cf9b66..dd8e59db 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -1,9 +1,5 @@ sourceCompatibility = targetCompatibility = 8 -test { - useJUnit() -} - dependencies { compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' @@ -13,6 +9,5 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testCompile 'junit:junit' testCompile 'org.assertj:assertj-core' } diff --git a/api/src/test/java/com/github/bsideup/liiklus/positions/GroupIdTest.java b/api/src/test/java/com/github/bsideup/liiklus/positions/GroupIdTest.java index d8ce578a..aaa42341 100644 --- a/api/src/test/java/com/github/bsideup/liiklus/positions/GroupIdTest.java +++ b/api/src/test/java/com/github/bsideup/liiklus/positions/GroupIdTest.java @@ -1,9 +1,8 @@ package com.github.bsideup.liiklus.positions; import lombok.RequiredArgsConstructor; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import java.util.Arrays; import java.util.Collection; @@ -11,12 +10,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@RunWith(Parameterized.class) @RequiredArgsConstructor -public class GroupIdTest { +class GroupIdTest { - @Parameterized.Parameters(name = "{index}: {0}") - public static Collection data() { + static Collection data() { return Arrays.asList(new Object[][]{ {"hello", GroupId.of("hello", Optional.empty())}, {"hello-", GroupId.of("hello-", Optional.empty())}, @@ -33,17 +30,15 @@ public static Collection data() { }); } - final String string; - - final GroupId object; - - @Test - public void testParsing() { + @ParameterizedTest + @MethodSource("data") + void testParsing(String string, GroupId object) { assertThat(GroupId.ofString(string)).isEqualTo(object); } - @Test - public void testStringRepresentation() { + @ParameterizedTest + @MethodSource("data") + void testStringRepresentation(String string, GroupId object) { assertThat(object.asString()).isEqualTo(string); } } diff --git a/api/src/test/java/com/github/bsideup/liiklus/positions/GroupIdValidationTest.java b/api/src/test/java/com/github/bsideup/liiklus/positions/GroupIdValidationTest.java index 3318382c..ee5b1393 100644 --- a/api/src/test/java/com/github/bsideup/liiklus/positions/GroupIdValidationTest.java +++ b/api/src/test/java/com/github/bsideup/liiklus/positions/GroupIdValidationTest.java @@ -1,6 +1,6 @@ package com.github.bsideup.liiklus.positions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Optional; @@ -9,14 +9,14 @@ public class GroupIdValidationTest { @Test - public void testWrongExplicitVersion() { + void testWrongExplicitVersion() { assertThatThrownBy( () -> GroupId.of("test", -1) ).isInstanceOf(IllegalArgumentException.class); } @Test - public void testWrongExplicitOptionalVersion() { + void testWrongExplicitOptionalVersion() { assertThatThrownBy( () -> GroupId.of("test", Optional.of(-1)) ).isInstanceOf(IllegalArgumentException.class); diff --git a/api/src/test/java/com/github/bsideup/liiklus/records/LiiklusCloudEventTest.java b/api/src/test/java/com/github/bsideup/liiklus/records/LiiklusCloudEventTest.java index 19c24478..33ddb958 100644 --- a/api/src/test/java/com/github/bsideup/liiklus/records/LiiklusCloudEventTest.java +++ b/api/src/test/java/com/github/bsideup/liiklus/records/LiiklusCloudEventTest.java @@ -1,9 +1,8 @@ package com.github.bsideup.liiklus.records; import org.assertj.core.data.MapEntry; -import org.junit.Test; -import org.junit.experimental.runners.Enclosed; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.UUID; @@ -16,13 +15,12 @@ /** * See Kafka Protocol Binding */ -@RunWith(Enclosed.class) -public class LiiklusCloudEventTest { - - public static class Attributes { +class LiiklusCloudEventTest { + @Nested + class Attributes { @Test - public void serialization() { + void serialization() { LiiklusCloudEvent event = newBuilder() .mediaType("text/plain") .build(); @@ -37,7 +35,7 @@ public void serialization() { } @Test - public void deserialization() { + void deserialization() { String id = UUID.randomUUID().toString(); Map headers = Stream.of( entry("ce_specversion", "1.0"), @@ -57,10 +55,11 @@ public void deserialization() { } } - public static class Extensions { + @Nested + class Extensions { @Test - public void serialization() { + void serialization() { LiiklusCloudEvent event = newBuilder() .rawExtension("comexamplefoo", "foo") .rawExtension("comexamplebar", "bar") @@ -73,7 +72,7 @@ public void serialization() { } @Test - public void deserialization() { + void deserialization() { String id = UUID.randomUUID().toString(); Map headers = Stream.of( entry("ce_specversion", "1.0"), diff --git a/app/build.gradle b/app/build.gradle index 506404f4..4ece6cd2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,9 +1,5 @@ apply plugin: 'org.springframework.boot' -test { - useJUnit() -} - jar { enabled = true } diff --git a/app/src/test/java/com/github/bsideup/liiklus/AckTest.java b/app/src/test/java/com/github/bsideup/liiklus/AckTest.java index fcc5a103..b772ff00 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/AckTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/AckTest.java @@ -3,11 +3,13 @@ import com.github.bsideup.liiklus.protocol.*; import com.github.bsideup.liiklus.test.AbstractIntegrationTest; import com.google.protobuf.ByteString; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; +import java.lang.reflect.Method; import java.time.Duration; import java.util.HashMap; import java.util.Map; @@ -16,15 +18,15 @@ import static org.assertj.core.api.Assertions.assertThat; -public class AckTest extends AbstractIntegrationTest { +class AckTest extends AbstractIntegrationTest { SubscribeRequest subscribeRequest; - @Before - public void setUpAckTest() throws Exception { + @BeforeEach + void setUpAckTest(TestInfo info) throws Exception { subscribeRequest = SubscribeRequest.newBuilder() - .setTopic(testName.getMethodName()) - .setGroup(testName.getMethodName()) + .setTopic(info.getTestMethod().map(Method::getName).orElse("unknown")) + .setGroup(info.getTestMethod().map(Method::getName).orElse("unknown")) .setAutoOffsetReset(SubscribeRequest.AutoOffsetReset.EARLIEST) .build(); @@ -40,7 +42,7 @@ public void setUpAckTest() throws Exception { } @Test - public void testManualAck() throws Exception { + void testManualAck() throws Exception { Integer partition = stub.subscribe(subscribeRequest) .take(1) .delayUntil(it -> { @@ -73,7 +75,7 @@ public void testManualAck() throws Exception { } @Test - public void testStatelessAck() throws Exception { + void testStatelessAck() throws Exception { int partition = 1; int groupVersion = 1; AckRequest ackRequest = AckRequest.newBuilder() @@ -103,7 +105,7 @@ public void testStatelessAck() throws Exception { } @Test - public void testAlwaysLatest() throws Exception { + void testAlwaysLatest() throws Exception { Integer partition = stub.subscribe(subscribeRequest) .map(SubscribeReply::getAssignment) .delayUntil(new Function<>() { @@ -135,7 +137,7 @@ public Publisher apply(Assignment assignment) { } @Test - public void testInterruption() throws Exception { + void testInterruption() throws Exception { String key = "some key"; int partition = getPartitionByKey(key); ByteString keyBytes = ByteString.copyFromUtf8(key); diff --git a/app/src/test/java/com/github/bsideup/liiklus/CloudEventsTest.java b/app/src/test/java/com/github/bsideup/liiklus/CloudEventsTest.java index e6207d12..fd0cf251 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/CloudEventsTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/CloudEventsTest.java @@ -6,11 +6,13 @@ import com.github.bsideup.liiklus.records.LiiklusCloudEvent; import com.github.bsideup.liiklus.test.AbstractIntegrationTest; import com.google.protobuf.ByteString; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; import reactor.core.publisher.SignalType; import java.io.IOException; +import java.lang.reflect.Method; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Collections; @@ -21,12 +23,12 @@ import static org.assertj.core.api.Assertions.assertThat; -public class CloudEventsTest extends AbstractIntegrationTest { +class CloudEventsTest extends AbstractIntegrationTest { private static final ObjectMapper MAPPER = new ObjectMapper(); - @Before - public void setUpCloudEventsTest() throws Exception { + @BeforeEach + void setUpCloudEventsTest() throws Exception { processorPluginMock.getPreProcessors().add(envelope -> { var rawValue = envelope.getRawValue(); @@ -61,10 +63,10 @@ public void setUpCloudEventsTest() throws Exception { } @Test - public void shouldSupportLegacyFormat() throws Exception { + void shouldSupportLegacyFormat(TestInfo info) throws Exception { var subscribeAction = SubscribeRequest.newBuilder() - .setTopic(testName.getMethodName()) - .setGroup(testName.getMethodName()) + .setTopic(info.getTestMethod().map(Method::getName).orElse("unknown")) + .setGroup(info.getTestMethod().map(Method::getName).orElse("unknown")) .setAutoOffsetReset(SubscribeRequest.AutoOffsetReset.EARLIEST) .build(); diff --git a/app/src/test/java/com/github/bsideup/liiklus/ConsumerGroupsTest.java b/app/src/test/java/com/github/bsideup/liiklus/ConsumerGroupsTest.java index 7e14fc57..8c681124 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/ConsumerGroupsTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/ConsumerGroupsTest.java @@ -4,24 +4,26 @@ import com.github.bsideup.liiklus.protocol.SubscribeRequest; import com.github.bsideup.liiklus.test.AbstractIntegrationTest; import com.google.protobuf.ByteString; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; import reactor.core.publisher.Flux; +import java.lang.reflect.Method; import java.time.Duration; import java.util.HashMap; import java.util.HashSet; import java.util.Set; -public class ConsumerGroupsTest extends AbstractIntegrationTest { +class ConsumerGroupsTest extends AbstractIntegrationTest { SubscribeRequest subscribeRequest; - @Before - public void setUpConsumerGroupsTest() throws Exception { + @BeforeEach + void setUpConsumerGroupsTest(TestInfo info) throws Exception { subscribeRequest = SubscribeRequest.newBuilder() - .setTopic(testName.getMethodName()) - .setGroup(testName.getMethodName()) + .setTopic(info.getTestMethod().map(Method::getName).orElse("unknown")) + .setGroup(info.getTestMethod().map(Method::getName).orElse("unknown")) .setAutoOffsetReset(SubscribeRequest.AutoOffsetReset.EARLIEST) .build(); @@ -40,7 +42,7 @@ public void setUpConsumerGroupsTest() throws Exception { } @Test - public void testConsumerGroups() { + void testConsumerGroups() { Flux .merge( stub.subscribe(subscribeRequest), diff --git a/app/src/test/java/com/github/bsideup/liiklus/EndOffsetsTest.java b/app/src/test/java/com/github/bsideup/liiklus/EndOffsetsTest.java index 5ba08553..2958aaff 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/EndOffsetsTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/EndOffsetsTest.java @@ -4,24 +4,26 @@ import com.github.bsideup.liiklus.protocol.PublishRequest; import com.github.bsideup.liiklus.test.AbstractIntegrationTest; import com.google.protobuf.ByteString; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; +import java.lang.reflect.Method; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -public class EndOffsetsTest extends AbstractIntegrationTest { +class EndOffsetsTest extends AbstractIntegrationTest { private String topic; - @Before - public final void setUpEndOffsetsTest() { - topic = testName.getMethodName(); + @BeforeEach + final void setUpEndOffsetsTest(TestInfo info) { + topic = info.getTestMethod().map(Method::getName).orElse("unknown"); } @Test - public void testEndOffsets() { + void testEndOffsets() { for (int partition = 0; partition < NUM_PARTITIONS; partition++) { for (int i = 0; i < partition + 1; i++) { stub.publish(PublishRequest.newBuilder() @@ -45,7 +47,7 @@ public void testEndOffsets() { } @Test - public void testEndOffsets_unknownTopic() { + void testEndOffsets_unknownTopic() { var randomTopic = UUID.randomUUID().toString(); var reply = stub.getEndOffsets(GetEndOffsetsRequest.newBuilder().setTopic(randomTopic).build()).block(); diff --git a/app/src/test/java/com/github/bsideup/liiklus/GroupVersionTest.java b/app/src/test/java/com/github/bsideup/liiklus/GroupVersionTest.java index c6d6d855..e67d634f 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/GroupVersionTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/GroupVersionTest.java @@ -4,10 +4,12 @@ import com.github.bsideup.liiklus.protocol.ReceiveReply.Record; import com.github.bsideup.liiklus.test.AbstractIntegrationTest; import com.google.protobuf.ByteString; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; import reactor.core.publisher.Flux; +import java.lang.reflect.Method; import java.time.Duration; import java.util.List; import java.util.Optional; @@ -15,20 +17,20 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.tuple; -public class GroupVersionTest extends AbstractIntegrationTest { +class GroupVersionTest extends AbstractIntegrationTest { private static final int PARTITION = 1; - public static final int NUM_OF_RECORDS_PER_PARTITION = 10; + static final int NUM_OF_RECORDS_PER_PARTITION = 10; private String topic; private String groupName; - @Before - public void setUpGroupVersionTest() throws Exception { - topic = testName.getMethodName(); - groupName = testName.getMethodName(); + @BeforeEach + void setUpGroupVersionTest(TestInfo info) throws Exception { + topic = info.getTestMethod().map(Method::getName).orElse("unknown"); + groupName = info.getTestMethod().map(Method::getName).orElse("unknown"); Flux.range(0, NUM_OF_RECORDS_PER_PARTITION) .flatMap(__ -> stub.publish( @@ -42,7 +44,7 @@ public void setUpGroupVersionTest() throws Exception { } @Test - public void testCompoundGroupId() throws Exception { + void testCompoundGroupId() throws Exception { var groupVersion = 1; var committedOffset = 3; @@ -59,13 +61,13 @@ public void testCompoundGroupId() throws Exception { } @Test - public void testReplayWithNoAck() throws Exception { + void testReplayWithNoAck() throws Exception { assertThat(getAllRecords(0)).noneMatch(Record::getReplay); assertThat(getAllRecords(1)).noneMatch(Record::getReplay); } @Test - public void testReplayUsesAlwaysLatest() throws Exception { + void testReplayUsesAlwaysLatest() throws Exception { ackOffset(1, 3); ackOffset(2, 7); ackOffset(3, 5); @@ -87,7 +89,7 @@ public void testReplayUsesAlwaysLatest() throws Exception { } @Test - public void testReplayWithPreviousVersion() throws Exception { + void testReplayWithPreviousVersion() throws Exception { ackOffset(2, 7); assertThat(getAllRecords(1)) @@ -107,7 +109,7 @@ public void testReplayWithPreviousVersion() throws Exception { } @Test - public void testLegacyVersions() throws Exception { + void testLegacyVersions() throws Exception { var groupVersion = 2; var groupId = groupName + "-v" + groupVersion; diff --git a/app/src/test/java/com/github/bsideup/liiklus/PositionsTest.java b/app/src/test/java/com/github/bsideup/liiklus/PositionsTest.java index a09d96d2..91a91edd 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/PositionsTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/PositionsTest.java @@ -3,25 +3,27 @@ import com.github.bsideup.liiklus.protocol.*; import com.github.bsideup.liiklus.test.AbstractIntegrationTest; import com.google.protobuf.ByteString; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.lang.reflect.Method; import java.time.Duration; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -public class PositionsTest extends AbstractIntegrationTest { +class PositionsTest extends AbstractIntegrationTest { SubscribeRequest subscribeRequest; - @Before - public void setUpConsumerGroupsTest() throws Exception { + @BeforeEach + void setUpConsumerGroupsTest(TestInfo info) throws Exception { subscribeRequest = SubscribeRequest.newBuilder() - .setTopic(testName.getMethodName()) - .setGroup(testName.getMethodName()) + .setTopic(info.getTestMethod().map(Method::getName).orElse("unknown")) + .setGroup(info.getTestMethod().map(Method::getName).orElse("unknown")) .setAutoOffsetReset(SubscribeRequest.AutoOffsetReset.EARLIEST) .build(); @@ -43,7 +45,7 @@ public void setUpConsumerGroupsTest() throws Exception { } @Test - public void testGetOffsets() throws Exception { + void testGetOffsets() throws Exception { var key = UUID.randomUUID().toString(); var partition = getPartitionByKey(key); @@ -93,7 +95,7 @@ public void testGetOffsets() throws Exception { } @Test - public void testGetEmptyOffsets() throws Exception { + void testGetEmptyOffsets() throws Exception { var getOffsetsReply = stub .getOffsets( GetOffsetsRequest.newBuilder() diff --git a/app/src/test/java/com/github/bsideup/liiklus/ProfilesTest.java b/app/src/test/java/com/github/bsideup/liiklus/ProfilesTest.java index 60121dcc..9b40cae4 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/ProfilesTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/ProfilesTest.java @@ -3,9 +3,8 @@ import com.github.bsideup.liiklus.test.AbstractIntegrationTest; import com.google.common.collect.Sets; import org.assertj.core.api.AbstractThrowableAssert; -import org.junit.After; -import org.junit.Test; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.springframework.context.ConfigurableApplicationContext; import java.util.Collection; @@ -14,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; -public class ProfilesTest extends AbstractIntegrationTest { +class ProfilesTest extends AbstractIntegrationTest { static Set RECORDS_PROPERTIES = Sets.newHashSet( "storage.records.type=MEMORY" @@ -30,15 +29,15 @@ public class ProfilesTest extends AbstractIntegrationTest { ConfigurableApplicationContext lastApplicationContext; - @After - public void tearDown() throws Exception { + @AfterEach + void tearDown() throws Exception { if (lastApplicationContext != null) { lastApplicationContext.close(); } } @Test - public void testRequired() throws Exception { + void testRequired() throws Exception { assertThatAppWithProps(commonArgs) .hasMessageContaining("Required key"); @@ -53,7 +52,7 @@ public void testRequired() throws Exception { } @Test - public void testExporterProfile() throws Exception { + void testExporterProfile() throws Exception { commonArgs.add("spring.profiles.active=exporter"); assertThatAppWithProps(commonArgs) @@ -64,7 +63,7 @@ public void testExporterProfile() throws Exception { } @Test - public void testGatewayProfile() throws Exception { + void testGatewayProfile() throws Exception { commonArgs.add("spring.profiles.active=gateway"); assertThatAppWithProps(commonArgs) diff --git a/app/src/test/java/com/github/bsideup/liiklus/SmokeTest.java b/app/src/test/java/com/github/bsideup/liiklus/SmokeTest.java index 4e0312a7..26bcb7f2 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/SmokeTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/SmokeTest.java @@ -6,11 +6,14 @@ import com.github.bsideup.liiklus.test.AbstractIntegrationTest; import com.google.protobuf.ByteString; import org.assertj.core.api.Condition; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; import org.springframework.test.web.reactive.server.WebTestClient; import reactor.core.publisher.Flux; import reactor.core.publisher.SignalType; +import java.lang.reflect.Method; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Collections; @@ -22,10 +25,19 @@ import static org.assertj.core.api.Assertions.assertThat; -public class SmokeTest extends AbstractIntegrationTest { +class SmokeTest extends AbstractIntegrationTest { + + String topic; + String group; + + @BeforeEach + void setUp(TestInfo info) { + topic = info.getTestMethod().map(Method::getName).orElse("unknown"); + group = info.getTestMethod().map(Method::getName).orElse("unknown"); + } @Test - public void testHealth() throws Exception { + void testHealth() throws Exception { WebTestClient.bindToApplicationContext(applicationContext) .build() .get() @@ -36,7 +48,7 @@ public void testHealth() throws Exception { } @Test - public void testPrometheusExporter() throws Exception { + void testPrometheusExporter() throws Exception { WebTestClient.bindToApplicationContext(applicationContext) .build() .get() @@ -47,10 +59,10 @@ public void testPrometheusExporter() throws Exception { } @Test - public void testPublishSubscribe() throws Exception { + void testPublishSubscribe() throws Exception { SubscribeRequest subscribeAction = SubscribeRequest.newBuilder() - .setTopic(testName.getMethodName()) - .setGroup(testName.getMethodName()) + .setTopic(topic) + .setGroup(group) .setAutoOffsetReset(SubscribeRequest.AutoOffsetReset.EARLIEST) .build(); @@ -95,10 +107,10 @@ public boolean matches(ReceiveReply.LiiklusEventRecord value) { } @Test - public void testNullKey() throws Exception { + void testNullKey() throws Exception { var subscribeAction = SubscribeRequest.newBuilder() - .setTopic(testName.getMethodName()) - .setGroup(testName.getMethodName()) + .setTopic(topic) + .setGroup(group) .setAutoOffsetReset(SubscribeRequest.AutoOffsetReset.EARLIEST) .build(); @@ -140,10 +152,10 @@ var record = stub } @Test - public void testRoundTrip() { + void testRoundTrip() { var subscribeAction = SubscribeRequest.newBuilder() - .setTopic(testName.getMethodName()) - .setGroup(testName.getMethodName()) + .setTopic(topic) + .setGroup(group) .setAutoOffsetReset(SubscribeRequest.AutoOffsetReset.EARLIEST) .build(); diff --git a/app/src/test/java/com/github/bsideup/liiklus/config/GatewayConfigurationTest.java b/app/src/test/java/com/github/bsideup/liiklus/config/GatewayConfigurationTest.java index c2c3e2c1..8d8ee216 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/config/GatewayConfigurationTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/config/GatewayConfigurationTest.java @@ -4,10 +4,8 @@ import com.github.bsideup.liiklus.records.RecordPreProcessor; import com.github.bsideup.liiklus.records.RecordsStorage; import lombok.ToString; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.springframework.context.support.StaticApplicationContext; import org.springframework.mock.env.MockEnvironment; @@ -16,8 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@RunWith(MockitoJUnitRunner.class) -public class GatewayConfigurationTest { +class GatewayConfigurationTest { MockEnvironment environment; @@ -25,8 +22,8 @@ public class GatewayConfigurationTest { final GatewayConfiguration gatewayConfiguration = new GatewayConfiguration(); - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { environment = new MockEnvironment(); environment.setActiveProfiles("gateway"); @@ -39,7 +36,7 @@ public void setUp() throws Exception { } @Test - public void testOrderWithEmptyOrders() throws Exception { + void testOrderWithEmptyOrders() throws Exception { gatewayConfiguration.initialize(applicationContext); assertThat(applicationContext.getBean(RecordPreProcessorChain.class).getAll()).containsExactly( @@ -55,7 +52,7 @@ public void testOrderWithEmptyOrders() throws Exception { } @Test - public void testOrderWithDefaultOrder() throws Exception { + void testOrderWithDefaultOrder() throws Exception { setOrder(P2.class, 0); gatewayConfiguration.initialize(applicationContext); @@ -72,7 +69,7 @@ public void testOrderWithDefaultOrder() throws Exception { } @Test - public void testNegativeOrders() throws Exception { + void testNegativeOrders() throws Exception { setOrder(P2.class, -100); setOrder(P3.class, -50); gatewayConfiguration.initialize(applicationContext); @@ -91,7 +88,7 @@ public void testNegativeOrders() throws Exception { } @Test - public void testPositiveOrders() throws Exception { + void testPositiveOrders() throws Exception { setOrder(P2.class, 100); setOrder(P3.class, 50); gatewayConfiguration.initialize(applicationContext); @@ -110,7 +107,7 @@ public void testPositiveOrders() throws Exception { } @Test - public void testOrderClashing() throws Exception { + void testOrderClashing() throws Exception { setOrder(P3.class, -100); setOrder(P2.class, -100); gatewayConfiguration.initialize(applicationContext); diff --git a/app/src/test/java/com/github/bsideup/liiklus/test/AbstractIntegrationTest.java b/app/src/test/java/com/github/bsideup/liiklus/test/AbstractIntegrationTest.java index 4058577d..25778859 100644 --- a/app/src/test/java/com/github/bsideup/liiklus/test/AbstractIntegrationTest.java +++ b/app/src/test/java/com/github/bsideup/liiklus/test/AbstractIntegrationTest.java @@ -10,12 +10,11 @@ import io.rsocket.core.RSocketConnector; import io.rsocket.transport.netty.client.TcpClientTransport; import io.rsocket.transport.netty.server.CloseableChannel; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import org.junit.Rule; import org.junit.rules.TestName; import org.pf4j.PluginManager; import org.springframework.context.ApplicationContext; -import org.springframework.context.support.GenericApplicationContext; import reactor.core.publisher.Hooks; import reactor.core.publisher.Mono; @@ -126,11 +125,8 @@ public static int getPartitionByKey(String key) { Hooks.onOperatorDebug(); } - @Rule - public TestName testName = new TestName(); - - @Before - public void setUpAbstractIntegrationTest() throws Exception { + @BeforeEach + void setUpAbstractIntegrationTest() throws Exception { processorPluginMock.getPreProcessors().clear(); processorPluginMock.getPostProcessors().clear(); } diff --git a/build.gradle b/build.gradle index 10401d94..288e72ed 100644 --- a/build.gradle +++ b/build.gradle @@ -75,9 +75,9 @@ configure(subprojects.findAll { !it.name.startsWith("examples/") }) { overriddenByDependencies = false imports { - mavenBom 'org.junit:junit-bom:5.5.2' + mavenBom 'org.junit:junit-bom:5.7.2' mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES - mavenBom 'org.testcontainers:testcontainers-bom:1.12.3' + mavenBom 'org.testcontainers:testcontainers-bom:1.15.3' // pinned to 1.23.1, see https://github.com/grpc/grpc-java/issues/6707 mavenBom 'io.grpc:grpc-bom:1.23.1' @@ -110,4 +110,9 @@ configure(subprojects.findAll { !it.name.startsWith("examples/") }) { dependency 'org.awaitility:awaitility:4.0.1' } } + + dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter' + } + } diff --git a/client/build.gradle b/client/build.gradle index fc9223c9..63133527 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -54,10 +54,6 @@ idea { sourceCompatibility = targetCompatibility = 8 -test { - useJUnit() -} - dependencies { compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 1125b7b8..06fb4811 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -49,7 +49,7 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.18.12' annotationProcessor 'org.projectlombok:lombok:1.18.12' - compile 'org.testcontainers:kafka:1.12.3' + compile 'org.testcontainers:kafka:1.15.3' compile 'org.apache.commons:commons-math3:3.6.1' diff --git a/examples/java/src/main/java/com/example/Consumer.java b/examples/java/src/main/java/com/example/Consumer.java index addacec8..7c91782a 100644 --- a/examples/java/src/main/java/com/example/Consumer.java +++ b/examples/java/src/main/java/com/example/Consumer.java @@ -94,7 +94,7 @@ public static void main(String[] args) { } private static String getLiiklusTarget() { - GenericContainer liiklus = new GenericContainer<>("bsideup/liiklus:0.9.0") + GenericContainer liiklus = new GenericContainer<>("bsideup/liiklus:0.9.3") .withExposedPorts(6565) .withEnv("storage_records_type", "MEMORY") .withEnv("storage_positions_type", "MEMORY"); // Fine for testing, NOT FINE I WARNED YOU for production :D diff --git a/examples/plugin/build.gradle b/examples/plugin/build.gradle index 87538ce6..d8152a58 100644 --- a/examples/plugin/build.gradle +++ b/examples/plugin/build.gradle @@ -5,10 +5,6 @@ plugins { sourceCompatibility = targetCompatibility = 8 -test { - useJUnit() -} - jar { baseName = "example-plugin" manifest { @@ -38,7 +34,7 @@ dependencyManagement { imports { mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES - mavenBom 'org.testcontainers:testcontainers-bom:1.12.3' + mavenBom 'org.testcontainers:testcontainers-bom:1.15.3' } dependencies { diff --git a/examples/plugin/src/test/java/com/github/bsideup/liiklus/plugins/example/SmokeTest.java b/examples/plugin/src/test/java/com/github/bsideup/liiklus/plugins/example/SmokeTest.java index 7b13622a..a61d37a7 100644 --- a/examples/plugin/src/test/java/com/github/bsideup/liiklus/plugins/example/SmokeTest.java +++ b/examples/plugin/src/test/java/com/github/bsideup/liiklus/plugins/example/SmokeTest.java @@ -2,17 +2,17 @@ import com.github.bsideup.liiklus.protocol.ReceiveReply.Record; import com.github.bsideup.liiklus.plugins.example.support.AbstractIntegrationTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -public class SmokeTest extends AbstractIntegrationTest { +class SmokeTest extends AbstractIntegrationTest { @Test - public void testPreProcessor() { + void testPreProcessor() { String key = UUID.randomUUID().toString(); publishRecord(key, "Hello!"); @@ -25,7 +25,7 @@ public void testPreProcessor() { } @Test - public void testPostProcessor() { + void testPostProcessor() { String key = "maskMe"; publishRecord(key, "Hello!"); diff --git a/examples/plugin/src/test/java/com/github/bsideup/liiklus/plugins/example/support/AbstractIntegrationTest.java b/examples/plugin/src/test/java/com/github/bsideup/liiklus/plugins/example/support/AbstractIntegrationTest.java index ba772dbf..5f9ecd19 100644 --- a/examples/plugin/src/test/java/com/github/bsideup/liiklus/plugins/example/support/AbstractIntegrationTest.java +++ b/examples/plugin/src/test/java/com/github/bsideup/liiklus/plugins/example/support/AbstractIntegrationTest.java @@ -13,6 +13,8 @@ import reactor.core.publisher.Flux; import java.time.Duration; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; import java.util.UUID; public abstract class AbstractIntegrationTest { @@ -20,7 +22,7 @@ public abstract class AbstractIntegrationTest { protected static final LiiklusClient client; static { - LiiklusContainer liiklus = new LiiklusContainer("0.7.0") + LiiklusContainer liiklus = new LiiklusContainer("0.9.3") .withEnv("storage_records_type", "MEMORY") .withClasspathResourceMapping("/example-plugin.jar", "/app/plugins/example-plugin.jar", BindMode.READ_ONLY) .withLogConsumer(new ToStringConsumer() { diff --git a/plugins/dynamodb-positions-storage/build.gradle b/plugins/dynamodb-positions-storage/build.gradle index 75025964..73c8f464 100644 --- a/plugins/dynamodb-positions-storage/build.gradle +++ b/plugins/dynamodb-positions-storage/build.gradle @@ -28,7 +28,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testCompile project(":tck") testCompile 'org.springframework.boot:spring-boot-test' testCompile 'org.testcontainers:localstack' diff --git a/plugins/dynamodb-positions-storage/src/test/java/com/github/bsideup/liiklus/dynamodb/DynamoDBPositionsStorageTest.java b/plugins/dynamodb-positions-storage/src/test/java/com/github/bsideup/liiklus/dynamodb/DynamoDBPositionsStorageTest.java index 068f58c8..99067567 100644 --- a/plugins/dynamodb-positions-storage/src/test/java/com/github/bsideup/liiklus/dynamodb/DynamoDBPositionsStorageTest.java +++ b/plugins/dynamodb-positions-storage/src/test/java/com/github/bsideup/liiklus/dynamodb/DynamoDBPositionsStorageTest.java @@ -7,12 +7,13 @@ import org.springframework.context.ApplicationContext; import org.testcontainers.containers.localstack.LocalStackContainer; import org.testcontainers.containers.localstack.LocalStackContainer.Service; +import org.testcontainers.utility.DockerImageName; import java.util.UUID; class DynamoDBPositionsStorageTest implements PositionsStorageTests { - private static final LocalStackContainer localstack = new LocalStackContainer("0.8.6") + private static final LocalStackContainer localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:0.11.2")) .withServices(Service.DYNAMODB); static final ApplicationContext applicationContext; diff --git a/plugins/grpc-transport-auth/src/test/java/com/github/bsideup/liiklus/transport/grpc/GRPCAuthTest.java b/plugins/grpc-transport-auth/src/test/java/com/github/bsideup/liiklus/transport/grpc/GRPCAuthTest.java index a868c4d0..840ef70b 100644 --- a/plugins/grpc-transport-auth/src/test/java/com/github/bsideup/liiklus/transport/grpc/GRPCAuthTest.java +++ b/plugins/grpc-transport-auth/src/test/java/com/github/bsideup/liiklus/transport/grpc/GRPCAuthTest.java @@ -17,7 +17,7 @@ import io.grpc.Server; import io.grpc.StatusRuntimeException; import lombok.SneakyThrows; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.pf4j.PluginManager; import org.springframework.context.ApplicationContext; @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -public class GRPCAuthTest { +class GRPCAuthTest { private static final LiiklusEvent LIIKLUS_EVENT_EXAMPLE = LiiklusEvent.newBuilder() .setId(UUID.randomUUID().toString()) @@ -60,7 +60,7 @@ static int getGRPCPort(ApplicationContext ctx) { @Test - public void shouldPublishOnlyWithAuthHmac512() { + void shouldPublishOnlyWithAuthHmac512() { var event = PublishRequest.newBuilder() .setTopic("authorized") .setLiiklusEvent(LIIKLUS_EVENT_EXAMPLE) @@ -116,7 +116,7 @@ public void shouldPublishOnlyWithAuthHmac512() { } @Test - public void shouldPublishWithAuthRsa512() { + void shouldPublishWithAuthRsa512() { var event = PublishRequest.newBuilder() .setTopic("authorized") .setLiiklusEvent(LIIKLUS_EVENT_EXAMPLE) diff --git a/plugins/grpc-transport-auth/src/test/java/com/github/bsideup/liiklus/transport/grpc/GRPCTLSTest.java b/plugins/grpc-transport-auth/src/test/java/com/github/bsideup/liiklus/transport/grpc/GRPCTLSTest.java index 2e6d761b..de493dec 100644 --- a/plugins/grpc-transport-auth/src/test/java/com/github/bsideup/liiklus/transport/grpc/GRPCTLSTest.java +++ b/plugins/grpc-transport-auth/src/test/java/com/github/bsideup/liiklus/transport/grpc/GRPCTLSTest.java @@ -19,7 +19,7 @@ import org.bouncycastle.openssl.jcajce.JcaPEMWriter; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import org.bouncycastle.util.io.pem.PemObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.ThrowingConsumer; import org.springframework.util.ResourceUtils; @@ -38,10 +38,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.InstanceOfAssertFactories.type; -public class GRPCTLSTest { +class GRPCTLSTest { @Test - public void shouldConnectWithTLS() { + void shouldConnectWithTLS() { GeneratedCert rootCA = createCertificate("ca", null, true); GeneratedCert server = createCertificate("localhost", rootCA, false); @@ -67,7 +67,7 @@ public void shouldConnectWithTLS() { } @Test - public void shouldFailOnPlaintext() { + void shouldFailOnPlaintext() { GeneratedCert rootCA = createCertificate("ca", null, true); GeneratedCert server = createCertificate("localhost", rootCA, false); withApp( @@ -91,7 +91,7 @@ public void shouldFailOnPlaintext() { } @Test - public void shouldFailOnWrongCA() { + void shouldFailOnWrongCA() { GeneratedCert rootCA = createCertificate("ca", null, true); GeneratedCert server = createCertificate("localhost", rootCA, false); withApp( @@ -118,7 +118,7 @@ public void shouldFailOnWrongCA() { } @Test - public void mTLS() { + void mTLS() { GeneratedCert rootCA = createCertificate("ca", null, true); GeneratedCert server = createCertificate("localhost", rootCA, false); GeneratedCert client = createCertificate("localhost", rootCA, false); @@ -146,7 +146,7 @@ public void mTLS() { } @Test - public void shouldFailOnMutualTLSWithMissingCertClient() { + void shouldFailOnMutualTLSWithMissingCertClient() { GeneratedCert rootCA = createCertificate("ca", null, true); GeneratedCert server = createCertificate("localhost", rootCA, false); withApp( @@ -175,7 +175,7 @@ public void shouldFailOnMutualTLSWithMissingCertClient() { } @Test - public void shouldFailOnMutualTLSWithWrongCertClient() { + void shouldFailOnMutualTLSWithWrongCertClient() { GeneratedCert rootCA = createCertificate("ca", null, true); GeneratedCert server = createCertificate("localhost", rootCA, false); GeneratedCert client = createCertificate("localhost", null, false); diff --git a/plugins/grpc-transport/build.gradle b/plugins/grpc-transport/build.gradle index d4162ff1..433daff1 100644 --- a/plugins/grpc-transport/build.gradle +++ b/plugins/grpc-transport/build.gradle @@ -77,8 +77,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testCompile 'org.junit.jupiter:junit-jupiter-api' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testCompile project(":app") testCompile 'org.springframework.boot:spring-boot-test' diff --git a/plugins/inmemory-positions-storage/build.gradle b/plugins/inmemory-positions-storage/build.gradle index f3db3be5..e91991d5 100644 --- a/plugins/inmemory-positions-storage/build.gradle +++ b/plugins/inmemory-positions-storage/build.gradle @@ -26,7 +26,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testCompile project(":tck") testCompile 'org.springframework.boot:spring-boot-test' } diff --git a/plugins/inmemory-records-storage/build.gradle b/plugins/inmemory-records-storage/build.gradle index 5b8524e4..999a1c7c 100644 --- a/plugins/inmemory-records-storage/build.gradle +++ b/plugins/inmemory-records-storage/build.gradle @@ -26,7 +26,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testCompile project(":tck") testCompile 'org.springframework.boot:spring-boot-test' } diff --git a/plugins/inmemory-records-storage/src/main/java/com/github/bsideup/liiklus/records/inmemory/config/InMemoryRecordsConfiguration.java b/plugins/inmemory-records-storage/src/main/java/com/github/bsideup/liiklus/records/inmemory/config/InMemoryRecordsConfiguration.java index e434fa98..21ba4d7a 100644 --- a/plugins/inmemory-records-storage/src/main/java/com/github/bsideup/liiklus/records/inmemory/config/InMemoryRecordsConfiguration.java +++ b/plugins/inmemory-records-storage/src/main/java/com/github/bsideup/liiklus/records/inmemory/config/InMemoryRecordsConfiguration.java @@ -5,13 +5,14 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Profiles; @AutoService(ApplicationContextInitializer.class) @Slf4j public class InMemoryRecordsConfiguration implements ApplicationContextInitializer { + public static final int NUMBER_OF_PARTITIONS = 32; + @Override public void initialize(GenericApplicationContext applicationContext) { var environment = applicationContext.getEnvironment(); @@ -33,6 +34,6 @@ public void initialize(GenericApplicationContext applicationContext) { String.format("%0106d", 0).replace("0", "=") + "\n" + String.format("%0106d", 0).replace("0", "=") ); - applicationContext.registerBean(InMemoryRecordsStorage.class, () -> new InMemoryRecordsStorage(32)); + applicationContext.registerBean(InMemoryRecordsStorage.class, () -> new InMemoryRecordsStorage(NUMBER_OF_PARTITIONS)); } } diff --git a/plugins/inmemory-records-storage/src/test/java/com/github/bsideup/liiklus/records/inmemory/InMemoryRecordsStorageTest.java b/plugins/inmemory-records-storage/src/test/java/com/github/bsideup/liiklus/records/inmemory/InMemoryRecordsStorageTest.java index 5fbfbd00..dabd99ba 100644 --- a/plugins/inmemory-records-storage/src/test/java/com/github/bsideup/liiklus/records/inmemory/InMemoryRecordsStorageTest.java +++ b/plugins/inmemory-records-storage/src/test/java/com/github/bsideup/liiklus/records/inmemory/InMemoryRecordsStorageTest.java @@ -3,6 +3,7 @@ import com.github.bsideup.liiklus.ApplicationRunner; import com.github.bsideup.liiklus.records.RecordStorageTests; import com.github.bsideup.liiklus.records.RecordsStorage; +import com.github.bsideup.liiklus.records.inmemory.config.InMemoryRecordsConfiguration; import lombok.Getter; import org.springframework.context.ApplicationContext; import reactor.core.publisher.Mono; @@ -14,7 +15,7 @@ class InMemoryRecordsStorageTest implements RecordStorageTests { - private static final int NUM_OF_PARTITIONS = 32; + private static final int NUM_OF_PARTITIONS = InMemoryRecordsConfiguration.NUMBER_OF_PARTITIONS; // Generate a set of keys where each key goes to unique partition public static Map PARTITION_KEYS = Mono.fromCallable(() -> UUID.randomUUID().toString()) diff --git a/plugins/kafka-records-storage/build.gradle b/plugins/kafka-records-storage/build.gradle index 857e670e..2bce8e86 100644 --- a/plugins/kafka-records-storage/build.gradle +++ b/plugins/kafka-records-storage/build.gradle @@ -28,7 +28,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testCompile project(":tck") testCompile 'org.testcontainers:kafka' testCompile 'org.springframework.boot:spring-boot-test' diff --git a/plugins/kafka-records-storage/src/test/java/com/github/bsideup/liiklus/kafka/KafkaRecordsStorageTest.java b/plugins/kafka-records-storage/src/test/java/com/github/bsideup/liiklus/kafka/KafkaRecordsStorageTest.java index 19300366..dc2c493f 100644 --- a/plugins/kafka-records-storage/src/test/java/com/github/bsideup/liiklus/kafka/KafkaRecordsStorageTest.java +++ b/plugins/kafka-records-storage/src/test/java/com/github/bsideup/liiklus/kafka/KafkaRecordsStorageTest.java @@ -7,6 +7,7 @@ import org.apache.kafka.common.utils.Utils; import org.springframework.context.ApplicationContext; import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.utility.DockerImageName; import reactor.core.publisher.Mono; import java.time.Duration; @@ -31,7 +32,7 @@ public class KafkaRecordsStorageTest implements RecordStorageTests { .filter(it -> it.size() == NUM_OF_PARTITIONS) .blockFirst(Duration.ofSeconds(10)); - private static final KafkaContainer kafka = new KafkaContainer() + private static final KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) .withEnv("KAFKA_NUM_PARTITIONS", NUM_OF_PARTITIONS + ""); static final ApplicationContext applicationContext; diff --git a/plugins/metrics/build.gradle b/plugins/metrics/build.gradle index 659cb772..3f6242cd 100644 --- a/plugins/metrics/build.gradle +++ b/plugins/metrics/build.gradle @@ -23,8 +23,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' - testCompile 'org.junit.jupiter:junit-jupiter-api' testCompile project(":app") testCompile 'org.springframework.boot:spring-boot-test' testCompile 'org.assertj:assertj-core' diff --git a/plugins/pulsar-records-storage/build.gradle b/plugins/pulsar-records-storage/build.gradle index 3eb6f1f7..c6415dbf 100644 --- a/plugins/pulsar-records-storage/build.gradle +++ b/plugins/pulsar-records-storage/build.gradle @@ -28,7 +28,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testCompile project(":tck") testCompile 'org.testcontainers:pulsar' testCompile 'org.apache.pulsar:pulsar-client-admin-original:2.4.0' diff --git a/plugins/pulsar-records-storage/src/test/java/com/github/bsideup/liiklus/pulsar/AbstractPulsarRecordsStorageTest.java b/plugins/pulsar-records-storage/src/test/java/com/github/bsideup/liiklus/pulsar/AbstractPulsarRecordsStorageTest.java index f378dcf1..76623f32 100644 --- a/plugins/pulsar-records-storage/src/test/java/com/github/bsideup/liiklus/pulsar/AbstractPulsarRecordsStorageTest.java +++ b/plugins/pulsar-records-storage/src/test/java/com/github/bsideup/liiklus/pulsar/AbstractPulsarRecordsStorageTest.java @@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; import org.testcontainers.containers.PulsarContainer; +import org.testcontainers.utility.DockerImageName; import java.time.Duration; import java.time.Instant; @@ -20,7 +21,7 @@ abstract class AbstractPulsarRecordsStorageTest implements RecordStorageTests { - static final PulsarContainer pulsar = new PulsarContainer("2.5.0") + static final PulsarContainer pulsar = new PulsarContainer(DockerImageName.parse("apachepulsar/pulsar:2.5.0")) .withReuse(true); private static final ApplicationContext applicationContext; @@ -41,7 +42,7 @@ abstract class AbstractPulsarRecordsStorageTest implements RecordStorageTests { @Override @Test - @DisabledUntil(value = "2020-09-01", comment = "#180 - Pulsar should fix the way seek works, not disconnecting consumers (apache/pulsar/pull/5022)") + @DisabledUntil(value = "2021-09-01", comment = "#180 - Pulsar should fix the way seek works, not disconnecting consumers (apache/pulsar/pull/5022)") public void shouldAlwaysUseEarliestOffsetOnEmptyOffsetsInTheInitialProvider() { RecordStorageTests.super.shouldAlwaysUseEarliestOffsetOnEmptyOffsetsInTheInitialProvider(); } diff --git a/plugins/pulsar-records-storage/src/test/java/com/github/bsideup/liiklus/pulsar/container/PulsarTlsContainer.java b/plugins/pulsar-records-storage/src/test/java/com/github/bsideup/liiklus/pulsar/container/PulsarTlsContainer.java index bc3acd48..f348efad 100644 --- a/plugins/pulsar-records-storage/src/test/java/com/github/bsideup/liiklus/pulsar/container/PulsarTlsContainer.java +++ b/plugins/pulsar-records-storage/src/test/java/com/github/bsideup/liiklus/pulsar/container/PulsarTlsContainer.java @@ -3,6 +3,7 @@ import org.testcontainers.containers.PulsarContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; import java.nio.file.Path; @@ -13,11 +14,7 @@ public class PulsarTlsContainer extends PulsarContainer { public static final int BROKER_TLS_PORT = 6651; public PulsarTlsContainer() { - this("2.4.0"); - } - - public PulsarTlsContainer(String pulsarVersion) { - super(pulsarVersion); + super(DockerImageName.parse("apachepulsar/pulsar:2.5.0")); withExposedPorts(BROKER_TLS_PORT, BROKER_HTTP_PORT); withEnv("PULSAR_PREFIX_brokerServicePortTls", BROKER_TLS_PORT + ""); withEnv("PULSAR_PREFIX_tlsEnabled", "true"); diff --git a/plugins/redis-positions-storage/build.gradle b/plugins/redis-positions-storage/build.gradle index ceb41ce6..fcb99a1d 100644 --- a/plugins/redis-positions-storage/build.gradle +++ b/plugins/redis-positions-storage/build.gradle @@ -28,7 +28,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testCompile project(":tck") testCompile 'org.springframework.boot:spring-boot-test' testCompile 'org.testcontainers:testcontainers' diff --git a/plugins/rsocket-transport/build.gradle b/plugins/rsocket-transport/build.gradle index 270dcf86..e5afb54e 100644 --- a/plugins/rsocket-transport/build.gradle +++ b/plugins/rsocket-transport/build.gradle @@ -68,8 +68,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testCompile 'org.junit.jupiter:junit-jupiter-api' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testCompile project(":app") testCompile 'org.springframework.boot:spring-boot-test' diff --git a/plugins/schema/build.gradle b/plugins/schema/build.gradle index effde9ef..a4cb60e1 100644 --- a/plugins/schema/build.gradle +++ b/plugins/schema/build.gradle @@ -27,8 +27,6 @@ dependencies { testCompileOnly 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testCompile 'org.junit.jupiter:junit-jupiter-api' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testCompile project(":app") testCompile project(":tck") diff --git a/tck/build.gradle b/tck/build.gradle index 41d8f44d..c308c675 100644 --- a/tck/build.gradle +++ b/tck/build.gradle @@ -13,8 +13,6 @@ dependencies { compile 'org.assertj:assertj-core' compile 'io.projectreactor:reactor-test' compile 'org.awaitility:awaitility' - - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } tasks.test.dependsOn( diff --git a/testing/build.gradle b/testing/build.gradle index 430c2732..f8f2f67a 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -1,7 +1,3 @@ -test { - useJUnit() -} - dependencies { compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/testing/src/test/java/com/github/bsideup/liiklus/container/LiiklusContainerTest.java b/testing/src/test/java/com/github/bsideup/liiklus/container/LiiklusContainerTest.java index a6aaf06a..66cae186 100644 --- a/testing/src/test/java/com/github/bsideup/liiklus/container/LiiklusContainerTest.java +++ b/testing/src/test/java/com/github/bsideup/liiklus/container/LiiklusContainerTest.java @@ -1,29 +1,30 @@ package com.github.bsideup.liiklus.container; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.containers.Network; +import org.testcontainers.utility.DockerImageName; public class LiiklusContainerTest { - static final String LATEST_VERSION = "0.7.0"; - static KafkaContainer kafka = new KafkaContainer(); + static final String LATEST_VERSION = "0.10.0-rc1"; + static KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3")) + .withNetwork(Network.newNetwork()); static { kafka.start(); } @Test - public void shouldStartWithKafkaRecordStorage() { + void shouldStartWithKafkaRecordStorage() { try (LiiklusContainer liiklusContainer = new LiiklusContainer(LATEST_VERSION)) { - liiklusContainer.withKafka(kafka).start(); } } @Test - public void shouldStartDefaultMemoryRecordStorage() { + void shouldStartDefaultMemoryRecordStorage() { try (LiiklusContainer liiklusContainer = new LiiklusContainer(LATEST_VERSION)) { - liiklusContainer.start(); } }