Skip to content

Commit 5af4d09

Browse files
authored
Merge pull request #50 from majusko/hotfix/wrong-condition-in-tests
Fixed the test
2 parents 69cd656 + e51879f commit 5af4d09

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<maven.compiler.target>1.8</maven.compiler.target>
2121
<maven.compiler.source>1.8</maven.compiler.source>
2222
<apache.pulsar.client.version>2.6.1</apache.pulsar.client.version>
23-
<testcontainers.version>1.14.3</testcontainers.version>
23+
<testcontainers.version>1.15.0-rc2</testcontainers.version>
2424
<junit-jupiter.version>5.7.0</junit-jupiter.version>
2525
<awaitility.version>4.0.3</awaitility.version>
2626
<reactor.core.version>3.4.0</reactor.core.version>

src/test/java/io/github/majusko/pulsar/PulsarJavaSpringBootStarterApplicationTests.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
import org.testcontainers.junit.jupiter.Testcontainers;
2222

2323
import java.time.Duration;
24-
import java.util.HashSet;
25-
import java.util.List;
26-
import java.util.Map;
27-
import java.util.Set;
24+
import java.util.*;
2825
import java.util.concurrent.atomic.AtomicBoolean;
26+
import java.util.stream.Collectors;
2927

3028
import static org.awaitility.Awaitility.await;
3129

@@ -84,13 +82,15 @@ void testConsumerRegistration1() throws Exception {
8482
@Test
8583
void testConsumerRegistration2() {
8684
final Class<TestConsumers> clazz = TestConsumers.class;
87-
final String descriptor = clazz.getName() + clazz.getMethods()[0].getName();
88-
final ConsumerHolder consumerHolder = consumerCollector.getConsumer(descriptor).orElse(null);
89-
90-
Assertions.assertNotNull(consumerHolder);
91-
Assertions.assertEquals("topic-one", consumerHolder.getAnnotation().topic());
92-
Assertions.assertEquals(TestConsumers.class, consumerHolder.getBean().getClass());
93-
Assertions.assertEquals("topicOneListener", consumerHolder.getHandler().getName());
85+
final List<ConsumerHolder> consumerHolders = Arrays.stream(clazz.getMethods())
86+
.map($ -> consumerCollector.getConsumer(clazz.getName() + $.getName()).orElse(null))
87+
.collect(Collectors.toList());
88+
89+
Assertions.assertNotNull(consumerHolders);
90+
Assertions.assertTrue(consumerHolders.stream().anyMatch($ -> $.getAnnotation().topic().equals("topic-one")));
91+
Assertions.assertTrue(consumerHolders.stream().anyMatch($ -> $.getAnnotation().topic().equals("topic-for-error")));
92+
Assertions.assertTrue(consumerHolders.stream().anyMatch($ -> $.getBean().getClass().equals(TestConsumers.class)));
93+
Assertions.assertTrue(consumerHolders.stream().anyMatch($ -> $.getHandler().getName().equals("topicOneListener")));
9494
}
9595

9696
@Test

0 commit comments

Comments
 (0)