Merge pull request #28 from jupiter-tools/improve-asserting-jms-message

Improve asserting jms message

Author: antkorwin

.travis.yml

@@ -8,8 +8,7 @@ script:
 addons:
   sonarcloud:
     organization: "antkorwin-github"
-    token:
-      secure: $SONAR_CLOUD_KEY
+    token: $SONAR_CLOUD_KEY
 
 after_success:
  - mvn cobertura:cobertura

pom.xml

@@ -65,10 +65,17 @@
         </repository>
     </distributionManagement>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>[2.0.0.RELEASE,2.1.6.RELEASE]</version>
+        <version>[2.0.0.RELEASE,2.3.0.RELEASE]</version>
         <relativePath/>
     </parent>
 
@@ -204,9 +211,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.10.4</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
+                    <source>1.8</source>
                 </configuration>
                 <executions>
                     <execution>

spring-test-activemq/pom.xml

@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>spring-test-activemq</artifactId>
-    <version>0.3</version>
+    <version>${parent.version}</version>
     <packaging>jar</packaging>
 
     <name>spring-test-activemq</name>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.jupiter-tools</groupId>
             <artifactId>spring-test-core</artifactId>
-            <version>0.3</version>
+            <version>${parent.version}</version>
         </dependency>
         <!-- CORE -->
 

spring-test-activemq/src/main/java/com/jupiter/tools/spring/test/activemq/extension/ActiveMqMessageExtension.java

@@ -4,15 +4,14 @@
 
 import com.jupiter.tools.spring.test.activemq.annotation.ExpectedMessage;
 import org.apache.activemq.command.ActiveMQTextMessage;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * Created on 22.01.2019.
  *
@@ -27,14 +26,17 @@ public void afterEach(ExtensionContext context) throws Exception {
 
         ExpectedMessage expectedMessage = context.getRequiredTestMethod()
                                                  .getAnnotation(ExpectedMessage.class);
-
         if(expectedMessage ==null){
             return;
         }
 
         jmsTemplate.setReceiveTimeout(expectedMessage.timeout());
         Message message = jmsTemplate.receive(expectedMessage.queue());
-        assertThat(((ActiveMQTextMessage) message).getText()).isEqualTo(expectedMessage.message());
+
+        if(message == null){
+            throw new Error(String.format("Expected but not received: %s", expectedMessage.message()));
+        }
+        Assertions.assertEquals(((ActiveMQTextMessage) message).getText(), expectedMessage.message());
     }
 
     @Override

spring-test-activemq/src/main/java/com/jupiter/tools/spring/test/activemq/extension/expected/list/messages/ExpectedMessagesMapper.java

@@ -22,7 +22,6 @@ public ExpectedMessagesOptions getOptions() {
         return ExpectedMessagesOptions.builder()
                                       .messagesFile(expectedMessages.messagesFile())
                                       .queue(expectedMessages.queue())
-                                      .ignoreUnexpected(expectedMessages.ignoreUnexpected())
                                       .timeout(expectedMessages.timeout())
                                       .build();
     }

spring-test-activemq/src/test/java/com/jupiter/tools/spring/test/activemq/extension/ActiveMqSmartDataSetTest.java

@@ -0,0 +1,72 @@
+package com.jupiter.tools.spring.test.activemq.extension;
+
+import java.util.Date;
+
+import com.jupiter.tools.spring.test.activemq.annotation.ExpectedMessages;
+import com.jupiter.tools.spring.test.activemq.annotation.meta.EnableActiveMqTest;
+import com.jupiter.tools.spring.test.activemq.extension.expected.Foo;
+import com.jupiter.tools.spring.test.activemq.extension.expected.FooWithBar;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.jms.core.JmsTemplate;
+import org.springframework.jms.support.converter.MappingJackson2MessageConverter;
+import org.springframework.jms.support.converter.MessageConverter;
+import org.springframework.jms.support.converter.MessageType;
+
+/**
+ * Created on 25.03.2019.
+ *
+ * @author Korovin Anatoliy
+ */
+@EnableActiveMqTest
+public class ActiveMqSmartDataSetTest {
+
+    @Autowired
+    private JmsTemplate jmsTemplate;
+
+    @Test
+    @ExpectedMessages(queue = "test-queue", messagesFile = "/datasets/expected_messages.json")
+    void testSendListOfMessages() {
+        jmsTemplate.convertAndSend("test-queue", new Foo("123"));
+        jmsTemplate.convertAndSend("test-queue", new Foo("456"));
+        jmsTemplate.convertAndSend("test-queue", new Foo("789"));
+    }
+
+    @Test
+    @ExpectedMessages(queue = "test-queue", messagesFile = "/datasets/expected_messages_with_js.json")
+    void testExpectedDataSetWithJavaScript() {
+        jmsTemplate.convertAndSend("test-queue", new Foo( String.valueOf(1+2+3+4+5)));
+    }
+
+    @Test
+    @ExpectedMessages(queue = "test-queue", messagesFile = "/datasets/expected_messages_with_date.json")
+    void testExpectedWithDate() {
+        // Arrange
+        FooWithBar fooWithBar = FooWithBar.builder()
+                                          // NOW
+                                          .time(new Date())
+                                          .build();
+        // Act
+        jmsTemplate.convertAndSend("test-queue", fooWithBar);
+    }
+
+    @TestConfiguration
+    public static class TestConfig {
+        @Bean
+        public Queue testQueue() {
+            return new Queue("test-queue");
+        }
+
+        @Bean // Serialize message content to json using TextMessage
+        public MessageConverter jacksonJmsMessageConverter() {
+            MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter();
+            converter.setTargetType(MessageType.TEXT);
+            converter.setTypeIdPropertyName("_type");
+            return converter;
+        }
+    }
+}

spring-test-activemq/src/test/java/com/jupiter/tools/spring/test/activemq/extension/expected/FooWithBar.java

@@ -0,0 +1,28 @@
+package com.jupiter.tools.spring.test.activemq.extension.expected;
+
+
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+
+/**
+ * Created on 07.02.2019
+ *
+ * @author Korovin Anatoliy
+ */
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FooWithBar {
+	Foo foo;
+	Bar bar;
+	FooWithBar child;
+	Date time;
+}

spring-test-activemq/src/test/java/com/jupiter/tools/spring/test/activemq/extension/expected/list/messages/ExpectedListOfMessagesTest.java

@@ -50,15 +50,6 @@ void sendMultipleTypes() {
         jmsTemplate.convertAndSend("test-queue", new Bar("CCC",3));
     }
 
-    @Test
-    @ExpectedMessages(queue = "test-queue", messagesFile = "/datasets/expected_messages.json", ignoreUnexpected = true)
-    void testIgnoreUnexpected() {
-        jmsTemplate.convertAndSend("test-queue", new Foo("UNEXPECTED"));
-        jmsTemplate.convertAndSend("test-queue", new Foo("123"));
-        jmsTemplate.convertAndSend("test-queue", new Foo("456"));
-        jmsTemplate.convertAndSend("test-queue", new Foo("789"));
-    }
-
     @TestConfiguration
     public static class TestConfig {
         @Bean

spring-test-activemq/src/test/resources/datasets/expected_messages_with_date.json

@@ -0,0 +1,7 @@
+{
+  "com.jupiter.tools.spring.test.activemq.extension.expected.FooWithBar": [
+    {
+      "time": "date-match:[NOW]"
+    }
+  ]
+}

spring-test-activemq/src/test/resources/datasets/expected_messages_with_js.json

@@ -0,0 +1,7 @@
+{
+  "com.jupiter.tools.spring.test.activemq.extension.expected.Foo": [
+    {
+      "value":"js-match: value == 1+2+3+4+5"
+    }
+  ]
+}