Refactor InformSubscriber, missed notification for emails (#301)

* Missed notifications is now saved when emails fails to be sent.
* Serveral new classes created to split the InformSubscriber class.
* Several new test has been created to test the new classes.

Author: Anders Breid

.travis.yml

@@ -54,8 +54,8 @@ jobs:
         #
         # Also important that the first test to be run is a Spring Boot Test since spring boot also downloads
         # another version of embedded mongo db to avoid race conditions between Spring Boot tests
-        - mvn -DsomeModule.test.includes="**/QueryServiceTest.java" test -DskipITs -B
-        - mvn -DsomeModule.test.excludes="**/QueryServiceTest.java" test -DskipITs -B
+        - mvn -Dsurefire.rerunFailingTestsCount=2 -DsomeModule.test.includes="**/QueryServiceTest.java" test -DskipITs -B
+        - mvn -Dsurefire.rerunFailingTestsCount=2 -DsomeModule.test.excludes="**/QueryServiceTest.java" test -DskipITs -B
     - stage: test
       name: integrationTests
       script:

pom.xml

@@ -74,7 +74,7 @@
         <dependency>
             <groupId>com.github.eiffel-community</groupId>
             <artifactId>eiffel-commons</artifactId>
-            <version>0.0.12</version>
+            <version>0.0.13</version>
         </dependency>
 
         <dependency>

src/functionaltests/java/com/ericsson/ei/subscriptions/trigger/SubscriptionTriggerSteps.java renamed to src/functionaltests/java/com/ericsson/ei/notifications/trigger/SubscriptionNotificationSteps.java

@@ -0,0 +1,14 @@
+package com.ericsson.ei.notifications.trigger;
+
+import org.junit.runner.RunWith;
+
+import cucumber.api.CucumberOptions;
+import cucumber.api.junit.Cucumber;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(features = "src/functionaltests/resources/features/subscriptionNotification.feature", glue = {
+        "com.ericsson.ei.notifications.trigger" }, plugin = {
+                "html:target/cucumber-reports/TestSubscriptionNotificationRunner" })
+public class TestSubscriptionNotificationRunner {
+
+}

src/functionaltests/java/com/ericsson/ei/notifications/trigger/TestSubscriptionNotificationRunner.java

@@ -27,7 +27,7 @@
 
 import com.ericsson.ei.exception.AuthenticationException;
 import com.ericsson.ei.handlers.MongoDBHandler;
-import com.ericsson.ei.subscription.InformSubscriber;
+import com.ericsson.ei.notifications.InformSubscriber;
 import com.ericsson.ei.utils.FunctionalTestBase;
 import com.ericsson.ei.utils.HttpRequest;
 import com.ericsson.ei.utils.HttpRequest.HttpMethod;
@@ -41,11 +41,14 @@
 import cucumber.api.java.en.When;
 
 @Ignore
-@TestPropertySource(properties = { "notification.ttl.value:1", "aggregated.collection.ttlValue:1",
-        "notification.failAttempt:1", "spring.data.mongodb.database: TestTTLSteps",
+@TestPropertySource(properties = {
+        "notification.ttl.value:1",
+        "aggregated.collection.ttlValue:1",
+        "notification.failAttempt:1",
+        "spring.data.mongodb.database: TestTTLSteps",
+        "missedNotificationDataBaseName: TestTTLSteps-missedNotifications",
         "rabbitmq.exchange.name: TestTTLSteps-exchange",
-        "rabbitmq.consumerName: TestTTLStepsConsumer",
-        "missedNotificationDataBaseName: TestTTLStepsMissedNotification" })
+        "rabbitmq.consumerName: TestTTLStepsConsumer"})
 public class TestTTLSteps extends FunctionalTestBase {
     private static final Logger LOGGER = LoggerFactory.getLogger(TestTTLSteps.class);
     private static final String BASE_URL = "localhost";

src/functionaltests/java/com/ericsson/ei/notifications/ttl/TestTTLSteps.java

@@ -32,9 +32,11 @@
 import cucumber.api.java.en.Then;
 
 @Ignore
-@TestPropertySource(properties = { "spring.data.mongodb.database: QueryAggregatedObjectsTestSteps",
+@TestPropertySource(properties = {
+        "spring.data.mongodb.database: QueryAggregatedObjectsTestSteps",
+        "missedNotificationDataBaseName: QueryAggregatedObjectsTestSteps-missedNotifications",
         "rabbitmq.exchange.name: QueryAggregatedObjectsTestSteps-exchange",
-        "rabbitmq.consumerName: rabbitmq.consumerName: QueryAggregatedObjectsTestStepsConsumer" })
+        "rabbitmq.consumerName: QueryAggregatedObjectsTestStepsConsumer" })
 @AutoConfigureMockMvc
 public class QueryAggregatedObjectsTestSteps extends FunctionalTestBase {
 

src/functionaltests/java/com/ericsson/ei/query/QueryAggregatedObjectsTestSteps.java

@@ -35,9 +35,11 @@
 import cucumber.api.java.en.When;
 
 @Ignore
-@TestPropertySource(properties = { "spring.data.mongodb.database: RabbitMQTestConnectionSteps",
+@TestPropertySource(properties = {
+        "spring.data.mongodb.database: RabbitMQTestConnectionSteps",
+        "missedNotificationDataBaseName: RabbitMQTestConnectionSteps-missedNotifications",
         "rabbitmq.exchange.name: RabbitMQTestConnectionSteps-exchange",
-        "rabbitmq.consumerName: rabbitmq.consumerName: RabbitMQTestConnectionStepsConsumer" })
+        "rabbitmq.consumerName: RabbitMQTestConnectionStepsConsumer" })
 public class RabbitMQTestConnectionSteps extends FunctionalTestBase {
 
     @Value("${rabbitmq.port}")

src/functionaltests/java/com/ericsson/ei/rabbitmq/RabbitMQTestConnectionSteps.java

@@ -26,9 +26,11 @@
 import cucumber.api.java.en.When;
 
 @Ignore
-@TestPropertySource(properties = { "spring.data.mongodb.database: RuleCheckSteps",
+@TestPropertySource(properties = {
+        "spring.data.mongodb.database: RuleCheckSteps",
+        "missedNotificationDataBaseName: RuleCheckSteps-missedNotifications",
         "rabbitmq.exchange.name: RuleCheckSteps-exchange",
-        "rabbitmq.consumerName: rabbitmq.consumerName: RuleCheckStepsConsumer" })
+        "rabbitmq.consumerName: RuleCheckStepsConsumer" })
 public class RuleCheckSteps extends FunctionalTestBase {
 
     private static final String TEST_RESOURCES_PATH = "src/test/resources";

src/functionaltests/java/com/ericsson/ei/rules/RuleCheckSteps.java

@@ -7,6 +7,6 @@
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/functionaltests/resources/features/ruleCheck.feature", glue = {
         "com.ericsson.ei.rules" }, plugin = { "pretty", "html:target/cucumber-reports/TestRuleCheckRunner" })
-public class TestRuleCheckRunner {
+public class RuleCheckTestRunner {
 
 }

src/functionaltests/java/com/ericsson/ei/rules/TestRuleCheckRunner.java renamed to src/functionaltests/java/com/ericsson/ei/rules/RuleCheckTestRunner.java

@@ -21,9 +21,11 @@
 import cucumber.api.java.en.Then;
 
 @Ignore
-@TestPropertySource(properties = { "spring.data.mongodb.database: RulesHandlerSteps",
+@TestPropertySource(properties = {
+        "spring.data.mongodb.database: RulesHandlerSteps",
+        "missedNotificationDataBaseName: RulesHandlerSteps-missedNotifications",
         "rabbitmq.exchange.name: RulesHandlerSteps-exchange",
-        "rabbitmq.consumerName: rabbitmq.consumerName: RulesHandlerStepsConsumer" })
+        "rabbitmq.consumerName: RulesHandlerStepsConsumer" })
 public class RulesHandlerSteps {
 
     private ClientAndServer restServer;