From 37bae5195debb918bbc1db9db50b8d4a5940ff2a Mon Sep 17 00:00:00 2001 From: Benjamin Van der Smissen Date: Thu, 15 Jun 2023 13:40:10 +0200 Subject: [PATCH 1/5] ALFREDAPI-521_release [Test] updating ci to java-junit ALFREDAPI-521_release [Test] import junit-jupiter:5.7.1 ALFREDAPI-521_release [Test] update upload test task ci ALFREDAPI-521_release [Test] change testImplementation 'org.junit.jupiter:junit-jupiter for gradle plugin og junit.reporter ALFREDAPI-521_release [Test] adding mikepenz/action-junit-report@v3 ALFREDAPI-521_release [Test] ALFREDAPI-521_release [Test] Junit in gradle ALFREDAPI-521_release [Test] issue ci solved ALFREDAPI-521_release [Test] test reports ALFREDAPI-521_release [Update] ci Publish Test Report - new path to include integration test results ALFREDAPI-521_release [Delete] junit.reporter ALFREDAPI-521_release [Test] Update path to include integration test ALFREDAPI-521_release [Test] revert alfresco_version to include all builds ALFREDAPI-521_release [Undo] Failing tests ALFREDAPI-521_release [Undo] test code ALFREDAPI-521_release [Cleanup] to rebase ALFREDAPI-521_release [Update] Add a 1s delay before searching for results ALFREDAPI-521_release: skip test for GHA (runs finelocally) ALFREDAPI-521_release [Update] import @ignore ALFREDAPI-521_release [Update] Add a dummy test for JUnit --- .github/workflows/ci.yml | 10 +++++++++- apix-integrationtests/build.gradle | 1 - ...kflowService_SearchContextMyPooledTasks_Test.java | 12 +++++++++++- build.gradle | 3 +++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7a712e9..0f11ee7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,14 @@ jobs: name: test-result path: /home/runner/work/**/build/reports retention-days: 2 + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3.7.6 + if: success() || failure() + with: + check_name: 'test_reports' + report_paths: '**/build/test-results/**/TEST-*.xml' + github_token: ${{ secrets.GITHUB_TOKEN }} + - name: Publish if: ${{ startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/heads/release') }} uses: gradle/gradle-build-action@v2.3.0 @@ -61,7 +69,7 @@ jobs: ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVEN_CENTRAL_GPG_PASSWORD }} ORG_GRADLE_PROJECT_sonatype_username: ${{ secrets.SONATYPE_S01_USERNAME }} ORG_GRADLE_PROJECT_sonatype_password: ${{ secrets.SONATYPE_S01_PASSWORD }} - BRANCH_NAME: ${{ github.head_ref }} + BRANCH_NAME: ${{ github.ref_name }} with: arguments: >- --info -PsigningKeyId=DF8285F0 diff --git a/apix-integrationtests/build.gradle b/apix-integrationtests/build.gradle index 6c2b97d1..7bbad835 100644 --- a/apix-integrationtests/build.gradle +++ b/apix-integrationtests/build.gradle @@ -120,4 +120,3 @@ subprojects { } } - diff --git a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java index 5ba949d6..f012efb2 100644 --- a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java +++ b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java @@ -11,6 +11,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.service.cmr.workflow.WorkflowPath; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +37,11 @@ public Object execute() { } @Test + public void testDummy(){ + System.out.println("test to resolve: NoRunableMethodExceptionExample: to Delete"); + assertEquals(1,1); + } + @Ignore("Disabled for GHA build") public void testSearchContextMyPooledTask() { String testName = new Object() { }.getClass().getEnclosingMethod().getName(); @@ -45,7 +51,11 @@ public void testSearchContextMyPooledTask() { TaskSearchQuery searchQuery = createNewSearchQuery(TaskSearchQuery.QueryScope.MyPooledTasks, 0, 5, Sorting.ASCENDING, IWorkflowService.ALFRESCO_STARTDATE); - + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } TaskOrWorkflowSearchResult result = getSearchResultTasks(searchQuery); assertEquals(2, result.results.size()); } diff --git a/build.gradle b/build.gradle index 4f4cf836..11f5cf1d 100644 --- a/build.gradle +++ b/build.gradle @@ -83,6 +83,9 @@ subprojects { password System.env.CLOUDSMITH_APIKEY ?: property('eu.xenit.cloudsmith.password') } } + maven { + url "https://repo.xenit.eu/zRCLvpH8FA0bR2ha/legacy/maven/" + } // This private repository provides Xenit with Alfresco enterprise artefacts. // External developers should replace it with their own library repository. maven { From a4e8e7a6ba474ba264e3ef666c2a44075d814dd3 Mon Sep 17 00:00:00 2001 From: Benjamin Van der Smissen Date: Tue, 20 Jun 2023 15:25:22 +0200 Subject: [PATCH 2/5] ALFREDAPI-521_release [Update] solve race-condition by adding dummy test --- .github/workflows/ci.yml | 3 ++- apix-integrationtests/build.gradle | 1 + .../WorkflowService_SearchContextMyPooledTasks_Test.java | 9 +++------ build.gradle | 3 --- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f11ee7d..1492fb2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,9 +57,10 @@ jobs: uses: mikepenz/action-junit-report@v3.7.6 if: success() || failure() with: - check_name: 'test_reports' + check_name: "test-reports-${{ matrix.alfresco_version }}" report_paths: '**/build/test-results/**/TEST-*.xml' github_token: ${{ secrets.GITHUB_TOKEN }} + detailed_summary: true - name: Publish if: ${{ startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/heads/release') }} diff --git a/apix-integrationtests/build.gradle b/apix-integrationtests/build.gradle index 7bbad835..6c2b97d1 100644 --- a/apix-integrationtests/build.gradle +++ b/apix-integrationtests/build.gradle @@ -120,3 +120,4 @@ subprojects { } } + diff --git a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java index f012efb2..eaf6b4da 100644 --- a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java +++ b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java @@ -13,6 +13,7 @@ import org.alfresco.service.cmr.workflow.WorkflowPath; import org.junit.Ignore; import org.junit.Test; +import org.junit.rules.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +42,7 @@ public void testDummy(){ System.out.println("test to resolve: NoRunableMethodExceptionExample: to Delete"); assertEquals(1,1); } - @Ignore("Disabled for GHA build") + @Test public void testSearchContextMyPooledTask() { String testName = new Object() { }.getClass().getEnclosingMethod().getName(); @@ -51,11 +52,7 @@ public void testSearchContextMyPooledTask() { TaskSearchQuery searchQuery = createNewSearchQuery(TaskSearchQuery.QueryScope.MyPooledTasks, 0, 5, Sorting.ASCENDING, IWorkflowService.ALFRESCO_STARTDATE); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + TaskOrWorkflowSearchResult result = getSearchResultTasks(searchQuery); assertEquals(2, result.results.size()); } diff --git a/build.gradle b/build.gradle index 11f5cf1d..4f4cf836 100644 --- a/build.gradle +++ b/build.gradle @@ -83,9 +83,6 @@ subprojects { password System.env.CLOUDSMITH_APIKEY ?: property('eu.xenit.cloudsmith.password') } } - maven { - url "https://repo.xenit.eu/zRCLvpH8FA0bR2ha/legacy/maven/" - } // This private repository provides Xenit with Alfresco enterprise artefacts. // External developers should replace it with their own library repository. maven { From c7160ea400da00ae9346446fd75cbdac55710c72 Mon Sep 17 00:00:00 2001 From: Benjamin Van der Smissen Date: Wed, 21 Jun 2023 13:28:54 +0200 Subject: [PATCH 3/5] ALFREDAPI-521_release [Update] WorkflowService_SearchContextMyPooledTasks_Test --- .../WorkflowService_SearchContextMyPooledTasks_Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java index eaf6b4da..dbf6b285 100644 --- a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java +++ b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java @@ -39,7 +39,7 @@ public Object execute() { @Test public void testDummy(){ - System.out.println("test to resolve: NoRunableMethodExceptionExample: to Delete"); + logger.debug("dummytest: NoRunableMethodExceptionExample: solves race condition of testSearchContextMyPooledTask"); assertEquals(1,1); } @Test From fdcc051233a9108ba2baafc1826f15f1a9a76976 Mon Sep 17 00:00:00 2001 From: Benjamin Van der Smissen Date: Wed, 21 Jun 2023 13:46:59 +0200 Subject: [PATCH 4/5] ALFREDAPI-521_release [Cleanup] unused imports --- .../WorkflowService_SearchContextMyPooledTasks_Test.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java index dbf6b285..a809b269 100644 --- a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java +++ b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java @@ -11,9 +11,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.service.cmr.workflow.WorkflowPath; -import org.junit.Ignore; import org.junit.Test; -import org.junit.rules.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 92e3fc6f46f1330a5ea30af2249da2607fe5ee6c Mon Sep 17 00:00:00 2001 From: Benjamin Van der Smissen Date: Thu, 22 Jun 2023 09:05:35 +0200 Subject: [PATCH 5/5] ALFREDAPI-521_release [Cleanup] reformat --- .../WorkflowService_SearchContextMyPooledTasks_Test.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java index a809b269..0e1ebb81 100644 --- a/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java +++ b/apix-integrationtests/src/main/java/eu/xenit/apix/tests/workflow/methods/WorkflowService_SearchContextMyPooledTasks_Test.java @@ -36,10 +36,12 @@ public Object execute() { } @Test - public void testDummy(){ - logger.debug("dummytest: NoRunableMethodExceptionExample: solves race condition of testSearchContextMyPooledTask"); - assertEquals(1,1); + public void testDummy() { + logger.debug( + "dummytest: NoRunableMethodExceptionExample: solves race condition of testSearchContextMyPooledTask"); + assertEquals(1, 1); } + @Test public void testSearchContextMyPooledTask() { String testName = new Object() {