Fix code coverage (#167)

* Test coverage fix * Test coverage fix * Test coverage fix * Test coverage fix * Test coverage fix * Test coverage fix * Test coverage fix * Test coverage fix * Test coverage fix * Fix multiple cucumber scenarios. Persistent webdriver session * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Test run integration tests * Add caching back * Add caching back * Add caching back * Add caching back * Add caching back * Add caching back * Add caching back * Add caching back * Add caching back * Add caching back * Add caching back * Fix some tests * Fix some tests * Fix some tests * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage. * Test new fixes for coverage.
Arquisoft · Apr 5, 2024 · e7e1c19 · e7e1c19
1 parent 62477aa
commit e7e1c19
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 196 deletions.
diff --git a/.github/workflows/unit-tests-push.yml b/.github/workflows/unit-tests-push.yml
@@ -47,18 +47,31 @@ jobs:
 
       - name: Start the application
         run: |
-            ./mvnw spring-boot:run &
-            sleep 15
+            ./mvnw spring-boot:run > logs.txt 2>&1 &
+            echo $! > spring-boot-app.pid
+            sleep 5
         env:
           SPRING_DATASOURCE_URL: jdbc:mysql://localhost:3306/test_database
           SPRING_DATASOURCE_USERNAME: root
           SPRING_DATASOURCE_PASSWORD: root
           SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.cj.jdbc.Driver
+          SPRING_PROFILES_ACTIVE: test
       - name: Check listening ports
         run: ss -tuln
-      - name: Run all tests with sonar analysis
+      - name: Run tests
         run: |
-          ./mvnw -B org.jacoco:jacoco-maven-plugin:prepare-agent clean test sonar:sonar -DEXCLUDE_JUNIT=true -Dsonar.projectKey=Arquisoft_wiq_es04b -Dsonar.organization=arquisoft -Dsonar.branch.name=${{ github.ref }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Dspring.profiles.active=test -Dspring.datasource.url=jdbc:mysql://localhost:3306/test_database -Dspring.datasource.username=root -Dspring.datasource.password=root -Dspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -Dtest="com.uniovi.Wiq_UnitTests,com.uniovi.CucumberRunnerTests"
+          ./mvnw org.jacoco:jacoco-maven-plugin:prepare-agent verify -Dspring.datasource.url=jdbc:mysql://localhost:3306/test_database -Dspring.datasource.username=root -Dspring.datasource.password=root -Dspring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
         env:
           SPRING_PROFILES_ACTIVE: test
-          headless: true
+          headless: true
+          EXCLUDE_JUNIT: true
+      - name: Show app logs
+        if: always()
+        run: |
+          cat logs.txt
+      - name: Shut down the application
+        run: |
+            kill $(cat spring-boot-app.pid)
+      - name: Collect Jacoco report and send to Sonar
+        run: |
+            ./mvnw org.jacoco:jacoco-maven-plugin:report sonar:sonar -Dsonar.projectKey=Arquisoft_wiq_es04b -Dsonar.organization=arquisoft -Dsonar.branch.name=${{ github.ref }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Dspring.profiles.active=test
diff --git a/database/hsqldb/index.html b/database/hsqldb/index.html
diff --git a/database/hsqldb/readme.txt b/database/hsqldb/readme.txt
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,6 @@
         <java.version>17</java.version>
         <sonar.sources>src/main/java,src/test/resources/features</sonar.sources>
         <sonar.jacoco.reportPaths>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPaths>
-        <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     </properties>
     <dependencies>
         <dependency>
@@ -117,7 +116,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.11</version> <!-- Use the latest version available -->
+                <version>0.8.11</version>
                 <executions>
                     <execution>
                         <goals>
@@ -126,27 +125,14 @@
                     </execution>
                     <execution>
                         <id>report</id>
-                        <phase>test</phase>
+                        <phase>report</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>
-                    </execution>
-                    <execution>
-                        <id>jacoco-merge</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
                         <configuration>
-                            <fileSets>
-                                <fileSet>
-                                    <directory>${project.build.directory}</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-merged.exec</destFile>
+                            <formats>
+                                <format>XML</format>
+                            </formats>
                         </configuration>
                     </execution>
                 </executions>
@@ -155,26 +141,37 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.2.5</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/CucumberRunnerTests.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.0.0-M5</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <includes>
-                        <include>**/Wiq_UnitTests.java</include>
                         <include>**/CucumberRunnerTests.java</include>
                     </includes>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <jvmArguments>
-                                -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/0.8.11/org.jacoco.agent-0.8.11-runtime.jar=output=tcpserver,address=*,port=6300,includes=*
-                            </jvmArguments>
-                        </configuration>
-                    </execution>
-                    <!-- Define stop goal execution as well -->
-                </executions>
+                <configuration>
+                    <jvmArguments>
+                        -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/0.8.11/org.jacoco.agent-0.8.11-runtime.jar=destfile=${project.build.directory}/jacoco.exec,includes=*,output=file
+                    </jvmArguments>
+                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -222,4 +219,4 @@
             </dependencies>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/src/test/java/com/uniovi/CucumberRunnerTests.java b/src/test/java/com/uniovi/CucumberRunnerTests.java
@@ -2,6 +2,7 @@
 
 import io.cucumber.junit.Cucumber;
 import io.cucumber.junit.CucumberOptions;
+import org.junit.jupiter.api.Tag;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 

diff --git a/src/test/java/com/uniovi/steps/NavigateHomeStep.java b/src/test/java/com/uniovi/steps/NavigateHomeStep.java
@@ -1,6 +1,8 @@
 package com.uniovi.steps;
 
 import com.uniovi.*;
+import com.uniovi.dto.RoleDto;
+import com.uniovi.services.RoleService;
 import com.uniovi.util.SeleniumUtils;
 import io.cucumber.java.After;
 import io.cucumber.java.AfterAll;
@@ -12,11 +14,15 @@
 import org.junit.jupiter.api.Assertions;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
 public class NavigateHomeStep extends Wiq_IntegrationTests {
 
+    @Autowired
+    private RoleService roleService;
+
     @Given("I am in the home page")
     public void i_am_in_the_home_page() {
         driver.navigate().to(URL);