projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge der überarbeiteten Compose-Konfiguration ('deserialization')
[demos/kafka/training]
/
src
/
test
/
java
/
de
/
juplo
/
kafka
/
ApplicationTests.java
diff --git
a/src/test/java/de/juplo/kafka/ApplicationTests.java
b/src/test/java/de/juplo/kafka/ApplicationTests.java
index
92074ff
..
6c25bcd
100644
(file)
--- a/
src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/
src/test/java/de/juplo/kafka/ApplicationTests.java
@@
-15,6
+15,7
@@
import org.springframework.boot.test.context.ConfigDataApplicationContextInitial
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
+import org.springframework.kafka.support.serializer.JsonSerializer;
import org.springframework.kafka.test.context.EmbeddedKafka;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.kafka.test.context.EmbeddedKafka;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@
-24,17
+25,15
@@
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.function.BiConsumer;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Consumer;
-import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static de.juplo.kafka.ApplicationTests.PARTITIONS;
import static de.juplo.kafka.ApplicationTests.TOPIC;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static de.juplo.kafka.ApplicationTests.PARTITIONS;
import static de.juplo.kafka.ApplicationTests.TOPIC;
-import static org.assertj.core.api.Assertions.
assertThat
;
+import static org.assertj.core.api.Assertions.
*
;
import static org.awaitility.Awaitility.*;
import static org.awaitility.Awaitility.*;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertThrows;
@SpringJUnitConfig(initializers = ConfigDataApplicationContextInitializer.class)
@SpringJUnitConfig(initializers = ConfigDataApplicationContextInitializer.class)
@@
-58,7
+57,7
@@
class ApplicationTests
@Autowired
KafkaProducer<String, Bytes> kafkaProducer;
@Autowired
@Autowired
KafkaProducer<String, Bytes> kafkaProducer;
@Autowired
- KafkaConsumer<String,
Long
> kafkaConsumer;
+ KafkaConsumer<String,
ClientMessage
> kafkaConsumer;
@Autowired
KafkaConsumer<Bytes, Bytes> offsetConsumer;
@Autowired
@Autowired
KafkaConsumer<Bytes, Bytes> offsetConsumer;
@Autowired
@@
-66,11
+65,11
@@
class ApplicationTests
@Autowired
ExecutorService executor;
@Autowired
ExecutorService executor;
- Consumer<ConsumerRecord<String,
Long
>> testHandler;
- EndlessConsumer<String,
Long
> endlessConsumer;
+ Consumer<ConsumerRecord<String,
ClientMessage
>> testHandler;
+ EndlessConsumer<String,
ClientMessage
> endlessConsumer;
Map<TopicPartition, Long> oldOffsets;
Map<TopicPartition, Long> newOffsets;
Map<TopicPartition, Long> oldOffsets;
Map<TopicPartition, Long> newOffsets;
- Set<ConsumerRecord<String,
Long
>> receivedRecords;
+ Set<ConsumerRecord<String,
ClientMessage
>> receivedRecords;
/** Tests methods */
/** Tests methods */
@@
-79,7
+78,7
@@
class ApplicationTests
@Order(1) // << The poistion pill is not skipped. Hence, this test must run first
void commitsCurrentOffsetsOnSuccess() throws ExecutionException, InterruptedException
{
@Order(1) // << The poistion pill is not skipped. Hence, this test must run first
void commitsCurrentOffsetsOnSuccess() throws ExecutionException, InterruptedException
{
- send100Messages(
i -> new Bytes(valueSerializer.serialize(TOPIC, i)
));
+ send100Messages(
(key, counter) -> serialize(key, counter
));
await("100 records received")
.atMost(Duration.ofSeconds(30))
await("100 records received")
.atMost(Duration.ofSeconds(30))
@@
-93,20
+92,19
@@
class ApplicationTests
compareToCommitedOffsets(newOffsets);
});
compareToCommitedOffsets(newOffsets);
});
- assertThrows(
- IllegalStateException.class,
- () -> endlessConsumer.exitStatus(),
- "Consumer should still be running");
+ assertThatExceptionOfType(IllegalStateException.class)
+ .isThrownBy(() -> endlessConsumer.exitStatus())
+ .describedAs("Consumer should still be running");
}
@Test
@Order(2)
void commitsOffsetOfErrorForReprocessingOnError()
{
}
@Test
@Order(2)
void commitsOffsetOfErrorForReprocessingOnError()
{
- send100Messages(
counter
->
+ send100Messages(
(key, counter)
->
counter == 77
? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
counter == 77
? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
- :
new Bytes(valueSerializer.serialize(TOPIC, counter)
));
+ :
serialize(key, counter
));
await("Consumer failed")
.atMost(Duration.ofSeconds(30))
await("Consumer failed")
.atMost(Duration.ofSeconds(30))
@@
-126,9
+124,9
@@
class ApplicationTests
.describedAs("Received not all sent events")
.isLessThan(100);
.describedAs("Received not all sent events")
.isLessThan(100);
- assert
DoesNotThrow(
- () -> endlessConsumer.exitStatus(),
-
"Consumer should not be running"
);
+ assert
ThatNoException()
+ .describedAs("Consumer should not be running")
+
.isThrownBy(() -> endlessConsumer.exitStatus()
);
assertThat(endlessConsumer.exitStatus())
.describedAs("Consumer should have exited abnormally")
.containsInstanceOf(RecordDeserializationException.class);
assertThat(endlessConsumer.exitStatus())
.describedAs("Consumer should have exited abnormally")
.containsInstanceOf(RecordDeserializationException.class);
@@
-188,7
+186,7
@@
class ApplicationTests
}
}
- void send100Messages(
Function<
Long, Bytes> messageGenerator)
+ void send100Messages(
BiFunction<Integer,
Long, Bytes> messageGenerator)
{
long i = 0;
{
long i = 0;
@@
-196,7
+194,7
@@
class ApplicationTests
{
for (int key = 0; key < 10; key++)
{
{
for (int key = 0; key < 10; key++)
{
- Bytes value = messageGenerator.apply(++i);
+ Bytes value = messageGenerator.apply(
key,
++i);
ProducerRecord<String, Bytes> record =
new ProducerRecord<>(
ProducerRecord<String, Bytes> record =
new ProducerRecord<>(
@@
-205,6
+203,7
@@
class ApplicationTests
Integer.toString(key%2),
value);
Integer.toString(key%2),
value);
+ record.headers().add("__TypeId__", "message".getBytes());
kafkaProducer.send(record, (metadata, e) ->
{
if (metadata != null)
kafkaProducer.send(record, (metadata, e) ->
{
if (metadata != null)
@@
-229,6
+228,14
@@
class ApplicationTests
}
}
}
}
+ Bytes serialize(Integer key, Long value)
+ {
+ ClientMessage message = new ClientMessage();
+ message.setClient(key.toString());
+ message.setMessage(value.toString());
+ return new Bytes(valueSerializer.serialize(TOPIC, message));
+ }
+
@BeforeEach
public void init()
@BeforeEach
public void init()
@@
-245,7
+252,7
@@
class ApplicationTests
newOffsets.put(tp, offset - 1);
});
newOffsets.put(tp, offset - 1);
});
- Consumer<ConsumerRecord<String,
Long
>> captureOffsetAndExecuteTestHandler =
+ Consumer<ConsumerRecord<String,
ClientMessage
>> captureOffsetAndExecuteTestHandler =
record ->
{
newOffsets.put(
record ->
{
newOffsets.put(
@@
-285,9
+292,9
@@
class ApplicationTests
public static class Configuration
{
@Bean
public static class Configuration
{
@Bean
- Serializer<
Long
> serializer()
+ Serializer<
ClientMessage
> serializer()
{
{
- return new
LongSerializer
();
+ return new
JsonSerializer<>
();
}
@Bean
}
@Bean