Add codacy configuration (#266)

* Add codacy configuration
* Add coverage in .travis, add cobertura plugin
* Add badgers

Closes #247

Author: Anders Breid

.codacy.yaml

@@ -0,0 +1,12 @@
+exclude_paths:
+  - '.bundle/**'
+  - 'spec/**/*'
+  - 'benchmarks/**/*'
+  - '*.min.js'
+  - '**/assets/**/*'
+  - '**/tests/**'
+  - '**/integrationtest/**/*'
+  - 'wiki/**'
+  - '.github/**'
+  - 'CODE_OF_CONDUCT.md'
+  - 'CONTRIBUTING.md'

.travis.yml

@@ -15,53 +15,29 @@ git:
 env:
   - EI_BACKEND_PORT=8099 JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
 
-
-# Using default 'test' stage for our tests, and only running deploy stage
-# (after merge) on master branch
-stages:
-  - test
-  - name: deploy
-    if: branch = master
-
-
 before_install:
   - sudo apt-get update
   - sudo apt-get install -y openjdk-8-jdk
   - export PATH=$(echo "$PATH" | sed -e 's/:\/usr\/local\/lib\/jvm\/openjdk11\/bin//')
   - export PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH
   - export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
   - java -version
-  - |
-    if [[ $TRAVIS_JOB_NAME = integrationTests ]]; then
-      source src/main/docker/env.bash
-      docker-compose -f src/main/docker/docker-compose.yml up -d eiffel-er mongodb rabbitmq jenkins mail-server ldap ldap-seed ldap2 ldap2-seed
-    fi
 
+# Using default 'test' stage for our tests, and only running deploy stage
+# (after merge) on master branch
+stages:
+  - test
+  - name: report_coverage
+    if: branch = master AND type != pull_request
+  - name: deploy
+    if: branch = master AND type != pull_request
 
 # Only used before integrationTests
-install:
-  - git clone --depth=50 --branch=master https://github.com/eiffel-community/eiffel-intelligence.git
-  - cd eiffel-intelligence
-  - chmod +x pom.xml
-  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
-  - export EIFFEL_WAR=$(ls target/*.war)
-  - java -Dspring.config.additional-location=file:../src/integrationtest/resources/integration-test.properties -Dserver.port=${EI_BACKEND_PORT} -jar ${EIFFEL_WAR} &
-  - cd ..
-
-after_script:
-  - |
-    if [[ $TRAVIS_JOB_NAME = integrationTests ]]; then
-      docker-compose -f src/main/docker/docker-compose.yml down
-      fuser -k ${EI_BACKEND_PORT}/tcp
-    fi
-
-
 # Generate site documentation using mvn site plugin
 before_deploy:
   - rm -rf docs
   - mvn site -B
 
-
 # List of jobs to run, tied to specific stages
 jobs:
   include:
@@ -78,19 +54,43 @@ jobs:
         - export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
         - java -version
         - mvn test -B
-      after_script: skip
     - stage: test
       name: integrationTests
+      before_script:
+        - source src/main/docker/env.bash
+        - docker-compose -f src/main/docker/docker-compose.yml up -d eiffel-er mongodb rabbitmq jenkins mail-server ldap ldap-seed ldap2 ldap2-seed
+        - echo 'Sleeping till Jenkins is up.'
+        - timeout 90 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' $HOST:$JENKINS_PORT/login)" != "200" ]]; do sleep 5; done' || false
+        - git clone --depth=50 --branch=master https://github.com/eiffel-community/eiffel-intelligence.git
+        - cd eiffel-intelligence
+        - chmod +x pom.xml
+        - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+        - export EIFFEL_WAR=$(ls target/*.war)
+        - java -Dspring.config.additional-location=file:../src/integrationtest/resources/integration-test.properties -Dserver.port=${EI_BACKEND_PORT} -jar ${EIFFEL_WAR} &
+        - cd ..
+        - echo 'Sleeping till EI is up.'
+        - timeout 30 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' $HOST:$EI_BACKEND_PORT/status)" != "200" ]]; do sleep 5; done' || false
       script:
         - "mvn verify -P integrationTest -DskipUTs -Dei.backend.instances.list.json.content=\"[{ 'contextPath': '', 'port': '${EI_BACKEND_PORT}', 'name': 'EI-Backend-1', 'host': 'localhost', 'https': false, 'defaultBackend': true}]\" -B"
+      after_script:
+        - docker-compose -f src/main/docker/docker-compose.yml down
+        - fuser -k ${EI_BACKEND_PORT}/tcp
     - stage: deploy
       name: deployGitHubPages
       before_install: skip    # do not run again
       install: skip           # do not run again
       script: skip            # do not run default test scripts
-      after_script: skip      # do not run again
       deploy:
         provider: pages
         skip_cleanup: true
         github-token: $GITHUB_TOKEN
         local_dir: docs/
+    - stage: report_coverage
+      name: report_coverage
+      before_install: skip
+      install: skip
+      # Generating test coverage report and publishing to Codacy
+      script:
+        - mvn cobertura:cobertura -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

README.md

@@ -18,46 +18,46 @@
 <img src="./images/eiffel-intelligence-logo.png" alt="Eiffel Intelligence" width="350"/>
 
 [![Build Status](https://travis-ci.org/eiffel-community/eiffel-intelligence-frontend.svg?branch=master)](https://travis-ci.org/eiffel-community/eiffel-intelligence-frontend)
-[![Coverage Status](https://coveralls.io/repos/github/eiffel-community/eiffel-intelligence-frontend/badge.svg?branch=master)](https://coveralls.io/github/eiffel-community/eiffel-intelligence-frontend?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/bbbaaa716e4542188ea66b9104e0e9b6)](https://www.codacy.com/manual/eiffel-intelligence-maintainers/eiffel-intelligence-frontend?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=eiffel-community/eiffel-intelligence-frontend&amp;utm_campaign=Badge_Grade)
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/bbbaaa716e4542188ea66b9104e0e9b6)](https://www.codacy.com/app/eiffel-intelligence-maintainers/eiffel-intelligence-frontend?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=eiffel-community/eiffel-intelligence-frontend&amp;utm_campaign=Badge_Coverage)
 [![](https://jitpack.io/v/eiffel-community/eiffel-intelligence-frontend.svg)](https://jitpack.io/#eiffel-community/eiffel-intelligence-frontend)
 
-
 # Eiffel Intelligence Frontend
 Eiffel Intelligence Frontend is part of the [Eiffel Intelligence](https://github.com/eiffel-community/eiffel-intelligence) implementation of the [Eiffel Protocol](https://github.com/eiffel-community/eiffel). Eiffel Intelligence Frontend allows the configuration of subscription and aggregation rules in Eiffel Intelligence.
 
 Potential future features for Eiffel Intelligence Frontend include:
-* Real time testing of aggregation models for new bounded contexts
-* Web hooks
-* Much more
+*  Real time testing of aggregation models for new bounded contexts
+*  Web hooks
+*  Much more
 
 ## Supported Browsers
-* Edge 17.17619 or later
-* Chrome 63.0.3239.132 or later
-* Firefox 60.2.0 or later
+*  Edge 17.17619 or later
+*  Chrome 63.0.3239.132 or later
+*  Firefox 60.2.0 or later
 
 ## Compatibility
 To see which versions of back-end and front-end that work together you can check the [Compatibility](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/compatibility.md) page.
 
-# About this repository
+## About this repository
 The contents of this repository are licensed under the [Apache License 2.0](./LICENSE).
 
 To get involved, please see [Code of Conduct](./CODE_OF_CONDUCT.md) and [contribution guidelines](./CONTRIBUTING.md).
 
-# About Eiffel
+## About Eiffel
 This repository forms part of the Eiffel Community. Eiffel is a protocol for technology agnostic machine-to-machine communication in continuous integration and delivery pipelines, aimed at securing scalability, flexibility and traceability. Eiffel is based on the concept of decentralized real time messaging, both to drive the continuous integration and delivery system and to document it.
 
 Visit [Eiffel Community](https://eiffel-community.github.io) to get started and get involved.
 
-# Documentation
+## Documentation
 
-1. [**Introduction**](./wiki/markdown/index.md)
-1. [**Running Eiffel-Intelligence front-end**](./wiki/markdown/running-eiffel-intelligence-frontend.md)
+1.  [**Introduction**](./wiki/markdown/index.md)
+1.  [**Running Eiffel-Intelligence front-end**](./wiki/markdown/running-eiffel-intelligence-frontend.md)
     -  [**Run in Docker**](./wiki/markdown/docker.md)
     -  [**Configuration**](./wiki/markdown/configuration.md)
-1. [**GUI Overview**](./wiki/markdown/GUI-overview.md)
-1. [**Subscription Handling**](./wiki/markdown/subscription-handling.md)
+1.  [**GUI Overview**](./wiki/markdown/GUI-overview.md)
+1.  [**Subscription Handling**](./wiki/markdown/subscription-handling.md)
     -  [**Add Subscription**](./wiki/markdown/add-subscription.md)
-1. [**Test Rules User Guide**](./wiki/markdown/test-rules.md)
-1. [**CURL examples**](./wiki/markdown/curl-examples.md)
+1.  [**Test Rules User Guide**](./wiki/markdown/test-rules.md)
+1.  [**CURL examples**](./wiki/markdown/curl-examples.md)
 
-**Eiffel Intelligence frontend documentation** [**can be found here**](https://eiffel-community.github.io/eiffel-intelligence-frontend/)
+[**Eiffel Intelligence frontend documentation can be found here**](https://eiffel-community.github.io/eiffel-intelligence-frontend/)

pom.xml

@@ -251,6 +251,7 @@
                                 <source>src/integrationtest/resources</source>
                                 <source>src/systemtest/java</source>
                                 <source>src/systemtest/resources</source>
+                                <source>src/main/docker</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -278,7 +279,7 @@
                     </includes>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -326,6 +327,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <formats>
+                        <format>html</format>
+                        <format>xml</format>
+                    </formats>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>

src/functionaltest/java/com/ericsson/ei/frontend/TestSubscriptionCRUD.java

@@ -21,7 +21,7 @@
 
 import com.google.gson.JsonParser;
 
-public class TestSubscriptionCRUD extends SeleniumBaseClass {
+public class TestSubscriptionCRUD extends TestBaseClass {
     private static final String SUBSCRIPTION_ENDPOINT = "/subscriptions";
     private static final String SUBSCRIPTION_DELETE_ENDPOINT = "/subscriptions/Subscription_1";
     private static final String SUBSCRIPTION_FILE_PATH = "src/functionaltest/resources/responses/subscription.json";
@@ -39,9 +39,8 @@ public class TestSubscriptionCRUD extends SeleniumBaseClass {
 
     private MockServerClient mockServerClient;
 
-    @Override
     @Before
-    public void init() throws Exception {
+    public void before() throws Exception {
         int serverPort = mockServerRule.getPort();
         setBackendInstance("test", "localhost", serverPort, "", false);