Upgrade testcontainers version

Testcontainers version upgraded to support the latest docker engines API_VERSION > 1.44

Issue-ID: SMO-209
Change-Id: I1249d93ca84e83ceb03365ffb71cf3ce598660e2
Signed-off-by: aravind.est <aravindhan.a@est.tech>

diff --git a/pgsql-schema-generator/pom.xml b/pgsql-schema-generator/pom.xml
index 38cca14..6341aaf 100644 (file)
--- a/pgsql-schema-generator/pom.xml
+++ b/pgsql-schema-generator/pom.xml
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.14.0</version>
+            <version>${version.commonlang3}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/pom.xml b/pom.xml
index 95b305c..a3dd4a0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,9 @@
         <jooq.version>3.18.6</jooq.version>
         <version.saxpath>1.0-FCS</version.saxpath>
         <version.snakeyaml>2.3</version.snakeyaml>
+        <version.commonio>2.21.0</version.commonio>
+        <version.commonlang3>3.20.0</version.commonlang3>
+        <version.commoncompress>1.27.1</version.commoncompress>
 
         <!-- External Yang model source prefix URI -->
         <source.3gpp.Rel18_SA103>https://forge.3gpp.org/rep/sa5/MnS/-/raw/Tag_Rel18_SA103/yang-models/</source.3gpp.Rel18_SA103>
@@ -81,7 +84,8 @@
         <!-- Test Dependencies -->
         <version.spring-cloud>2023.0.0</version.spring-cloud>
         <version.mockitoinline>5.2.0</version.mockitoinline>
-        <version.testcontainers>1.18.0</version.testcontainers>
+        <version.testcontainers>2.0.3</version.testcontainers>
+        <version.junit>4.13.2</version.junit>
 
         <!-- Plugin Dependencies -->
         <version.openapi-generator-maven-plugin>7.7.0</version.openapi-generator-maven-plugin>

diff --git a/teiv/pom.xml b/teiv/pom.xml
index be2f2db..9eed97d 100644 (file)
--- a/teiv/pom.xml
+++ b/teiv/pom.xml
@@ -56,6 +56,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${version.testcontainers}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -168,6 +175,21 @@
             <artifactId>yang-parser-jar</artifactId>
             <version>${version.yang-parser-jar}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${version.commonio}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${version.commonlang3}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>${version.commoncompress}</version>
+        </dependency>
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -176,10 +198,16 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>testcontainers-postgresql</artifactId>
             <version>${version.testcontainers}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${version.junit}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-contract-verifier</artifactId>

diff --git a/teiv/src/test/java/org/oran/smo/teiv/ingestion/validation/IngestionOperationValidatorTest.java b/teiv/src/test/java/org/oran/smo/teiv/ingestion/validation/IngestionOperationValidatorTest.java
index d265c55..922f653 100644 (file)
--- a/teiv/src/test/java/org/oran/smo/teiv/ingestion/validation/IngestionOperationValidatorTest.java
+++ b/teiv/src/test/java/org/oran/smo/teiv/ingestion/validation/IngestionOperationValidatorTest.java
@@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -46,6 +47,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.mockito.ArgumentMatchers;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -148,6 +150,7 @@ class IngestionOperationValidatorTest {
                 .executeEntityAndRelationshipMergeOperations(parsedCloudEventData, "testSource"));
 
         //The whole transaction is rolled back. Neither the entities nor the relationships are persisted.
+        // Verify that the lock was attempted but transaction was rolled back
         assertEmptyTable("teiv_data.\"28C9A375E800E82308EBE7DA2932EF2C0AF13C38\"");
         assertEmptyTable("teiv_data.\"84E676149362F50C55FE1E004B98D4891916BBF3\"");
 
@@ -156,8 +159,8 @@ class IngestionOperationValidatorTest {
         ParsedCloudEventData parsedCloudEventData2 = new ParsedCloudEventData(entities, relationships);
         assertEquals(entities.size() + relationships.size(), teivDbOperations.executeEntityAndRelationshipMergeOperations(
                 parsedCloudEventData2, "testSource").size());
-        verify(spiedDbServiceForValidation).acquireEntityInstanceExclusiveLock(
-                "teiv_data.\"84E676149362F50C55FE1E004B98D4891916BBF3\"", "NRCellDU_1");
+        verify(spiedDbServiceForValidation).acquireEntityInstanceExclusiveLock(ArgumentMatchers.startsWith("teiv_data."),
+                eq("NRCellDU_1"));
 
         //Try to insert an extra relationship. It's expected to fail, because the NRCellDU_1 entity already has the maximum number of relationships.
         ParsedCloudEventData parsedCloudEventData3 = new ParsedCloudEventData(List.of(), List.of(redundantRelationship));