Review Codacy and Jacoco Configuration (#1808)

ArcadeData · Nov 3, 2024 · ba1ba1d · ba1ba1d
1 parent 4a6711b
commit ba1ba1d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 27 deletions.
diff --git a/.github/workflows/mvn-test.yml b/.github/workflows/mvn-test.yml
@@ -57,7 +57,7 @@ jobs:
         if: success() || failure()
         with:
           name: Test Report - ${{ matrix.os }}
-          path: "**/surefire-reports/TEST*.xml"
+          path: "**/surefire-reports/TEST*.xml, **/failsafe-reports/TEST*.xml"
           list-suites: "failed"
           list-tests: "failed"
           reporter: java-junit

diff --git a/coverage/pom.xml b/coverage/pom.xml
@@ -117,6 +117,7 @@
                                             <directory>${code.coverage.project.folder}</directory>
                                             <includes>
                                                 <include>**/target/jacoco.exec</include>
+                                                <include>**/target/jacoco-it.exec</include>
                                             </includes>
                                         </fileSet>
                                     </fileSets>

diff --git a/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java b/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java
@@ -138,8 +138,10 @@ public void run() {
             for (int j = 0; j < 500; j++) {
               importedDatabase.begin();
               for (int k = 0; k < 500; k++) {
-                final MutableVertex v = importedDatabase.newVertex("BackupTest").set("thread", threadId)
-                    .set("id", totalPerThread.getAndIncrement()).save();
+                final MutableVertex v = importedDatabase.newVertex("BackupTest")
+                    .set("thread", threadId)
+                    .set("id", totalPerThread.getAndIncrement())
+                    .save();
                 assertThat(v.getIdentity().getBucketId()).isEqualTo(threadBucket.getFileId());
 
                 if (k + 1 % 100 == 0) {
@@ -241,7 +243,6 @@ private Database emptyDatabase() {
   public void beforeTests() {
     FileUtils.deleteRecursively(new File(DATABASE_PATH));
     FileUtils.deleteRecursively(new File(DATABASE_PATH + "_restored"));
-    if (file.exists())
-      file.delete();
+    if (file.exists()) file.delete();
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -205,13 +205,18 @@
                 </executions>
                 <configuration>
                     <excludes>
-                        <exclude>**/*HASplitBrainIT.java</exclude>
-                        <exclude>**/*HTTP2ServersIT.java</exclude>
-                        <exclude>**/ReplicationServerReplicaRestartForceDbInstallIT.java</exclude>
-                        <exclude>**/IndexOperations3ServersIT.java</exclude>
-                        <exclude>**/ArcadeGraphProcessDebugTest.java</exclude>
-                        <exclude>**/ArcadeGraphStructureDebugTest.java</exclude>
-                        <exclude>${exclude.tests}</exclude>
+                        <!--                        <exclude>**/*HASplitBrainIT.java</exclude>-->
+                        <!--                        <exclude>**/*HTTP2ServersIT.java</exclude>-->
+                        <!--                    com/arcadedb/integration/backup/FullBackupIT.java,-->
+                        <!--                    com/arcadedb/server/ha/HASplitBrainIT.java,-->
+                        <!--                    com/arcadedb/server/ha/ReplicationServerQuorumMajority2ServersOutIT.java-->
+                        <!--                        <exclude>**/IndexOperations3ServersIT.java</exclude>-->
+                        <!--                        <exclude>**/ArcadeGraphProcessDebugTest.java</exclude>-->
+                        <!--                        <exclude>**/ArcadeGraphStructureDebugTest.java</exclude>-->
+                        <exclude>**/*ReplicationServerReplicaRestartForceDbInstallIT.java</exclude>
+                        <exclude>**/*HARandomCrashIT.java</exclude>
+                        <exclude>**/*ReplicationServerLeaderDownIT</exclude>
+                        <exclude>**/*ReplicationServerLeaderChanges3TimesIT</exclude>
                     </excludes>
                     <skipITs>${skipIntegration}</skipITs>
                     <argLine>${itCoverageAgent}</argLine>
@@ -490,10 +495,10 @@
                                 </goals>
                                 <phase>pre-integration-test</phase>
                                 <configuration>
-                                    <destFile>jacooc-it.exec</destFile>
+                                    <destFile>${project.build.directory}/jacoco-it.exec</destFile>
                                     <propertyName>itCoverageAgent</propertyName>
                                     <excludes>
-                                        <exclude>**/SqlParserTokenManager.class</exclude>
+                                        <exclude>**/SqlParserTokenManager*</exclude>
                                     </excludes>
                                 </configuration>
                             </execution>
@@ -503,11 +508,13 @@
                                 <goals>
                                     <goal>report</goal>
                                 </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/SqlParserTokenManager.class</exclude>
-                                    </excludes>
-                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>report-it</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>report-integration</goal>
+                                </goals>
                             </execution>
                         </executions>
                     </plugin>
@@ -524,14 +531,6 @@
             <id>integration</id>
             <properties>
                 <skipIntegration>false</skipIntegration>
-                <exclude.tests>
-                    com/arcadedb/integration/backup/FullBackupIT.java,
-                    com/arcadedb/server/ha/HASplitBrainIT.java,
-                    com/arcadedb/server/ha/ReplicationServerLeaderChanges3TimesIT.java,
-                    com/arcadedb/server/ha/ReplicationServerLeaderDownIT.java,
-                    com/arcadedb/server/ha/HARandomCrashIT.java,
-                    com/arcadedb/server/ha/ReplicationServerQuorumMajority2ServersOutIT.java
-                </exclude.tests>
             </properties>
         </profile>
         <profile>