diff --git a/.github/workflows/mvn-test.yml b/.github/workflows/mvn-test.yml index 4dc494a94..d76b31b35 100644 --- 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 index f9677f143..882f22c5a 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -117,6 +117,7 @@ ${code.coverage.project.folder} **/target/jacoco.exec + **/target/jacoco-it.exec diff --git a/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java b/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java index a5d2c69f9..8a617f296 100644 --- 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 index 114e8454c..50cb68251 100644 --- a/pom.xml +++ b/pom.xml @@ -205,13 +205,18 @@ - **/*HASplitBrainIT.java - **/*HTTP2ServersIT.java - **/ReplicationServerReplicaRestartForceDbInstallIT.java - **/IndexOperations3ServersIT.java - **/ArcadeGraphProcessDebugTest.java - **/ArcadeGraphStructureDebugTest.java - ${exclude.tests} + + + + + + + + + **/*ReplicationServerReplicaRestartForceDbInstallIT.java + **/*HARandomCrashIT.java + **/*ReplicationServerLeaderDownIT + **/*ReplicationServerLeaderChanges3TimesIT ${skipIntegration} ${itCoverageAgent} @@ -490,10 +495,10 @@ pre-integration-test - jacooc-it.exec + ${project.build.directory}/jacoco-it.exec itCoverageAgent - **/SqlParserTokenManager.class + **/SqlParserTokenManager* @@ -503,11 +508,13 @@ report - - - **/SqlParserTokenManager.class - - + + + report-it + prepare-package + + report-integration + @@ -524,14 +531,6 @@ integration false - - 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 -