Codacy report fix (#438)

* Use jacoco instead of cobertura

Author: Christoffer-Cortes

.travis.yml

@@ -43,6 +43,6 @@ jobs:
       name: report_coverage
       # Generating test coverage report and publishing to Codacy
       script:
-        - mvn cobertura:cobertura -B
+        - mvn jacoco:prepare-agent test jacoco:report -B
         - curl -Ls -o codacy-coverage-reporter-assembly.jar https://github.com/codacy/codacy-coverage-reporter/releases/download/6.0.2/codacy-coverage-reporter-6.0.2-assembly.jar
-        - java -jar codacy-coverage-reporter-assembly.jar report -l Java -r target/site/cobertura/coverage.xml
+        - java -jar codacy-coverage-reporter-assembly.jar report -l Java -r target/site/jacoco/jacoco.xml

pom.xml

@@ -426,7 +426,7 @@
                 <version>${springBootVersion}</version>
             </plugin>
 
-            <!-- PhoenixNAP RAML Code Generator plugin used to generate sources
+            <!-- PhoenixNAP RAML Code Generator plugin used to generate sources 
                 from raml -->
             <plugin>
                 <groupId>com.phoenixnap.oss</groupId>
@@ -504,9 +504,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
-                <!-- Surefire tests are split into parallel and sequential tests.
-                     If the test is sensitive to run in parallel it should be
-                     excluded from that execution and moved into sequential. -->
+                <!-- Surefire tests are split into parallel and sequential 
+                    tests. If the test is sensitive to run in parallel it should be excluded 
+                    from that execution and moved into sequential. -->
                 <executions>
                     <execution>
                         <id>default-test</id>
@@ -603,15 +603,29 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.7</version>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.5</version>
                 <configuration>
-                    <formats>
-                        <format>html</format>
-                        <format>xml</format>
-                    </formats>
+                    <excludes>
+                        <exclude>com/ericsson/ei/controller/model/*</exclude>
+                    </excludes>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>jacoco-initialize</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

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

@@ -93,7 +93,7 @@ public class SubscriptionNotificationSteps extends FunctionalTestBase {
     @Autowired
     private MongoDBHandler mongoDBHandler;
 
-    @InjectMocks
+    @Autowired
     private EmailSender emailSender;
 
     private SimpleSmtpServer smtpServer;
@@ -195,12 +195,13 @@ public void send_one_previous_event() throws Throwable {
         eventManager.sendEiffelEvents(EIFFEL_EVENTS_JSON_PATH, eventNamesToSend);
     }
 
-    @Then("^Then Notification email contains ('(.*?)') and ('(.*?)') values")
+    @Then("^Notification email contains '(.*)' and '(.*)' values")
     public void notification_email_contains_expected_values(String sender, String subject) {
         assertEquals(sender, emailSender.getSender());
         assertEquals(subject, emailSender.getSubject());
     }
 
+
     @Then("^Mail subscriptions were triggered$")
     public void mail_subscriptions_were_triggered() {
         LOGGER.debug("Verifying received emails.");

src/functionaltests/resources/features/subscriptionNotification.feature

@@ -8,7 +8,6 @@ Feature: Test Subscription Trigger
     And Subscriptions are created
     When I send Eiffel events
     And Wait for EI to aggregate objects
-    Then Notification email contains <our expected> values
     Then Mail subscriptions were triggered
     And Rest subscriptions were triggered
     When I send one previous event again

src/main/resources/application.properties

@@ -45,7 +45,7 @@ failed.notifications.collection.name: failed_notifications
 failed.notifications.collection.ttl: 600
 notification.retry: 3
 
-email.sender: noreply@ericsson.com
+email.sender: noreply@domain.com
 email.subject: Email Subscription Notification
 
 spring.mail.host: