diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000..68621268 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,56 @@ +name: Tests +on: + push: + branches: + - '**' + tags-ignore: + - '**' + # Triggers the workflow on labeled PRs only. + pull_request_target: + types: [ labeled ] +# Ensures that only the latest commit is running for each PR at a time. +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.ref }} + cancel-in-progress: true +jobs: + Tests: + if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push' + name: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu, windows, macOS ] + include: + - os: windows + gradlewSuffix: .bat + runs-on: ${{ matrix.os }}-latest + steps: + - name: Install Go + uses: actions/setup-go@v4 + with: + go-version: 1.20.x + cache: false + - name: Checkout code + uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha }} + - name: Setup Artifactory + run: | + go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest + ~/go/bin/local-rt-setup + env: + RTLIC: ${{secrets.RTLIC}} + GOPROXY: direct + + - name: Install Java + uses: actions/setup-java@v3 + with: + java-version: "8" + distribution: "temurin" + + - name: Run tests + run: ./gradlew${{ matrix.gradlewSuffix }} clean test + env: + CLIENTTESTS_ARTIFACTORY_URL: http://localhost:8081/artifactory + CLIENTTESTS_ARTIFACTORY_USERNAME: admin + CLIENTTESTS_ARTIFACTORY_PASSWORD: password diff --git a/README.md b/README.md index ac178b96..46dbd037 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ [![Scanned by Frogbot](https://raw.github.com/jfrog/frogbot/master/images/frogbot-badge.svg)](https://github.com/jfrog/frogbot#readme) -|Branch|Status| -|:---:|:---:| -|master|[![Build status](https://ci.appveyor.com/api/projects/status/sarjlbpi6dfgrd5w/branch/master?svg=true)](https://ci.appveyor.com/project/jfrog-ecosystem/artifactory-client-java/branch/master) -|dev|[![Build status](https://ci.appveyor.com/api/projects/status/sarjlbpi6dfgrd5w/branch/dev?svg=true)](https://ci.appveyor.com/project/jfrog-ecosystem/artifactory-client-java/branch/dev) +| Branch |Status| +|:------:|:---:| +|master|[![Test](https://github.com/jfrog/artifactory-client-java/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/jfrog/artifactory-client-java/actions/workflows/tests.yml?query=branch%3Amaster) +|dev|[![Test](https://github.com/jfrog/artifactory-client-java/actions/workflows/tests.yml/badge.svg?branch=dev)](https://github.com/jfrog/artifactory-client-java/actions/workflows/tests.yml?query=branch%3Adev) diff --git a/ci/appveyor.yml b/ci/appveyor.yml deleted file mode 100644 index d4fca21d..00000000 --- a/ci/appveyor.yml +++ /dev/null @@ -1,20 +0,0 @@ -image: - - Visual Studio 2017 - - Ubuntu - -stack: jdk 8 -environment: - APPVEYOR_SAVE_CACHE_ON_ERROR: true - APPVEYOR_YML_DISABLE_PS_LINUX: true - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 - -test_script: - - sh: ./gradlew test - - cmd: gradlew.bat test - -# Don't actually build. -build: off - -cache: - - C:\Users\appveyor\.gradle\ -> build.gradle - - /home/appveyor/.gradle/ -> build.gradle diff --git a/services/src/test/java/org/jfrog/artifactory/client/StreamingRestCallTest.java b/services/src/test/java/org/jfrog/artifactory/client/StreamingRestCallTest.java index c29df72a..7261831e 100644 --- a/services/src/test/java/org/jfrog/artifactory/client/StreamingRestCallTest.java +++ b/services/src/test/java/org/jfrog/artifactory/client/StreamingRestCallTest.java @@ -47,11 +47,6 @@ public void testErrorStreamingRestCall() throws IOException { assertFalse(response.isSuccessResponse()); assertEquals(response.getStatusLine().getStatusCode(), 404); String raw = IOUtils.toString(response.getInputStream(), StandardCharsets.UTF_8); - assertEquals(raw, "{\n" + - " \"errors\" : [ {\n" + - " \"status\" : 404,\n" + - " \"message\" : \"File not found.\"\n" + - " } ]\n" + - "}"); + assertTrue(raw.contains("File not found"), "Expected response to contain 'File not found'.\nResponse:" + raw); } }