From 042e250efa3cbcac164b347de784585e4147bfaf Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 19 Oct 2022 21:20:35 +0800 Subject: [PATCH] Separate Java Helidon functional tests (#13763) * separate helidon functional tests * trigger build --- .../java-helidon-functional-tests.yaml | 46 +++++++++++++++++++ .github/workflows/openapi-generator.yaml | 38 --------------- ...HelidonCommonCodegenPackagePrefixTest.java | 3 ++ 3 files changed, 49 insertions(+), 38 deletions(-) create mode 100644 .github/workflows/java-helidon-functional-tests.yaml diff --git a/.github/workflows/java-helidon-functional-tests.yaml b/.github/workflows/java-helidon-functional-tests.yaml new file mode 100644 index 0000000000..b2404063d8 --- /dev/null +++ b/.github/workflows/java-helidon-functional-tests.yaml @@ -0,0 +1,46 @@ +name: Java Helidon Functional tests + +on: + push: + paths: + - modules/openapi-generator/src/test/java/org/openapitools/codegen/java/helidon/** + pull_request: + paths: + - modules/openapi-generator/src/test/java/org/openapitools/codegen/java/helidon/** + +jobs: + build: + name: Java Helidon Functional tests + runs-on: ubuntu-latest + strategy: + matrix: + java-version: [11, 17] + steps: + - uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java-version }} + distribution: 'temurin' + - name: Cache maven dependencies + uses: actions/cache@v3 + env: + cache-name: cache-maven-repository + with: + path: | + ~/.m2/repository + ~/.gradle + !~/.gradle/caches/*/plugin-resolution/ + !~/.m2/repository/org/openapitools/ + key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + - name: Run unit tests + run: cd modules/openapi-generator && mvn --no-snapshot-updates --batch-mode -Dtest="**/functional/*Test" test -Dorg.slf4j.simpleLogger.defaultLogLevel=error + - name: Publish unit test reports + if: ${{ always() }} + uses: actions/upload-artifact@v3 + with: + name: surefire-test-results + path: '**/surefire-reports/TEST-*.xml' diff --git a/.github/workflows/openapi-generator.yaml b/.github/workflows/openapi-generator.yaml index ccf8783f44..fcbf678e89 100644 --- a/.github/workflows/openapi-generator.yaml +++ b/.github/workflows/openapi-generator.yaml @@ -80,44 +80,6 @@ jobs: name: surefire-test-results path: '**/surefire-reports/TEST-*.xml' - functional-test: - name: Functional tests - runs-on: ubuntu-latest - needs: - - build - strategy: - matrix: - java-version: [11, 17] - steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java-version }} - distribution: 'temurin' - - name: Cache maven dependencies - uses: actions/cache@v3 - env: - cache-name: cache-maven-repository - with: - path: | - ~/.m2/repository - ~/.gradle - !~/.gradle/caches/*/plugin-resolution/ - !~/.m2/repository/org/openapitools/ - key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - - name: Run unit tests - run: cd modules/openapi-generator && mvn --no-snapshot-updates --batch-mode -Dtest="**/functional/*Test" test -Dorg.slf4j.simpleLogger.defaultLogLevel=error - - name: Publish unit test reports - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: surefire-test-results - path: '**/surefire-reports/TEST-*.xml' - documentation: name: Docs up-to-date runs-on: ubuntu-latest diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/helidon/JavaHelidonCommonCodegenPackagePrefixTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/helidon/JavaHelidonCommonCodegenPackagePrefixTest.java index d55c062f7e..f3cc4a4c49 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/helidon/JavaHelidonCommonCodegenPackagePrefixTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/helidon/JavaHelidonCommonCodegenPackagePrefixTest.java @@ -205,3 +205,6 @@ public class JavaHelidonCommonCodegenPackagePrefixTest { } } + + +