From 939190d62e6dafb445735ca9f2d3e6339bbf0657 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Tue, 13 Aug 2024 10:34:16 +0530 Subject: [PATCH 01/19] change 1 --- .github/workflows/all-tests.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index 95d8162bf2..d7651c5251 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -15,9 +15,14 @@ jobs: distribution: 'adopt' java-version: 11 - name: Set JAVA_TOOL_OPTIONS - run: echo "JAVA_TOOL_OPTIONS='${JAVA_TOOL_OPTIONS:-} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED'" >> $GITHUB_ENV + run: | + echo "old JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}" + NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" + echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV - name: Build with Maven - run: mvn -B clean install --file pom.xml -fae + run: | + echo "old JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}" + mvn -B clean install --file pom.xml -fae env: JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} @@ -33,9 +38,14 @@ jobs: distribution: 'adopt' java-version: 11 - name: Set JAVA_TOOL_OPTIONS - run: echo "JAVA_TOOL_OPTIONS='${JAVA_TOOL_OPTIONS:-} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED'" >> $GITHUB_ENV + run: | + echo "old JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}" + NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" + echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV - name: Build with Maven - run: mvn -B clean install --file pom.xml -fae + run: | + echo "old JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}" + mvn -B clean install --file pom.xml -fae env: JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} @@ -54,7 +64,7 @@ jobs: distribution: 'adopt' java-version: 11 - name: Set JAVA_TOOL_OPTIONS - run: echo "JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" >> $GITHUB_ENV + run: echo "JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" >> $env:GITHUB_ENV - name: Build with Maven run: mvn -B clean install --file pom.xml -fae env: From 5f3338dc72fd7abdff9038d3ae13cbe3d786cdda Mon Sep 17 00:00:00 2001 From: ShammiL Date: Tue, 13 Aug 2024 10:43:16 +0530 Subject: [PATCH 02/19] change 2 windows --- .github/workflows/all-tests.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index d7651c5251..1ecd2015eb 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -16,12 +16,10 @@ jobs: java-version: 11 - name: Set JAVA_TOOL_OPTIONS run: | - echo "old JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}" NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV - name: Build with Maven run: | - echo "old JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}" mvn -B clean install --file pom.xml -fae env: JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} @@ -39,12 +37,10 @@ jobs: java-version: 11 - name: Set JAVA_TOOL_OPTIONS run: | - echo "old JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}" NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV - name: Build with Maven run: | - echo "old JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}" mvn -B clean install --file pom.xml -fae env: JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} @@ -64,7 +60,9 @@ jobs: distribution: 'adopt' java-version: 11 - name: Set JAVA_TOOL_OPTIONS - run: echo "JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS% -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" >> $env:GITHUB_ENV + run: | + NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" + echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $env:GITHUB_ENV - name: Build with Maven run: mvn -B clean install --file pom.xml -fae env: From e1ae044853277359c0bcc6190ecb50d04bb02470 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Tue, 13 Aug 2024 10:47:24 +0530 Subject: [PATCH 03/19] change 3 windows --- .github/workflows/all-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index 1ecd2015eb..877b361cb8 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -61,7 +61,7 @@ jobs: java-version: 11 - name: Set JAVA_TOOL_OPTIONS run: | - NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" + $NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $env:GITHUB_ENV - name: Build with Maven run: mvn -B clean install --file pom.xml -fae From d894e778bd5994134e3146b34a9a62f0004b6e40 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Tue, 13 Aug 2024 10:54:27 +0530 Subject: [PATCH 04/19] change 4 disable ubuntu and macos --- .github/workflows/all-tests.yml | 84 ++++++++++++++++----------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index 877b361cb8..e8924836ac 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -3,48 +3,48 @@ name: All Tests ( openjdk8 ) on: [push] jobs: - Ubuntu: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: joschi/setup-jdk@v2 - with: - distribution: 'adopt' - java-version: 11 - - name: Set JAVA_TOOL_OPTIONS - run: | - NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" - echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV - - name: Build with Maven - run: | - mvn -B clean install --file pom.xml -fae - env: - JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} - - MacOS: - - runs-on: macOS-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: joschi/setup-jdk@v2 - with: - distribution: 'adopt' - java-version: 11 - - name: Set JAVA_TOOL_OPTIONS - run: | - NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" - echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV - - name: Build with Maven - run: | - mvn -B clean install --file pom.xml -fae - env: - JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} - +# Ubuntu: +# +# runs-on: ubuntu-latest +# +# steps: +# - uses: actions/checkout@v2 +# - name: Set up JDK 11 +# uses: joschi/setup-jdk@v2 +# with: +# distribution: 'adopt' +# java-version: 11 +# - name: Set JAVA_TOOL_OPTIONS +# run: | +# NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" +# echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV +# - name: Build with Maven +# run: | +# mvn -B clean install --file pom.xml -fae +# env: +# JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} +# +# MacOS: +# +# runs-on: macOS-latest +# +# steps: +# - uses: actions/checkout@v2 +# - name: Set up JDK 11 +# uses: joschi/setup-jdk@v2 +# with: +# distribution: 'adopt' +# java-version: 11 +# - name: Set JAVA_TOOL_OPTIONS +# run: | +# NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" +# echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV +# - name: Build with Maven +# run: | +# mvn -B clean install --file pom.xml -fae +# env: +# JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} +# windows: From 452a8e6dc4c6e56a3fc80fa8700c27eaec829f00 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Wed, 14 Aug 2024 14:36:59 +0530 Subject: [PATCH 05/19] change 5 disable windows and skip ubuntu tests --- .github/workflows/all-tests.yml | 62 +++++++++---------- .../tests-integration/tests/pom.xml | 2 +- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index e8924836ac..2331720435 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -3,9 +3,30 @@ name: All Tests ( openjdk8 ) on: [push] jobs: -# Ubuntu: + Ubuntu: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: joschi/setup-jdk@v2 + with: + distribution: 'adopt' + java-version: 11 + - name: Set JAVA_TOOL_OPTIONS + run: | + NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" + echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV + - name: Build with Maven + run: | + mvn -B clean install --file pom.xml -fae '-Dtest=!ODataETagTestCase#validateETagConcurrentHandlingTestCaseForDeleteMethod+validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod+validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPatchMethod' + env: + JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} + +# MacOS: # -# runs-on: ubuntu-latest +# runs-on: macOS-latest # # steps: # - uses: actions/checkout@v2 @@ -24,11 +45,14 @@ jobs: # env: # JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} # -# MacOS: + +# windows: # -# runs-on: macOS-latest +# runs-on: windows-latest # # steps: +# - name: Support longpaths +# run: git config --system core.longpaths true # - uses: actions/checkout@v2 # - name: Set up JDK 11 # uses: joschi/setup-jdk@v2 @@ -37,33 +61,9 @@ jobs: # java-version: 11 # - name: Set JAVA_TOOL_OPTIONS # run: | -# NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" -# echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV +# $NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" +# echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $env:GITHUB_ENV # - name: Build with Maven -# run: | -# mvn -B clean install --file pom.xml -fae +# run: mvn -B clean install --file pom.xml -fae # env: # JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} -# - - windows: - - runs-on: windows-latest - - steps: - - name: Support longpaths - run: git config --system core.longpaths true - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: joschi/setup-jdk@v2 - with: - distribution: 'adopt' - java-version: 11 - - name: Set JAVA_TOOL_OPTIONS - run: | - $NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED" - echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $env:GITHUB_ENV - - name: Build with Maven - run: mvn -B clean install --file pom.xml -fae - env: - JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} diff --git a/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml b/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml index 15893db705..c13d34f68f 100644 --- a/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml +++ b/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml @@ -35,7 +35,7 @@ maven-surefire-plugin false - 2.12.4 + 2.22.2 -Xmx1024m From e174ae8414ab57c28c4834bb77131c4301467616 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Wed, 14 Aug 2024 14:48:51 +0530 Subject: [PATCH 06/19] change 6 update surefire version for all modules --- integration/mediation-tests/tests-http/pom.xml | 2 +- integration/mediation-tests/tests-mediator-1/pom.xml | 2 +- integration/mediation-tests/tests-mediator-2/pom.xml | 2 +- integration/mediation-tests/tests-other/pom.xml | 2 +- .../artifacts/ESB/connector/custom-connector-hello/pom.xml | 2 +- integration/mediation-tests/tests-patches-with-smb2/pom.xml | 2 +- integration/mediation-tests/tests-patches/pom.xml | 2 +- .../mediation-tests/tests-platform/tests-coordination/pom.xml | 2 +- .../mediation-tests/tests-platform/tests-transaction/pom.xml | 2 +- .../mediation-tests/tests-platform/tests-userstore/pom.xml | 2 +- .../mediation-tests/tests-platform/tests-wso2mb/pom.xml | 2 +- integration/mediation-tests/tests-sample/pom.xml | 2 +- integration/mediation-tests/tests-service/pom.xml | 4 ++-- integration/mediation-tests/tests-transport/pom.xml | 2 +- product-scenarios/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/integration/mediation-tests/tests-http/pom.xml b/integration/mediation-tests/tests-http/pom.xml index a03c022beb..488a488d02 100644 --- a/integration/mediation-tests/tests-http/pom.xml +++ b/integration/mediation-tests/tests-http/pom.xml @@ -51,7 +51,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false diff --git a/integration/mediation-tests/tests-mediator-1/pom.xml b/integration/mediation-tests/tests-mediator-1/pom.xml index fd34905c3c..9475ac4233 100644 --- a/integration/mediation-tests/tests-mediator-1/pom.xml +++ b/integration/mediation-tests/tests-mediator-1/pom.xml @@ -51,7 +51,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false diff --git a/integration/mediation-tests/tests-mediator-2/pom.xml b/integration/mediation-tests/tests-mediator-2/pom.xml index 7120a87a1a..217ab42070 100644 --- a/integration/mediation-tests/tests-mediator-2/pom.xml +++ b/integration/mediation-tests/tests-mediator-2/pom.xml @@ -34,7 +34,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false diff --git a/integration/mediation-tests/tests-other/pom.xml b/integration/mediation-tests/tests-other/pom.xml index 3a1c166521..e9f643babe 100644 --- a/integration/mediation-tests/tests-other/pom.xml +++ b/integration/mediation-tests/tests-other/pom.xml @@ -33,7 +33,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false diff --git a/integration/mediation-tests/tests-other/src/test/resources/artifacts/ESB/connector/custom-connector-hello/pom.xml b/integration/mediation-tests/tests-other/src/test/resources/artifacts/ESB/connector/custom-connector-hello/pom.xml index 0b74eb0269..973b5713e9 100644 --- a/integration/mediation-tests/tests-other/src/test/resources/artifacts/ESB/connector/custom-connector-hello/pom.xml +++ b/integration/mediation-tests/tests-other/src/test/resources/artifacts/ESB/connector/custom-connector-hello/pom.xml @@ -159,7 +159,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false -Xms512m -Xmx1024m diff --git a/integration/mediation-tests/tests-patches-with-smb2/pom.xml b/integration/mediation-tests/tests-patches-with-smb2/pom.xml index 3aeda1d734..d6bf61bc25 100644 --- a/integration/mediation-tests/tests-patches-with-smb2/pom.xml +++ b/integration/mediation-tests/tests-patches-with-smb2/pom.xml @@ -34,7 +34,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false diff --git a/integration/mediation-tests/tests-patches/pom.xml b/integration/mediation-tests/tests-patches/pom.xml index 5393749554..cc5ccc97eb 100644 --- a/integration/mediation-tests/tests-patches/pom.xml +++ b/integration/mediation-tests/tests-patches/pom.xml @@ -34,7 +34,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false diff --git a/integration/mediation-tests/tests-platform/tests-coordination/pom.xml b/integration/mediation-tests/tests-platform/tests-coordination/pom.xml index 1edb345ac6..17304919e1 100644 --- a/integration/mediation-tests/tests-platform/tests-coordination/pom.xml +++ b/integration/mediation-tests/tests-platform/tests-coordination/pom.xml @@ -51,7 +51,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false -Xms512m -Xmx1024m diff --git a/integration/mediation-tests/tests-platform/tests-transaction/pom.xml b/integration/mediation-tests/tests-platform/tests-transaction/pom.xml index 1beeadb05a..dfe3e76fed 100644 --- a/integration/mediation-tests/tests-platform/tests-transaction/pom.xml +++ b/integration/mediation-tests/tests-platform/tests-transaction/pom.xml @@ -51,7 +51,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false -Xms512m -Xmx1024m diff --git a/integration/mediation-tests/tests-platform/tests-userstore/pom.xml b/integration/mediation-tests/tests-platform/tests-userstore/pom.xml index a2b3a66a3e..b2436c58e7 100644 --- a/integration/mediation-tests/tests-platform/tests-userstore/pom.xml +++ b/integration/mediation-tests/tests-platform/tests-userstore/pom.xml @@ -51,7 +51,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false -Xms512m -Xmx1024m diff --git a/integration/mediation-tests/tests-platform/tests-wso2mb/pom.xml b/integration/mediation-tests/tests-platform/tests-wso2mb/pom.xml index bc3447f681..187c8cc5b4 100644 --- a/integration/mediation-tests/tests-platform/tests-wso2mb/pom.xml +++ b/integration/mediation-tests/tests-platform/tests-wso2mb/pom.xml @@ -34,7 +34,7 @@ maven-surefire-plugin - 2.12.4 + 2.22.2 false + tests-integration diff --git a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/resources/testng.xml b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/resources/testng.xml index 53beb5c352..140abed71b 100755 --- a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/resources/testng.xml +++ b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/resources/testng.xml @@ -56,16 +56,16 @@ - - - + + + - - - - - - + + + + + + @@ -77,17 +77,17 @@ - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/integration/pom.xml b/integration/pom.xml index e938257435..b6813ba0b8 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -859,12 +859,12 @@ true - samples/product - automation-extensions - tests-common - mediation-tests + + + + dataservice-hosting-tests - management-api-tests + diff --git a/pom.xml b/pom.xml index c4ffee3012..f4c70c15f6 100644 --- a/pom.xml +++ b/pom.xml @@ -1542,10 +1542,10 @@ full - components - features - p2-profile - distribution + + + + integration From 507ce085423bccc47455b884fae6800a0969e7a7 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Thu, 15 Aug 2024 12:10:24 +0530 Subject: [PATCH 14/19] Revert "change 10 skip modules(revert)" This reverts commit eab4ff8bdc1cd433d0944aa0cc7895565042f7eb. --- integration/dataservice-hosting-tests/pom.xml | 4 +- .../tests/src/test/resources/testng.xml | 260 +++++++++--------- integration/pom.xml | 10 +- pom.xml | 8 +- 4 files changed, 141 insertions(+), 141 deletions(-) diff --git a/integration/dataservice-hosting-tests/pom.xml b/integration/dataservice-hosting-tests/pom.xml index 2fc72a2ad1..24c311bef8 100755 --- a/integration/dataservice-hosting-tests/pom.xml +++ b/integration/dataservice-hosting-tests/pom.xml @@ -32,8 +32,8 @@ pom - - + samples + tests-common tests-integration diff --git a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/resources/testng.xml b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/resources/testng.xml index 140abed71b..53beb5c352 100755 --- a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/resources/testng.xml +++ b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/resources/testng.xml @@ -56,16 +56,16 @@ - - - + + + - - - - - - + + + + + + @@ -77,17 +77,17 @@ - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/integration/pom.xml b/integration/pom.xml index b6813ba0b8..e938257435 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -859,12 +859,12 @@ true - - - - + samples/product + automation-extensions + tests-common + mediation-tests dataservice-hosting-tests - + management-api-tests diff --git a/pom.xml b/pom.xml index f4c70c15f6..c4ffee3012 100644 --- a/pom.xml +++ b/pom.xml @@ -1542,10 +1542,10 @@ full - - - - + components + features + p2-profile + distribution integration From 5180b9d6c015ffbf780a7cea6b823dd9668e47e1 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Thu, 15 Aug 2024 12:12:57 +0530 Subject: [PATCH 15/19] change 11 add skip log --- .../dataservice/integration/test/odata/ODataETagTestCase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java index 6aafce291d..4d869ac6c1 100644 --- a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java +++ b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java @@ -225,8 +225,8 @@ public void validateETagConcurrentHandlingTestCaseForPatchMethod() throws Except @Test(groups = "wso2.dss", description = "etag concurrent handling with delete method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForPatchMethod") public void validateETagConcurrentHandlingTestCaseForDeleteMethod() throws Exception { - System.out.println("SKIP is:" + System.getenv("SKIP").equals("true")); if (System.getenv("SKIP").equals("true")) { + System.out.println("This test is temporarily skipped for this workflow"); String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES"; String content = "{\"FILENAME\": \"WSO2PROD\" ,\"TYPE\" : \"dss\"}"; Map headers = new HashMap<>(); @@ -279,6 +279,7 @@ public void validateETagConcurrentHandlingTestCaseForDeleteMethod() throws Excep public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod() throws Exception { // To insert values if (System.getenv("SKIP").equals("true")) { + System.out.println("This test is temporarily skipped for this workflow"); String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES"; String content = "{\"FILENAME\": \"WSO2PROD\" ,\"TYPE\" : \"dss\"}"; Map headers = new HashMap<>(); @@ -333,6 +334,7 @@ public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod @Test(groups = "wso2.dss", description = "property modification using etag concurrent handling with patch method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod") public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPatchMethod() throws Exception { if (System.getenv("SKIP").equals("true")) { + System.out.println("This test is temporarily skipped for this workflow"); String entityEndpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES(\'WSO2PROD\')"; String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES(\'WSO2PROD\')/TYPE"; Map headers = new HashMap<>(); From f23b9ce72aa0a3b9773b0975a4621da9c3215ea3 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Fri, 16 Aug 2024 09:51:41 +0530 Subject: [PATCH 16/19] change 12 disabling intermittent failing tests --- .../foreach/ForEachJSONPayloadTestCase.java | 34 +++++++------ .../ESBJAVA1832MessageInjectorTestCase.java | 22 ++++---- .../transport/test/MSMPCronForwarderCase.java | 51 ++++++++++--------- 3 files changed, 56 insertions(+), 51 deletions(-) diff --git a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java index edde856a6a..359928d573 100644 --- a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java +++ b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java @@ -50,25 +50,27 @@ public void uploadSynapseConfig() throws Exception { @Test(groups = {"wso2.esb"}, description = "Test ForEach mediator with JSON payload") public void testForEachMediatorWithJSONPayload() throws Exception { - String request = "{\"getQuote\":{\"request\":[{\"symbol\":\"IBM\"},{\"symbol\":\"WSO2\"},{\"symbol\":\"MSFT\"}]}}"; + if (System.getenv("SKIP").equals("true")) { + String request = "{\"getQuote\":{\"request\":[{\"symbol\":\"IBM\"},{\"symbol\":\"WSO2\"},{\"symbol\":\"MSFT\"}]}}"; - simpleHttpClient = new SimpleHttpClient(); - simpleHttpClient.doPost(getProxyServiceURLHttp("foreachJSONTestProxy"), headers, - request, "application/json;charset=UTF-8"); + simpleHttpClient = new SimpleHttpClient(); + simpleHttpClient.doPost(getProxyServiceURLHttp("foreachJSONTestProxy"), headers, + request, "application/json;charset=UTF-8"); - //boolean reachedEnd = false; - String logs = carbonLogReader.getSubstringBetweenStrings("", "", 6); - assertTrue(logs.contains( - "IBM"), - "IBM Element not found"); - assertTrue(logs.contains( - "WSO2"), - "WSO2 Element not found"); - assertTrue(logs.contains( - "MSFT"), - "MSTF Element not found"); + //boolean reachedEnd = false; + String logs = carbonLogReader.getSubstringBetweenStrings("", "", 6); + assertTrue(logs.contains( + "IBM"), + "IBM Element not found"); + assertTrue(logs.contains( + "WSO2"), + "WSO2 Element not found"); + assertTrue(logs.contains( + "MSFT"), + "MSTF Element not found"); - carbonLogReader.stop(); + carbonLogReader.stop(); + } } } diff --git a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java index 013a826660..bbb01e7910 100644 --- a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java +++ b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java @@ -53,18 +53,20 @@ protected void init() throws Exception { @Test(groups = { "wso2.esb" }, description = "Test proxy service with jms transport") public void testMessageInjection() throws Exception { - String queueName = "jmsQueue"; - int numberOfMsgToExpect = 10; - TimeUnit.SECONDS.sleep(15); - try { - consumer.connect(queueName); - for (int i = 0; i < numberOfMsgToExpect; i++) { - if (consumer.popMessage(javax.jms.Message.class) == null) { - Assert.fail("Unable to pop the expected number of message in the queue " + queueName); + if (System.getenv("SKIP").equals("true")) { + String queueName = "jmsQueue"; + int numberOfMsgToExpect = 10; + TimeUnit.SECONDS.sleep(15); + try { + consumer.connect(queueName); + for (int i = 0; i < numberOfMsgToExpect; i++) { + if (consumer.popMessage(javax.jms.Message.class) == null) { + Assert.fail("Unable to pop the expected number of message in the queue " + queueName); + } } + } finally { + consumer.disconnect(); } - } finally { - consumer.disconnect(); } } diff --git a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java index 8c77e3f39e..dc7ed9e3b0 100644 --- a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java +++ b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java @@ -69,31 +69,32 @@ protected void init() throws Exception { @Test(groups = { "wso2.esb" }, description = "Test Cron Forwarding of message processor") public void testMessageProcessorCronForwader() throws Exception { - - // SEND THE REQUEST - String addUrl = getProxyServiceURLHttp("MSMPRetrytest"); - String payload = "{\"name\":\"Jack\"}"; - - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - - // need to send two request - HttpResponse response1 = HttpRequestUtil.doPost(new URL(addUrl), payload, headers); - HttpResponse response2 = HttpRequestUtil.doPost(new URL(addUrl), payload, headers); - HttpResponse response3 = HttpRequestUtil.doPost(new URL(addUrl), payload, headers); - HttpResponse response4 = HttpRequestUtil.doPost(new URL(addUrl), payload, headers); - - // IT HAS TO BE 202 ACCEPTED - assertEquals(response1.getResponseCode(), 202, "ESB failed to send 202 even after setting FORCE_SC_ACCEPTED"); - assertEquals(response2.getResponseCode(), 202, "ESB failed to send 202 even after setting FORCE_SC_ACCEPTED"); - assertEquals(response3.getResponseCode(), 202, "ESB failed to send 202 even after setting FORCE_SC_ACCEPTED"); - assertEquals(response4.getResponseCode(), 202, "ESB failed to send 202 even after setting FORCE_SC_ACCEPTED"); - - // WAIT FOR THE MESSAGE PROCESSOR TO TRIGGER -// Thread.sleep(60000); - Awaitility.await().pollInterval(50, TimeUnit.MILLISECONDS).atMost(300, - TimeUnit.SECONDS).until(isLogWritten()); - assertTrue(carbonLogReader.checkForLog("Jack", 60, NUMBER_OF_MESSAGES)); + if (System.getenv("SKIP").equals("true")) { + // SEND THE REQUEST + String addUrl = getProxyServiceURLHttp("MSMPRetrytest"); + String payload = "{\"name\":\"Jack\"}"; + + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + + // need to send two request + HttpResponse response1 = HttpRequestUtil.doPost(new URL(addUrl), payload, headers); + HttpResponse response2 = HttpRequestUtil.doPost(new URL(addUrl), payload, headers); + HttpResponse response3 = HttpRequestUtil.doPost(new URL(addUrl), payload, headers); + HttpResponse response4 = HttpRequestUtil.doPost(new URL(addUrl), payload, headers); + + // IT HAS TO BE 202 ACCEPTED + assertEquals(response1.getResponseCode(), 202, "ESB failed to send 202 even after setting FORCE_SC_ACCEPTED"); + assertEquals(response2.getResponseCode(), 202, "ESB failed to send 202 even after setting FORCE_SC_ACCEPTED"); + assertEquals(response3.getResponseCode(), 202, "ESB failed to send 202 even after setting FORCE_SC_ACCEPTED"); + assertEquals(response4.getResponseCode(), 202, "ESB failed to send 202 even after setting FORCE_SC_ACCEPTED"); + + // WAIT FOR THE MESSAGE PROCESSOR TO TRIGGER + // Thread.sleep(60000); + Awaitility.await().pollInterval(50, TimeUnit.MILLISECONDS).atMost(300, + TimeUnit.SECONDS).until(isLogWritten()); + assertTrue(carbonLogReader.checkForLog("Jack", 60, NUMBER_OF_MESSAGES)); + } } @AfterClass(alwaysRun = true) From 33e9725d1f0e4e776f08e0787b962fa6d1c8be0e Mon Sep 17 00:00:00 2001 From: ShammiL Date: Fri, 16 Aug 2024 14:37:03 +0530 Subject: [PATCH 17/19] change 13 disabling intermittent failing test --- .../esb/jms/transport/test/ESBJAVA2907TestCase.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java index 118ca16ef0..30d551030f 100644 --- a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java +++ b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java @@ -23,10 +23,12 @@ protected void init() throws Exception { @Test(groups = "wso2.esb", description = "Test adding OMElements as properties when saving messages to the MessageStore") public void testAddingOMElementPropertyToMessageStore() throws Exception { - AxisServiceClient client = new AxisServiceClient(); - client.sendRobust(Utils.getStockQuoteRequest("IBM"), getProxyServiceURLHttp("testPS"), "getQuote"); - Assert.assertTrue(carbonLogReader.checkForLog(GET_QUOTE_REQUEST_BODY, DEFAULT_TIMEOUT), "OMElement is not saved to the message store"); - carbonLogReader.stop(); + if (System.getenv("SKIP").equals("true")) { + AxisServiceClient client = new AxisServiceClient(); + client.sendRobust(Utils.getStockQuoteRequest("IBM"), getProxyServiceURLHttp("testPS"), "getQuote"); + Assert.assertTrue(carbonLogReader.checkForLog(GET_QUOTE_REQUEST_BODY, DEFAULT_TIMEOUT), "OMElement is not saved to the message store"); + carbonLogReader.stop(); + } } } From 25ddaffbaa031038f73fe30e2b71398b0088f2cb Mon Sep 17 00:00:00 2001 From: ShammiL Date: Tue, 20 Aug 2024 10:33:04 +0530 Subject: [PATCH 18/19] change 14 disabling intermittent failing test --- ...AggregateWithHighMaxAndLowMinTestCase.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java index 271bfa420d..db2dc9c5bd 100644 --- a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java +++ b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java @@ -158,24 +158,26 @@ public void testMoreNumberThanMaximum() throws IOException, XMLStreamException { @Test(groups = { "wso2.esb" }, description = "less number of messages than maximum count") public void testLessNumberThanMaximum() throws IOException, XMLStreamException { - int responseCount = 0; - - no_of_requests = 60; - aggregatedRequestClient.setNoOfIterations(no_of_requests); - String Response = aggregatedRequestClient.getResponse(); - Assert.assertNotNull(Response); - OMElement Response2 = AXIOMUtil.stringToOM(Response); - OMElement soapBody = Response2.getFirstElement(); - Iterator iterator = soapBody.getChildrenWithName(new QName("http://services.samples", "getQuoteResponse")); - - while (iterator.hasNext()) { - responseCount++; - OMElement getQuote = (OMElement) iterator.next(); - Assert.assertTrue(getQuote.toString().contains("IBM")); + if (System.getenv("SKIP").equals("true")) { + int responseCount = 0; + + no_of_requests = 60; + aggregatedRequestClient.setNoOfIterations(no_of_requests); + String Response = aggregatedRequestClient.getResponse(); + Assert.assertNotNull(Response); + OMElement Response2 = AXIOMUtil.stringToOM(Response); + OMElement soapBody = Response2.getFirstElement(); + Iterator iterator = soapBody.getChildrenWithName(new QName("http://services.samples", "getQuoteResponse")); + + while (iterator.hasNext()) { + responseCount++; + OMElement getQuote = (OMElement) iterator.next(); + Assert.assertTrue(getQuote.toString().contains("IBM")); + } + + Assert.assertTrue(2 <= responseCount && responseCount <= no_of_requests); } - Assert.assertTrue(2 <= responseCount && responseCount <= no_of_requests); - } @AfterClass(alwaysRun = true) From f8912a9250957fcd408ad0aac4592d73cc6f1cc4 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Tue, 20 Aug 2024 15:52:07 +0530 Subject: [PATCH 19/19] Fix env variable name --- .github/workflows/all-tests.yml | 2 +- .../integration/test/odata/ODataETagTestCase.java | 6 +++--- .../aggregate/AggregateWithHighMaxAndLowMinTestCase.java | 2 +- .../mediator/test/foreach/ForEachJSONPayloadTestCase.java | 2 +- .../transport/test/ESBJAVA1832MessageInjectorTestCase.java | 2 +- .../carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java | 2 +- .../esb/jms/transport/test/MSMPCronForwarderCase.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml index ba7c424b8e..cbc5a63ebe 100644 --- a/.github/workflows/all-tests.yml +++ b/.github/workflows/all-tests.yml @@ -23,7 +23,7 @@ jobs: mvn -B clean install --file pom.xml -fae env: JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }} - SKIP: true + CI_BUILD_SKIP: true # MacOS: # diff --git a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java index 4d869ac6c1..95470b16e6 100644 --- a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java +++ b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java @@ -225,7 +225,7 @@ public void validateETagConcurrentHandlingTestCaseForPatchMethod() throws Except @Test(groups = "wso2.dss", description = "etag concurrent handling with delete method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForPatchMethod") public void validateETagConcurrentHandlingTestCaseForDeleteMethod() throws Exception { - if (System.getenv("SKIP").equals("true")) { + if (System.getenv("CI_BUILD_SKIP").equals("true")) { System.out.println("This test is temporarily skipped for this workflow"); String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES"; String content = "{\"FILENAME\": \"WSO2PROD\" ,\"TYPE\" : \"dss\"}"; @@ -278,7 +278,7 @@ public void validateETagConcurrentHandlingTestCaseForDeleteMethod() throws Excep @Test(groups = "wso2.dss", description = "property modification using etag concurrent handling with put method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForDeleteMethod") public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod() throws Exception { // To insert values - if (System.getenv("SKIP").equals("true")) { + if (System.getenv("CI_BUILD_SKIP").equals("true")) { System.out.println("This test is temporarily skipped for this workflow"); String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES"; String content = "{\"FILENAME\": \"WSO2PROD\" ,\"TYPE\" : \"dss\"}"; @@ -333,7 +333,7 @@ public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod @Test(groups = "wso2.dss", description = "property modification using etag concurrent handling with patch method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod") public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPatchMethod() throws Exception { - if (System.getenv("SKIP").equals("true")) { + if (System.getenv("CI_BUILD_SKIP").equals("true")) { System.out.println("This test is temporarily skipped for this workflow"); String entityEndpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES(\'WSO2PROD\')"; String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES(\'WSO2PROD\')/TYPE"; diff --git a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java index db2dc9c5bd..e3231c5029 100644 --- a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java +++ b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java @@ -158,7 +158,7 @@ public void testMoreNumberThanMaximum() throws IOException, XMLStreamException { @Test(groups = { "wso2.esb" }, description = "less number of messages than maximum count") public void testLessNumberThanMaximum() throws IOException, XMLStreamException { - if (System.getenv("SKIP").equals("true")) { + if (System.getenv("CI_BUILD_SKIP").equals("true")) { int responseCount = 0; no_of_requests = 60; diff --git a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java index 359928d573..abb4bcf555 100644 --- a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java +++ b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java @@ -50,7 +50,7 @@ public void uploadSynapseConfig() throws Exception { @Test(groups = {"wso2.esb"}, description = "Test ForEach mediator with JSON payload") public void testForEachMediatorWithJSONPayload() throws Exception { - if (System.getenv("SKIP").equals("true")) { + if (System.getenv("CI_BUILD_SKIP").equals("true")) { String request = "{\"getQuote\":{\"request\":[{\"symbol\":\"IBM\"},{\"symbol\":\"WSO2\"},{\"symbol\":\"MSFT\"}]}}"; simpleHttpClient = new SimpleHttpClient(); diff --git a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java index bbb01e7910..cb6f9cb15e 100644 --- a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java +++ b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java @@ -53,7 +53,7 @@ protected void init() throws Exception { @Test(groups = { "wso2.esb" }, description = "Test proxy service with jms transport") public void testMessageInjection() throws Exception { - if (System.getenv("SKIP").equals("true")) { + if (System.getenv("CI_BUILD_SKIP").equals("true")) { String queueName = "jmsQueue"; int numberOfMsgToExpect = 10; TimeUnit.SECONDS.sleep(15); diff --git a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java index 30d551030f..acae56f2f3 100644 --- a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java +++ b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java @@ -23,7 +23,7 @@ protected void init() throws Exception { @Test(groups = "wso2.esb", description = "Test adding OMElements as properties when saving messages to the MessageStore") public void testAddingOMElementPropertyToMessageStore() throws Exception { - if (System.getenv("SKIP").equals("true")) { + if (System.getenv("CI_BUILD_SKIP").equals("true")) { AxisServiceClient client = new AxisServiceClient(); client.sendRobust(Utils.getStockQuoteRequest("IBM"), getProxyServiceURLHttp("testPS"), "getQuote"); Assert.assertTrue(carbonLogReader.checkForLog(GET_QUOTE_REQUEST_BODY, DEFAULT_TIMEOUT), "OMElement is not saved to the message store"); diff --git a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java index dc7ed9e3b0..ce924ec272 100644 --- a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java +++ b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java @@ -69,7 +69,7 @@ protected void init() throws Exception { @Test(groups = { "wso2.esb" }, description = "Test Cron Forwarding of message processor") public void testMessageProcessorCronForwader() throws Exception { - if (System.getenv("SKIP").equals("true")) { + if (System.getenv("CI_BUILD_SKIP").equals("true")) { // SEND THE REQUEST String addUrl = getProxyServiceURLHttp("MSMPRetrytest"); String payload = "{\"name\":\"Jack\"}";