From 83da26bc5619dd3e7fb82ce97f265ffb3e01b1e7 Mon Sep 17 00:00:00 2001 From: nickpalladino Date: Thu, 19 Feb 2026 10:23:39 -0500 Subject: [PATCH 1/3] Try latest testcontainers version --- pom.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 95d75a0d1..28ecfc9bf 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 1.14 1.9.0 3.12.0 - 1.21.4 + 2.0.3 7.7.3 31.0.1-jre @@ -541,16 +541,6 @@ ${maven.compiler.target} - - org.apache.maven.plugins - maven-surefire-plugin - - - - **/GigwaGenotypeServiceImplIntegrationTest.java - - - org.jooq jooq-codegen-maven From 3140857c6141b71e2dc6f499d64705abd1746fef Mon Sep 17 00:00:00 2001 From: nickpalladino Date: Thu, 19 Feb 2026 11:07:34 -0500 Subject: [PATCH 2/3] Update testcontainers localstack artifact id --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28ecfc9bf..5d1fb0826 100644 --- a/pom.xml +++ b/pom.xml @@ -357,7 +357,7 @@ org.testcontainers - localstack + testcontainers-localstack ${testcontainers.version} test From 3984ddb9fea2c3574be295ccffca2467fa332650 Mon Sep 17 00:00:00 2001 From: nickpalladino Date: Thu, 19 Feb 2026 14:30:07 -0500 Subject: [PATCH 3/3] Update to Junit5 for testcontainers 2.x --- .../AccessibilityControllerIntegrationTest.java | 2 +- .../controller/CountryControllerIntegrationTest.java | 2 +- .../EnvironmentDataTypeControllerIntegrationTest.java | 2 +- .../ExperimentControllerIntegrationTest.java | 2 +- .../controller/ProgramControllerIntegrationTest.java | 2 +- .../v1/controller/RoleControllerIntegrationTest.java | 2 +- .../TopographyControllerIntegrationTest.java | 2 +- .../v1/controller/TraitControllerIntegrationTest.java | 2 +- .../TraitUploadControllerIntegrationTest.java | 2 +- .../v1/controller/UserControllerIntegrationTest.java | 10 +++++----- .../brapi/v2/GermplasmControllerIntegrationTest.java | 2 +- .../brapi/v2/ListControllerIntegrationTest.java | 3 +-- .../services/parsers/TraitFileParserUnitTest.java | 2 +- .../services/validators/TraitValidatorUnitTest.java | 2 +- 14 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/test/java/org/breedinginsight/api/v1/controller/AccessibilityControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/AccessibilityControllerIntegrationTest.java index b111c6136..028aa7363 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/AccessibilityControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/AccessibilityControllerIntegrationTest.java @@ -35,7 +35,7 @@ import javax.inject.Inject; import static io.micronaut.http.HttpRequest.GET; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @MicronautTest diff --git a/src/test/java/org/breedinginsight/api/v1/controller/CountryControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/CountryControllerIntegrationTest.java index 801361125..ba9566112 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/CountryControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/CountryControllerIntegrationTest.java @@ -35,7 +35,7 @@ import javax.inject.Inject; import static io.micronaut.http.HttpRequest.GET; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @MicronautTest diff --git a/src/test/java/org/breedinginsight/api/v1/controller/EnvironmentDataTypeControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/EnvironmentDataTypeControllerIntegrationTest.java index a8100835a..4e9909167 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/EnvironmentDataTypeControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/EnvironmentDataTypeControllerIntegrationTest.java @@ -35,7 +35,7 @@ import javax.inject.Inject; import static io.micronaut.http.HttpRequest.GET; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @MicronautTest diff --git a/src/test/java/org/breedinginsight/api/v1/controller/ExperimentControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/ExperimentControllerIntegrationTest.java index 21358e69d..1d437d12e 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/ExperimentControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/ExperimentControllerIntegrationTest.java @@ -57,7 +57,7 @@ import java.util.*; import java.util.stream.Collectors; import static io.micronaut.http.HttpRequest.*; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.*; @MicronautTest diff --git a/src/test/java/org/breedinginsight/api/v1/controller/ProgramControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/ProgramControllerIntegrationTest.java index 32a044fae..1358563d6 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/ProgramControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/ProgramControllerIntegrationTest.java @@ -33,7 +33,7 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import io.micronaut.test.annotation.MockBean; import io.reactivex.Flowable; -import junit.framework.AssertionFailedError; +import org.opentest4j.AssertionFailedError; import lombok.SneakyThrows; import org.breedinginsight.BrAPITest; import org.breedinginsight.TestUtils; diff --git a/src/test/java/org/breedinginsight/api/v1/controller/RoleControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/RoleControllerIntegrationTest.java index f5305b6e8..29bbe0e2b 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/RoleControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/RoleControllerIntegrationTest.java @@ -35,7 +35,7 @@ import javax.inject.Inject; import static io.micronaut.http.HttpRequest.GET; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @MicronautTest diff --git a/src/test/java/org/breedinginsight/api/v1/controller/TopographyControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/TopographyControllerIntegrationTest.java index dd2881244..035a759d0 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/TopographyControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/TopographyControllerIntegrationTest.java @@ -35,7 +35,7 @@ import javax.inject.Inject; import static io.micronaut.http.HttpRequest.GET; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @MicronautTest diff --git a/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java index 08c7edd37..ae8254e9f 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/TraitControllerIntegrationTest.java @@ -30,7 +30,7 @@ import io.micronaut.test.annotation.MockBean; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import io.reactivex.Flowable; -import junit.framework.AssertionFailedError; +import org.opentest4j.AssertionFailedError; import lombok.SneakyThrows; import org.brapi.client.v2.ApiResponse; import org.brapi.client.v2.BrAPIClient; diff --git a/src/test/java/org/breedinginsight/api/v1/controller/TraitUploadControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/TraitUploadControllerIntegrationTest.java index 01a478bdf..ba062535d 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/TraitUploadControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/TraitUploadControllerIntegrationTest.java @@ -28,7 +28,7 @@ import io.micronaut.http.netty.cookies.NettyCookie; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import io.reactivex.Flowable; -import junit.framework.AssertionFailedError; +import org.opentest4j.AssertionFailedError; import org.breedinginsight.BrAPITest; import org.breedinginsight.DatabaseTest; import org.breedinginsight.TestUtils; diff --git a/src/test/java/org/breedinginsight/api/v1/controller/UserControllerIntegrationTest.java b/src/test/java/org/breedinginsight/api/v1/controller/UserControllerIntegrationTest.java index 4914824f3..28f6bca5b 100644 --- a/src/test/java/org/breedinginsight/api/v1/controller/UserControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/api/v1/controller/UserControllerIntegrationTest.java @@ -31,7 +31,7 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import io.micronaut.test.annotation.MockBean; import io.reactivex.Flowable; -import junit.framework.AssertionFailedError; +import org.opentest4j.AssertionFailedError; import lombok.SneakyThrows; import org.breedinginsight.DatabaseTest; import org.breedinginsight.TestUtils; @@ -45,7 +45,7 @@ import org.breedinginsight.services.UserService; import org.breedinginsight.utilities.email.EmailUtil; import org.jooq.DSLContext; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.*; import javax.inject.Inject; import javax.inject.Named; @@ -335,7 +335,7 @@ void postUsersWithRolesSuccess() { assertEquals(validSystemRole.getId().toString(), adminRole.get("id").getAsString(), "Inserted role id doesn't match what was passed."); } catch (IllegalStateException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } } @@ -371,7 +371,7 @@ public void postUsersNoRolesSuccess() { testUserUUID = result.get("id").getAsString(); } catch (IllegalStateException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } } @@ -450,7 +450,7 @@ public void putUsersOwnEmailAlreadyExists() { } catch (IllegalStateException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } } diff --git a/src/test/java/org/breedinginsight/brapi/v2/GermplasmControllerIntegrationTest.java b/src/test/java/org/breedinginsight/brapi/v2/GermplasmControllerIntegrationTest.java index 2a0ad750f..e283a2484 100644 --- a/src/test/java/org/breedinginsight/brapi/v2/GermplasmControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/brapi/v2/GermplasmControllerIntegrationTest.java @@ -9,7 +9,7 @@ import io.micronaut.http.netty.cookies.NettyCookie; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import io.reactivex.Flowable; -import junit.framework.AssertionFailedError; +import org.opentest4j.AssertionFailedError; import lombok.SneakyThrows; import org.breedinginsight.BrAPITest; import org.breedinginsight.TestUtils; diff --git a/src/test/java/org/breedinginsight/brapi/v2/ListControllerIntegrationTest.java b/src/test/java/org/breedinginsight/brapi/v2/ListControllerIntegrationTest.java index b5ee8ce0d..d61ebe536 100644 --- a/src/test/java/org/breedinginsight/brapi/v2/ListControllerIntegrationTest.java +++ b/src/test/java/org/breedinginsight/brapi/v2/ListControllerIntegrationTest.java @@ -27,7 +27,7 @@ import io.micronaut.http.netty.cookies.NettyCookie; import io.micronaut.test.extensions.junit5.annotation.MicronautTest; import io.reactivex.Flowable; -import junit.framework.AssertionFailedError; +import org.opentest4j.AssertionFailedError; import lombok.SneakyThrows; import org.breedinginsight.BrAPITest; import org.breedinginsight.TestUtils; @@ -42,7 +42,6 @@ import org.breedinginsight.model.Program; import org.breedinginsight.services.SpeciesService; import org.jooq.DSLContext; -import org.junit.Rule; import org.junit.jupiter.api.*; import javax.inject.Inject; diff --git a/src/test/java/org/breedinginsight/services/parsers/TraitFileParserUnitTest.java b/src/test/java/org/breedinginsight/services/parsers/TraitFileParserUnitTest.java index e99587fd2..f2f87cb94 100644 --- a/src/test/java/org/breedinginsight/services/parsers/TraitFileParserUnitTest.java +++ b/src/test/java/org/breedinginsight/services/parsers/TraitFileParserUnitTest.java @@ -16,7 +16,7 @@ */ package org.breedinginsight.services.parsers; -import junit.framework.AssertionFailedError; +import org.opentest4j.AssertionFailedError; import lombok.SneakyThrows; import org.breedinginsight.api.model.v1.response.RowValidationErrors; import org.breedinginsight.api.model.v1.response.ValidationError; diff --git a/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java b/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java index 9eb1b727f..25f4afbe4 100644 --- a/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java +++ b/src/test/java/org/breedinginsight/services/validators/TraitValidatorUnitTest.java @@ -17,7 +17,7 @@ package org.breedinginsight.services.validators; -import junit.framework.AssertionFailedError; +import org.opentest4j.AssertionFailedError; import lombok.SneakyThrows; import org.brapi.v2.model.pheno.BrAPIScaleValidValuesCategories; import org.breedinginsight.api.model.v1.response.RowValidationErrors;