refactor(test): improve IATP tests assertions (#1907)

* refactor(test): improve IATP tests assertions

* pr remark

Author: ndr-brt

edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java

@@ -212,12 +212,10 @@ public ValidatableResponse getCatalog(TractusxParticipantBase provider) {
                 .add(CONTEXT, createObjectBuilder().add(VOCAB, EDC_NAMESPACE))
                 .add(TYPE, "CatalogRequest")
                 .add("counterPartyId", provider.id)
-                .add("counterPartyAddress", provider.federatedCatalog.get().toString())
+                .add("counterPartyAddress", provider.getProtocolUrl())
                 .add("protocol", protocol);
 
-
-        return given()
-                .baseUri(federatedCatalog.get().toString())
+        return baseManagementRequest()
                 .header("x-api-key", MANAGEMENT_API_KEY)
                 .contentType(JSON)
                 .when()

edc-tests/e2e/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractIatpConsumerPullTest.java

@@ -60,7 +60,6 @@
 import static org.eclipse.tractusx.edc.tests.participant.TractusxParticipantBase.ASYNC_TIMEOUT;
 import static org.eclipse.tractusx.edc.tests.transfer.iatp.harness.IatpHelperFunctions.createVcBuilder;
 import static org.eclipse.tractusx.edc.tests.transfer.iatp.harness.IatpHelperFunctions.membershipSubject;
-import static org.hamcrest.Matchers.not;
 import static org.mockserver.integration.ClientAndServer.startClientAndServer;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
@@ -153,6 +152,11 @@ void transferData_whenContractPolicyNotFulfilled(JsonObject contractPolicy, Stri
         var accessPolicyId = provider().createPolicyDefinition(createAccessPolicy(consumer().getBpn()));
         var contractPolicyId = provider().createPolicyDefinition(contractPolicy);
         provider().createContractDefinition(assetId, "def-1", accessPolicyId, contractPolicyId);
+
+        consumer().getCatalog(provider())
+                .log().ifValidationFails()
+                .statusCode(200);
+
         var negotiationId = consumer().initContractNegotiation(provider(), assetId);
 
         await().pollInterval(fibonacci())
@@ -199,16 +203,15 @@ void catalogRequest_whenCredentialExpired() {
                         .build())
                 .orElseThrow(f -> new RuntimeException(f.getFailureDetail()));
 
-
-        // verify the failed catalog request
         try {
             consumer().getCatalog(provider())
                     .log().ifError()
-                    .statusCode(not(200));
+                    .statusCode(502);
         } finally {
-            // restore the non-expired cred
+            // restore the original credential
             store.update(existingCred);
         }
+
     }
 
     @DisplayName("Expect the Catalog request to fail if a credential is revoked")
@@ -268,9 +271,9 @@ void catalogRequest_whenCredentialRevoked() {
             // verify the failed catalog request
             consumer().getCatalog(provider())
                     .log().ifValidationFails()
-                    .statusCode(not(200));
+                    .statusCode(502);
         } finally {
-            // restore the original credential without credentialStatus
+            // restore the original credential
             store.update(existingCred);
         }
     }

edc-tests/e2e/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/CredentialSpoofTest.java

@@ -52,7 +52,6 @@
 import static org.eclipse.tractusx.edc.tests.transfer.iatp.harness.IatpHelperFunctions.configureParticipant;
 import static org.eclipse.tractusx.edc.tests.transfer.iatp.runtime.Runtimes.iatpRuntime;
 import static org.eclipse.tractusx.edc.tests.transfer.iatp.runtime.Runtimes.stsRuntime;
-import static org.hamcrest.Matchers.not;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 
@@ -139,7 +138,7 @@ void shouldNotImpersonateConsumer_withWrappedConsumerCredential() {
 
         MALICIOUS_ACTOR.getCatalog(PROVIDER)
                 .log().ifError()
-                .statusCode(not(200));
+                .statusCode(502);
     }
 
     @Test
@@ -167,7 +166,7 @@ void shouldNotImpersonateConsumer_withConsumerPresentation() {
 
         MALICIOUS_ACTOR.getCatalog(PROVIDER)
                 .log().ifError()
-                .statusCode(not(200));
+                .statusCode(502);
 
     }