From 8ef162ca64c0655b51fead975ad801237dcff8c0 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Mon, 25 Mar 2024 14:54:28 +0100 Subject: [PATCH] parallelize tests --- .github/workflows/verify.yaml | 9 --------- .../edc/iam/iatp/sts/dim/DimSecureTokenServiceTest.java | 2 +- .../edc/iam/ssi/miw/api/MiwApiClientImplTest.java | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index 3eafae03c..a1df254d0 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -79,7 +79,6 @@ jobs: unit-tests: runs-on: ubuntu-latest - needs: [ verify-formatting, verify-license-headers ] steps: - uses: actions/checkout@v4 @@ -90,7 +89,6 @@ jobs: integration-tests: runs-on: ubuntu-latest - needs: [ verify-formatting, verify-license-headers ] steps: - uses: actions/checkout@v4 @@ -101,7 +99,6 @@ jobs: api-tests: runs-on: ubuntu-latest - needs: [ verify-formatting, verify-license-headers ] steps: - uses: actions/checkout@v4 @@ -112,7 +109,6 @@ jobs: end-to-end-tests: runs-on: ubuntu-latest - needs: [ verify-formatting, verify-license-headers ] strategy: fail-fast: false matrix: @@ -134,9 +130,6 @@ jobs: postgres-tests: runs-on: ubuntu-latest - - needs: [ verify-formatting, verify-license-headers ] - services: postgres: image: postgres:14.2 @@ -154,7 +147,6 @@ jobs: dataplane-tests: runs-on: ubuntu-latest - needs: [ verify-formatting, verify-license-headers ] steps: - uses: actions/checkout@v4 @@ -165,7 +157,6 @@ jobs: miw-integration-tests: runs-on: ubuntu-latest - needs: [ verify-formatting, verify-license-headers ] steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-java diff --git a/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureTokenServiceTest.java b/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureTokenServiceTest.java index 787a6f180..ef4a0a758 100644 --- a/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureTokenServiceTest.java +++ b/edc-extensions/iatp/tx-iatp-sts-dim/src/test/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimSecureTokenServiceTest.java @@ -47,10 +47,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.ISSUER; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.SUBJECT; +import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImplTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImplTest.java index 83db6299b..71b747e56 100644 --- a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImplTest.java +++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImplTest.java @@ -47,7 +47,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient; +import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient; import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl.CREDENTIAL_PATH; import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl.HOLDER_IDENTIFIER; import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl.PRESENTATIONS_PATH;