From be1bd6f1abc745896251142585209b206bb2865e Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:06:10 +0000 Subject: [PATCH 01/16] Added test workflow --- .github/workflows/maven-test.yml | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/maven-test.yml diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml new file mode 100644 index 00000000..162adeb3 --- /dev/null +++ b/.github/workflows/maven-test.yml @@ -0,0 +1,34 @@ +# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created +# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path + +name: Maven Package + +on: + release: + types: [created] + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + server-id: github # Value of the distributionManagement/repository/id field of the pom.xml + settings-path: ${{ github.workspace }} # location for the settings.xml file + + - name: Build with Maven + run: mvn -B package --file pom.xml + + - name: Publish to GitHub Packages Apache Maven + run: mvn test + env: + GITHUB_TOKEN: ${{ github.token }} From 921416ca53e50f529d8671a2811adcebe42609e5 Mon Sep 17 00:00:00 2001 From: Duncan Jones <46377904+Gruncan@users.noreply.github.com> Date: Mon, 30 Oct 2023 19:03:34 +0000 Subject: [PATCH 02/16] Create maven.yml (cherry picked from commit 1f22c5803df221da68e255b951424229a3a3d049) --- .github/workflows/maven.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 00000000..b72363f3 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,35 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Java CI with Maven + +on: + push: + branches: [ "development" ] + pull_request: + branches: [ "development" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --file pom.xml + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + - name: Update dependency graph + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 From 187f4a308c750d79e853f9d9ea60df0d8398984d Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:11:22 +0000 Subject: [PATCH 03/16] Updated test workflow --- .github/workflows/maven-test.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml index 162adeb3..983ebd9c 100644 --- a/.github/workflows/maven-test.yml +++ b/.github/workflows/maven-test.yml @@ -1,7 +1,7 @@ # This workflow will build a package using Maven and then publish it to GitHub packages when a release is created # For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path -name: Maven Package +name: Maven Test CI on: release: @@ -25,10 +25,6 @@ jobs: server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file - - name: Build with Maven - run: mvn -B package --file pom.xml - - - name: Publish to GitHub Packages Apache Maven + - name: Test with Maven run: mvn test - env: - GITHUB_TOKEN: ${{ github.token }} + From 9c10a5cd1363470ed805f4f46e6e3bfbf1101480 Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:14:01 +0000 Subject: [PATCH 04/16] Added test to maven.yml --- .github/workflows/maven-publish.yml | 34 ----------------------------- .github/workflows/maven-test.yml | 30 ------------------------- .github/workflows/maven.yml | 2 ++ 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 .github/workflows/maven-publish.yml delete mode 100644 .github/workflows/maven-test.yml diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml deleted file mode 100644 index dab69fef..00000000 --- a/.github/workflows/maven-publish.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path - -name: Maven Package - -on: - release: - types: [created] - -jobs: - build: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Build with Maven - run: mvn -B package --file pom.xml - - - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml - env: - GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml deleted file mode 100644 index 983ebd9c..00000000 --- a/.github/workflows/maven-test.yml +++ /dev/null @@ -1,30 +0,0 @@ -# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path - -name: Maven Test CI - -on: - release: - types: [created] - -jobs: - build: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Test with Maven - run: mvn test - diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b72363f3..7098fda2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -30,6 +30,8 @@ jobs: - name: Build with Maven run: mvn -B package --file pom.xml + - name: Test with Maven + run: mvn test # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 From 67dcc2ba13a2f274d7d679002dd3b271e34567a9 Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:16:22 +0000 Subject: [PATCH 05/16] Updated again --- .../workflows/{maven.yml => maven-build.yml} | 2 -- .github/workflows/maven-test.yml | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) rename .github/workflows/{maven.yml => maven-build.yml} (96%) create mode 100644 .github/workflows/maven-test.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven-build.yml similarity index 96% rename from .github/workflows/maven.yml rename to .github/workflows/maven-build.yml index 7098fda2..b72363f3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven-build.yml @@ -30,8 +30,6 @@ jobs: - name: Build with Maven run: mvn -B package --file pom.xml - - name: Test with Maven - run: mvn test # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml new file mode 100644 index 00000000..01645359 --- /dev/null +++ b/.github/workflows/maven-test.yml @@ -0,0 +1,35 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Java test + +on: + push: + branches: [ "development" ] + pull_request: + branches: [ "development" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + - name: Test with maven + run: mvn test + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + - name: Update dependency graph + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 From 9a3951865d1d71e73b81bdf99a10a03e5cca2989 Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:18:41 +0000 Subject: [PATCH 06/16] Updated again again --- .github/workflows/maven-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml index 01645359..a417b877 100644 --- a/.github/workflows/maven-test.yml +++ b/.github/workflows/maven-test.yml @@ -15,8 +15,7 @@ on: branches: [ "development" ] jobs: - build: - + test: runs-on: ubuntu-latest steps: From 8440f75550132e33a25bd6946d705a1ba8d0d0ef Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:19:42 +0000 Subject: [PATCH 07/16] Consolidated again --- .github/workflows/maven-test.yml | 34 ------------------- .../workflows/{maven-build.yml => maven.yml} | 18 ++++++++++ 2 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 .github/workflows/maven-test.yml rename .github/workflows/{maven-build.yml => maven.yml} (66%) diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml deleted file mode 100644 index a417b877..00000000 --- a/.github/workflows/maven-test.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -name: Java test - -on: - push: - branches: [ "development" ] - pull_request: - branches: [ "development" ] - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: maven - - name: Test with maven - run: mvn test - - # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - - name: Update dependency graph - uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven.yml similarity index 66% rename from .github/workflows/maven-build.yml rename to .github/workflows/maven.yml index b72363f3..dc91e777 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven.yml @@ -33,3 +33,21 @@ jobs: # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 + + test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + - name: Test with maven + run: mvn test + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + - name: Update dependency graph + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 \ No newline at end of file From 01c8ba0a873421841788a39885b6d818ffcbcb61 Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:22:33 +0000 Subject: [PATCH 08/16] Added steps --- .github/workflows/maven.yml | 51 ++++++++++---------------- .github/workflows/setup-java-maven.yml | 12 ++++++ 2 files changed, 31 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/setup-java-maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index dc91e777..2cbaf068 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,12 +1,4 @@ -# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -name: Java CI with Maven +name: Maven Build and Test on: push: @@ -16,38 +8,33 @@ on: jobs: build: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: maven - - name: Build with Maven - run: mvn -B package --file pom.xml - - # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - - name: Update dependency graph - uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 + - uses: actions/checkout@v3 + - name: Set up JDK and Maven + uses: ./.github/workflows/setup-java-maven + + - name: Build with Maven + run: mvn -B package --file pom.xml + + - name: Update dependency graph + if: always() # Run even if build fails + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 test: + needs: build runs-on: ubuntu-latest + if: ${{ needs.build.outcome == 'success' }} steps: - uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: maven - - name: Test with maven + - name: Set up JDK and Maven + uses: ./.github/workflows/setup-java-maven + + - name: Test with Maven run: mvn test - # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph - uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 \ No newline at end of file + if: always() # Run even if tests fail + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 diff --git a/.github/workflows/setup-java-maven.yml b/.github/workflows/setup-java-maven.yml new file mode 100644 index 00000000..9522fc3b --- /dev/null +++ b/.github/workflows/setup-java-maven.yml @@ -0,0 +1,12 @@ +# File: .github/workflows/setup-java-maven.yml +name: Set up JDK and Maven + +runs-on: ubuntu-latest + +steps: + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven From 27c519fb9d0be825a716c7d278917391bbbdac3e Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:24:11 +0000 Subject: [PATCH 09/16] Fix --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2cbaf068..eba1a4bc 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK and Maven - uses: ./.github/workflows/setup-java-maven + uses: ./.github/workflows/setup-java-maven.yml - name: Build with Maven run: mvn -B package --file pom.xml @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK and Maven - uses: ./.github/workflows/setup-java-maven + uses: ./.github/workflows/setup-java-maven.yml - name: Test with Maven run: mvn test From 76d316a07b5993b737ac0d51be92a02e6fe3b29d Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:25:36 +0000 Subject: [PATCH 10/16] Should fix --- .github/workflows/maven.yml | 12 ++++++++++-- .github/workflows/setup-java-maven.yml | 12 ------------ 2 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 .github/workflows/setup-java-maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index eba1a4bc..df94e948 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -13,7 +13,11 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK and Maven - uses: ./.github/workflows/setup-java-maven.yml + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven - name: Build with Maven run: mvn -B package --file pom.xml @@ -30,7 +34,11 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK and Maven - uses: ./.github/workflows/setup-java-maven.yml + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven - name: Test with Maven run: mvn test diff --git a/.github/workflows/setup-java-maven.yml b/.github/workflows/setup-java-maven.yml deleted file mode 100644 index 9522fc3b..00000000 --- a/.github/workflows/setup-java-maven.yml +++ /dev/null @@ -1,12 +0,0 @@ -# File: .github/workflows/setup-java-maven.yml -name: Set up JDK and Maven - -runs-on: ubuntu-latest - -steps: - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: maven From 0648c221651e09e5e9d581403180cdc6b88969a7 Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:29:20 +0000 Subject: [PATCH 11/16] Should run test --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index df94e948..2b5625e1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,7 +29,7 @@ jobs: test: needs: build runs-on: ubuntu-latest - if: ${{ needs.build.outcome == 'success' }} + if: ${{ success() }} steps: - uses: actions/checkout@v3 From 18fc84456ddcc3af75083111811ecf21a0530e69 Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:30:57 +0000 Subject: [PATCH 12/16] Updated maven build so tests don't run on build --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index f50915ce..96933cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -69,14 +69,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - NetworkTest - - org.apache.maven.plugins maven-jar-plugin From 6b0641bff92f8ae4e253a2b82fa62a7e26866599 Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:32:58 +0000 Subject: [PATCH 13/16] Added skiptest to maven.yml --- .github/workflows/maven.yml | 2 +- pom.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2b5625e1..5edf9d6b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,7 +20,7 @@ jobs: cache: maven - name: Build with Maven - run: mvn -B package --file pom.xml + run: mvn -B package --file pom.xml -DskipTests - name: Update dependency graph if: always() # Run even if build fails diff --git a/pom.xml b/pom.xml index 96933cbb..f50915ce 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,14 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + NetworkTest + + org.apache.maven.plugins maven-jar-plugin From 0603d8a2fc64b0bd82581dd64714d65c3ebef8f3 Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:34:49 +0000 Subject: [PATCH 14/16] Test if pipeline fails --- .../gruncan/spotify/requests/urls/SpotifyAnnotationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/dev/gruncan/spotify/requests/urls/SpotifyAnnotationTest.java b/src/test/java/dev/gruncan/spotify/requests/urls/SpotifyAnnotationTest.java index eb7ffcad..2093cde8 100644 --- a/src/test/java/dev/gruncan/spotify/requests/urls/SpotifyAnnotationTest.java +++ b/src/test/java/dev/gruncan/spotify/requests/urls/SpotifyAnnotationTest.java @@ -21,7 +21,7 @@ public class SpotifyAnnotationTest { @Test public void spotifyRequestAnnotationTest1() { TestRequestExecutorClass1 trc = new TestRequestExecutorClass1(); - trc.setField1("value1"); + trc.setField1("value5"); assertThrows(SpotifyUrlParserException.class, () -> client.getBuiltUrlE(trc)); } From fad2e97e622b1f8620e455ec5dc822d18e965afc Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:37:14 +0000 Subject: [PATCH 15/16] Test actually will fail --- .../dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java b/src/test/java/dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java index 10ab73f2..fe468b15 100644 --- a/src/test/java/dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java +++ b/src/test/java/dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java @@ -30,7 +30,7 @@ public void albumReleasesGetTestUrl(){ @Test public void albumSeveralGetTestUrl() { - SpotifyRequestVariant request = new AlbumSeveralGet("382ObEPsp2rxGrnsizN5TX", "1A2GTWGtFfWp7KSQTwWOyo", "2noRn2Aes5aoNVsU6iWThc"); + SpotifyRequestVariant request = new AlbumSeveralGet("382ObEPsp2rxGrnsizN5TX1", "1A2GTWGtFfWp7KSQTwWOyo", "2noRn2Aes5aoNVsU6iWThc"); String actualUrl = super.client.getBuiltURL(request); assertEquals(actualUrl, super.getCorrectURL(request.getClass())); } From 32e1beaeb881299a2e0b95ecd0b5ecad26cb3608 Mon Sep 17 00:00:00 2001 From: Duncan Jones Date: Mon, 30 Oct 2023 19:38:54 +0000 Subject: [PATCH 16/16] Test correctly fails (reverted) --- .../dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java b/src/test/java/dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java index fe468b15..10ab73f2 100644 --- a/src/test/java/dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java +++ b/src/test/java/dev/gruncan/spotify/requests/data/tests/AlbumUrlTests.java @@ -30,7 +30,7 @@ public void albumReleasesGetTestUrl(){ @Test public void albumSeveralGetTestUrl() { - SpotifyRequestVariant request = new AlbumSeveralGet("382ObEPsp2rxGrnsizN5TX1", "1A2GTWGtFfWp7KSQTwWOyo", "2noRn2Aes5aoNVsU6iWThc"); + SpotifyRequestVariant request = new AlbumSeveralGet("382ObEPsp2rxGrnsizN5TX", "1A2GTWGtFfWp7KSQTwWOyo", "2noRn2Aes5aoNVsU6iWThc"); String actualUrl = super.client.getBuiltURL(request); assertEquals(actualUrl, super.getCorrectURL(request.getClass())); }