Merge pull request #5 from majusko/feature/increase-test-coverage

Feature/increase test coverage

Author: majusko

pom.xml

@@ -65,6 +65,7 @@
 					<excludes>
 						<exclude>**/*Properties.*</exclude>
 						<exclude>**/*Configuration.*</exclude>
+						<exclude>**/*Application.*</exclude>
 						<exclude>**/mock/**/*</exclude>
 					</excludes>
 				</configuration>

src/main/java/io/github/majusko/pulsar/producer/ProducerCollector.java

@@ -2,6 +2,7 @@
 
 import io.github.majusko.pulsar.annotation.PulsarProducer;
 import io.github.majusko.pulsar.collector.ProducerHolder;
+import io.github.majusko.pulsar.constant.Serialization;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.PulsarClientException;
@@ -44,14 +45,21 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 
     private Producer<?> buildProducer(ProducerHolder holder) {
         try {
-            return pulsarClient.newProducer(Schema.JSON(holder.getClazz()))
+            return pulsarClient.newProducer(getSchema(holder))
                 .topic(holder.getTopic())
                 .create();
         } catch(PulsarClientException e) {
             throw new RuntimeException("TODO Custom Exception!", e);
         }
     }
 
+    private <T> Schema<?> getSchema(ProducerHolder holder) throws RuntimeException {
+        if (holder.getSerialization().equals(Serialization.JSON)) {
+            return Schema.JSON(holder.getClazz());
+        }
+        throw new RuntimeException("TODO custom runtime exception");
+    }
+
     Map<String, Producer> getProducers() {
         return producers;
     }

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

@@ -0,0 +1,12 @@
+package io.github.majusko.pulsar;
+
+public class MyMsg2 {
+    private String data;
+    public MyMsg2(String data) {
+        this.data = data;
+    }
+
+    public String getData() {
+        return data;
+    }
+}

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

@@ -1,7 +1,16 @@
 package io.github.majusko.pulsar;
 
+import io.github.majusko.pulsar.collector.ConsumerCollector;
+import io.github.majusko.pulsar.collector.ConsumerHolder;
+import io.github.majusko.pulsar.constant.Serialization;
+import io.github.majusko.pulsar.consumer.ConsumerBuilder;
+import io.github.majusko.pulsar.producer.ProducerFactory;
 import io.github.majusko.pulsar.producer.PulsarTemplate;
+import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.shade.org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Assert;
+import org.junit.Before;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,17 +19,73 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @ActiveProfiles("test")
 @Import(TestProducerConfiguration.class)
 class PulsarJavaSpringBootStarterApplicationTests {
 
-	@Autowired
-	private PulsarTemplate<MyMsg> testProducerConfiguration;
+    @Autowired
+    private ConsumerBuilder consumerBuilder;
+
+    @Autowired
+    private ConsumerCollector consumerCollector;
+
+    @Autowired
+    private ProducerFactory producerFactory;
+
+    @Autowired
+    private PulsarTemplate<MyMsg> producer;
+
+    @Test
+    void testProducerSendMethod() throws PulsarClientException {
+        producer.send("topic-one", new MyMsg("bb"));
+    }
+
+    @Before
+    public void init() throws InterruptedException {
+        Thread.sleep(100);
+    }
+
+    @Test
+    void testConsumerRegistration1() throws Exception {
+        final List<Consumer> consumers = consumerBuilder.getConsumers();
+
+        Assert.assertEquals(1, consumers.size());
+
+        final Consumer consumer = consumers.stream().findFirst().orElseThrow(Exception::new);
+
+        Assert.assertNotNull(consumer);
+        Assert.assertEquals("mock-topic", consumer.getTopic());
+    }
+
+    @Test
+    void testConsumerRegistration2() throws Exception {
+        final Class<TestConsumerConfiguration> clazz = TestConsumerConfiguration.class;
+        final String descriptor = clazz.getName() + "#" + clazz.getDeclaredMethods()[0].getName();
+        final ConsumerHolder consumerHolder = consumerCollector.getConsumer(descriptor).orElseThrow(Exception::new);
+
+        Assert.assertNotNull(consumerHolder);
+        Assert.assertEquals("mock-topic", consumerHolder.getAnnotation().topic());
+        Assert.assertEquals(TestConsumerConfiguration.class, consumerHolder.getBean().getClass());
+        Assert.assertEquals("mockTheListener", consumerHolder.getHandler().getName());
+    }
+
+    @Test
+    void testProducerRegistration() {
+
+        final Map<String, ImmutablePair<Class<?>, Serialization>> topics = producerFactory.getTopics();
+
+        Assert.assertEquals(2, topics.size());
+
+        final Set<String> topicNames = new HashSet<>(topics.keySet());
 
-	@Test
-	void contextLoads() throws PulsarClientException {
-		testProducerConfiguration.send("aa", new MyMsg("bb"));
-	}
+        Assert.assertTrue(topicNames.contains("topic-one"));
+        Assert.assertTrue(topicNames.contains("topic-two"));
+    }
 }

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

@@ -0,0 +1,15 @@
+package io.github.majusko.pulsar;
+
+import io.github.majusko.pulsar.annotation.PulsarConsumer;
+import io.github.majusko.pulsar.constant.Serialization;
+import org.junit.Assert;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TestConsumerConfiguration {
+
+    @PulsarConsumer(topic = "mock-topic", clazz = MyMsg.class, serialization = Serialization.JSON)
+    public void mockTheListener(MyMsg myMsg) {
+        Assert.assertNotNull(myMsg);
+    }
+}

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

@@ -1,5 +1,6 @@
 package io.github.majusko.pulsar;
 
+import io.github.majusko.pulsar.constant.Serialization;
 import io.github.majusko.pulsar.producer.ProducerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -10,6 +11,7 @@ public class TestProducerConfiguration {
     @Bean
     public ProducerFactory producerFactory() {
         return new ProducerFactory()
-            .addProducer("aa", MyMsg.class);
+            .addProducer("topic-one", MyMsg.class)
+            .addProducer("topic-two", MyMsg2.class, Serialization.JSON);
     }
 }