Merge pull request #98 from opencb/TASK-7097

TASK-7097 - Port Patch 5.3.0 -> 6.0.0 Xetabase 2.3.0 -> 3.0.0
opencb · Oct 21, 2024 · 3b58fb7 · 3b58fb7
2 parents f2d8430 + e08dd88
commit 3b58fb7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/.github/workflows/scripts/get-xetabase-branch.sh b/.github/workflows/scripts/get-xetabase-branch.sh
@@ -22,7 +22,6 @@ get_xetabase_branch() {
 
   # Check if the branch name starts with "release-" and follows the patterns "release-a.x.x" or "release-a.b.x"
   if [[ "$input_branch" =~ ^release-([0-9]+)\.x\.x$ ]] || [[ "$input_branch" =~ ^release-([0-9]+)\.([0-9]+)\.x$ ]]; then
-
     # Extract the MAJOR part of the branch name
     MAJOR=${BASH_REMATCH[1]}
     # Calculate the XETABASE_MAJOR by subtracting 3 from MAJOR

diff --git a/...ore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java b/...ore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java
@@ -441,15 +441,13 @@ public void testAggregate() {
 
         queryResult = mongoDBCollection.aggregate(dbObjectList, new QueryOptions(QueryOptions.LIMIT, 1).append(QueryOptions.SKIP, 0));
         assertEquals("There must be 1 results", 1, queryResult.getResults().size());
-        assertTrue(queryResult.getResults().contains(result.get(0)));
+        // As the order of result list change between executions, we must ensure the assertTrue doesn't depend on the order
+        assertTrue(result.contains(queryResult.getResults().get(0)));
 
         queryResult = mongoDBCollection.aggregate(dbObjectList, new QueryOptions(QueryOptions.LIMIT, 1).append(QueryOptions.SKIP, 1));
         assertEquals("There must be 1 results", 1, queryResult.getResults().size());
-
-        System.out.println("result = " + result);
-        System.out.println("queryResult.getResults() = " + queryResult.getResults());
-
-        assertTrue(queryResult.getResults().contains(result.get(1)));
+        // As the order of result list change between executions, we must ensure the assertTrue doesn't depend on the order
+        assertTrue(result.contains(queryResult.getResults().get(0)));
     }
 
     @Test

diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml
@@ -31,7 +31,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -64,11 +63,6 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>