fix: test (#1010)

extensions/contract-termination/build.gradle.kts

@@ -25,6 +25,7 @@ dependencies {
     testImplementation(project(":utils:test-utils"))
     testImplementation(project(":utils:versions"))
 
+    testImplementation(libs.edc.monitorJdkLogger)
     testImplementation(libs.edc.http) {
         exclude(group = "org.eclipse.jetty", module = "jetty-client")
         exclude(group = "org.eclipse.jetty", module = "jetty-http")

extensions/contract-termination/src/test/java/de/sovity/edc/extension/contacttermination/query/TerminateContractQueryTest.java

@@ -28,9 +28,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.time.OffsetDateTime;
+import java.time.temporal.ChronoUnit;
 
 import static de.sovity.edc.ext.db.jooq.enums.ContractTerminatedBy.COUNTERPARTY;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.within;
 
 @ExtendWith(E2eTestExtension.class)
 class TerminateContractQueryTest {
@@ -77,7 +79,7 @@ void terminateConsumerAgreementOrThrow_shouldInsertRowInTerminationTable(
                 assertThat(detailsAfterTermination.consumerAgentId()).isEqualTo("consumer");
                 assertThat(detailsAfterTermination.reason()).isEqualTo("Some reason");
                 assertThat(detailsAfterTermination.detail()).isEqualTo("Some detail");
-                assertThat(detailsAfterTermination.terminatedAt()).isBetween(now, now.plusSeconds(1));
+                assertThat(detailsAfterTermination.terminatedAt()).isCloseTo(now, within(2, ChronoUnit.SECONDS));
                 assertThat(detailsAfterTermination.terminatedBy()).isEqualTo(COUNTERPARTY);
             }
         );

extensions/wrapper/clients/java-client/README.md

@@ -72,7 +72,7 @@ public class WrapperClientExample {
 ```java
 import de.sovity.edc.client.EdcClient;
 import de.sovity.edc.client.gen.model.KpiResult;
-import de.sovity.edc.client.oauth2.OAuth2ClientCredentials;
+import de.sovity.edc.client.oauth2.Oauth2ClientCredentials;
 import de.sovity.edc.client.oauth2.SovityKeycloakUrl;
 
 /**

tests/src/test/java/de/sovity/edc/e2e/AlwaysTrueMigrationTestReversed.java

@@ -11,7 +11,6 @@
 import org.mockserver.integration.ClientAndServer;
 
 import static de.sovity.edc.e2e.AlwaysTrueMigrationTest.testTransfer;
-import static org.assertj.core.api.Assertions.assertThat;
 
 class AlwaysTrueMigrationTestReversed {
 

tests/src/test/java/de/sovity/edc/e2e/ContractTerminationTest.java

@@ -43,6 +43,7 @@
 import org.mockserver.model.HttpResponse;
 
 import java.time.OffsetDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.IntStream;
@@ -54,6 +55,7 @@
 import static java.time.Duration.ofSeconds;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.within;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
@@ -449,7 +451,7 @@ private static void assertTermination(
         assertThat(consumerInformation).isNotNull();
 
         val now = OffsetDateTime.now();
-        assertThat(consumerInformation.getTerminatedAt()).isBetween(now.minusMinutes(1), now.plusMinutes(1));
+        assertThat(consumerInformation.getTerminatedAt()).isCloseTo(now, within(1, ChronoUnit.MINUTES));
 
         assertThat(consumerInformation.getDetail()).isEqualTo(detail);
         assertThat(consumerInformation.getReason()).isEqualTo(reason);

utils/test-utils/build.gradle.kts

@@ -16,12 +16,8 @@ dependencies {
     api(project(":extensions:wrapper:clients:java-client"))
     api(project(":utils:json-and-jsonld-utils"))
 
-    implementation(project(":extensions:policy-always-true"))
-    implementation(project(":extensions:postgres-flyway"))
     implementation(project(":utils:versions"))
-    implementation(libs.edc.jsonLdSpi)
     implementation(libs.edc.jsonLd)
-    implementation(libs.edc.sqlCore)
     implementation(libs.assertj.core)
     implementation(libs.jooq.jooq)
     implementation(libs.mockserver.netty)

utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/extension/E2eTestExtension.java

@@ -37,7 +37,6 @@
 import java.util.stream.Stream;
 
 import static de.sovity.edc.extension.e2e.connector.config.ConnectorConfigFactory.forTestDatabase;
-import static de.sovity.edc.extension.postgresql.PostgresFlywayExtension.EDC_FLYWAY_ADDITIONAL_MIGRATION_LOCATIONS;
 import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
 import static org.mockserver.stop.Stop.stopQuietly;
 
@@ -85,7 +84,7 @@ public E2eTestExtension(
             "consumer",
             testDatabase -> {
                 consumerConfig = forTestDatabase(this.consumerParticipantId, testDatabase);
-                consumerConfig.getProperties().put(EDC_FLYWAY_ADDITIONAL_MIGRATION_LOCATIONS, this.additionalConsumerMigrationLocation);
+                consumerConfig.getProperties().put("edc.flyway.additional.migration.locations", this.additionalConsumerMigrationLocation);
                 return consumerConfig.getProperties();
             }
         );
@@ -94,7 +93,7 @@ public E2eTestExtension(
             "provider",
             testDatabase -> {
                 providerConfig = forTestDatabase(this.providerParticipantId, testDatabase);
-                providerConfig.getProperties().put(EDC_FLYWAY_ADDITIONAL_MIGRATION_LOCATIONS, this.additionalProviderMigrationLocation);
+                providerConfig.getProperties().put("edc.flyway.additional.migration.locations", this.additionalProviderMigrationLocation);
                 return providerConfig.getProperties();
             }
         );