Merge pull request #17 from eclipse-edc/fix-ci

fix: test assertion

Author: ndr-brt

extensions/control-plane/store/contract-negotiation-store-cosmos/src/test/java/org/eclipse/edc/connector/store/azure/cosmos/contractnegotiation/CosmosContractNegotiationStoreIntegrationTest.java

@@ -466,7 +466,7 @@ void findAll_verifySortingInvalidSortField() {
     @Test
     void queryAgreements_noQuerySpec() {
         IntStream.range(0, 10).forEach(i -> {
-            var contractAgreement = createContractBuilder().id(ContractId.createContractId(UUID.randomUUID().toString(), "test-asset-id")).build();
+            var contractAgreement = createContractBuilder().id(ContractId.create(UUID.randomUUID().toString(), "test-asset-id").toString()).build();
             var negotiation = createNegotiationBuilder(UUID.randomUUID().toString()).contractAgreement(contractAgreement).build();
             store.save(negotiation);
         });
@@ -479,7 +479,7 @@ void queryAgreements_noQuerySpec() {
     @Test
     void queryAgreements_verifyPaging() {
         IntStream.range(0, 10).forEach(i -> {
-            var contractAgreement = createContractBuilder().id(ContractId.createContractId(UUID.randomUUID().toString(), "test-asset-id")).build();
+            var contractAgreement = createContractBuilder().id(ContractId.create(UUID.randomUUID().toString(), "test-asset-id").toString()).build();
             var negotiation = createNegotiationBuilder(UUID.randomUUID().toString()).contractAgreement(contractAgreement).build();
             store.save(negotiation);
         });

system-tests/azure-data-factory-tests/src/test/java/org/eclipse/edc/test/system/local/AzureDataFactoryTransferIntegrationTest.java

@@ -173,7 +173,7 @@ void transferBlob_success() {
 
         var blobServiceClient = TestFunctions.getBlobServiceClient(CONSUMER_STORAGE_ACCOUNT_NAME, account2Key, TestFunctions.getBlobServiceTestEndpoint(format("https://%s.blob.core.windows.net", CONSUMER_STORAGE_ACCOUNT_NAME)));
 
-        var runner = new TransferTestRunner(new BlobTransferConfiguration(CONSUMER_CONNECTOR_MANAGEMENT_URL, PROVIDER_PROTOCOL_URL, blobServiceClient, 360));
+        var runner = new TransferTestRunner(new BlobTransferConfiguration(CONSUMER_CONNECTOR_MANAGEMENT_URL, PROVIDER_PROTOCOL_URL, blobServiceClient));
 
         runner.executeTransfer();
     }

system-tests/azure-tests/src/test/java/org/eclipse/edc/test/system/local/BlobTransferIntegrationTest.java

@@ -148,11 +148,9 @@ void transferBlob_success() {
 
         var blobServiceClient = TestFunctions.getBlobServiceClient(account2Name, account2Key, TestFunctions.getBlobServiceTestEndpoint(account2Name));
 
-        var runner = new TransferTestRunner(new BlobTransferConfiguration(CONSUMER_CONNECTOR_MANAGEMENT_URL, PROVIDER_PROTOCOL_URL, blobServiceClient, 30));
+        var runner = new TransferTestRunner(new BlobTransferConfiguration(CONSUMER_CONNECTOR_MANAGEMENT_URL, PROVIDER_PROTOCOL_URL, blobServiceClient));
 
         runner.executeTransfer();
-
     }
 
-
 }

system-tests/azure-tests/src/testFixtures/java/org/eclipse/edc/test/system/local/BlobTransferConfiguration.java

@@ -32,13 +32,11 @@ public class BlobTransferConfiguration implements TransferConfiguration {
     private final String consumerManagementUrl;
     private final String providerIdsUrl;
     private final BlobServiceClient blobServiceClient;
-    private final int maxSeconds;
 
-    public BlobTransferConfiguration(String consumerManagementUrl, String providerIdsUrl, BlobServiceClient blobServiceClient, int maxSeconds) {
+    public BlobTransferConfiguration(String consumerManagementUrl, String providerIdsUrl, BlobServiceClient blobServiceClient) {
         this.consumerManagementUrl = consumerManagementUrl;
         this.providerIdsUrl = providerIdsUrl;
         this.blobServiceClient = blobServiceClient;
-        this.maxSeconds = maxSeconds;
     }
 
     @Override

system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/EndToEndTransferCosmosDbTest.java

@@ -23,6 +23,7 @@
 import org.eclipse.edc.connector.contract.spi.ContractId;
 import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
 import org.eclipse.edc.policy.model.Operator;
+import org.eclipse.edc.spi.EdcException;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -312,7 +313,7 @@ void httpPushDataTransfer_oauth2Provisioning() {
 
     private ContractId getContractId(JsonObject dataset) {
         var id = dataset.getJsonArray(ODRL_POLICY_ATTRIBUTE).get(0).asJsonObject().getString(ID);
-        return ContractId.parse(id);
+        return ContractId.parseId(id).orElseThrow(f -> new EdcException(f.getFailureDetail()));
     }
 
     private JsonObject httpDataAddress(String baseUrl) {

system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/Participant.java

@@ -469,7 +469,7 @@ public String getName() {
 
     private ContractId getContractId(JsonObject dataset) {
         var id = dataset.getJsonArray(ODRL_POLICY_ATTRIBUTE).get(0).asJsonObject().getString(ID);
-        return ContractId.parse(id);
+        return ContractId.parseId(id).orElseThrow(f -> new RuntimeException(f.getFailureDetail()));
     }
 
     private String getContractNegotiationField(String negotiationId, String fieldName) {

system-tests/tests/src/testFixtures/java/org/eclipse/edc/test/system/utils/TransferTestClient.java

@@ -36,7 +36,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 import static org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates.FINALIZED;
-import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.STARTED;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.CONTEXT;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
@@ -47,7 +46,6 @@
 import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.CONSUMER_PARTICIPANT_ID;
 import static org.eclipse.edc.test.system.utils.Constants.POLL_INTERVAL;
 import static org.eclipse.edc.test.system.utils.Constants.TIMEOUT;
-import static org.hamcrest.Matchers.is;
 
 /**
  * Simple client for testing transfer scenario
@@ -64,7 +62,7 @@ public TransferTestClient(String consumerUrl) {
 
     static ContractId getContractId(JsonObject dataset) {
         var id = dataset.getJsonArray(ODRL_POLICY_ATTRIBUTE).get(0).asJsonObject().getString(ID);
-        return ContractId.parse(id);
+        return ContractId.parseId(id).orElseThrow(f -> new EdcException(f.getFailureDetail()));
     }
 
     public JsonArray getCatalogDatasets(String providerUrl) {
@@ -206,7 +204,6 @@ public Map<String, String> getTransferProcess(String transferProcessId) {
                 .get("/v2/transferprocesses/{id}", transferProcessId)
                 .then()
                 .statusCode(200)
-                .body("'edc:state'", is(STARTED.name()))
                 .extract().jsonPath().get("'edc:dataDestination'");
     }