(gravitino) branch branch-1.2 updated: [Cherry-pick to branch-1.2] [#10136] fix(test): Replace brittle version count assertions with semantic checks in TestFilesetMetaService and TestFunctionMetaService (#10137) (#10142)

[mchades]

This is an automated email from the ASF dual-hosted git repository.

mchades pushed a commit to branch branch-1.2
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/branch-1.2 by this push:
     new 17186aa636 [Cherry-pick to branch-1.2] [#10136] fix(test): Replace 
brittle version count assertions with semantic checks in TestFilesetMetaService 
and TestFunctionMetaService (#10137) (#10142)
17186aa636 is described below

commit 17186aa636bae6889cf857d85e8067d5e52c43bc
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Mar 3 15:13:09 2026 +0800

    [Cherry-pick to branch-1.2] [#10136] fix(test): Replace brittle version 
count assertions with semantic checks in TestFilesetMetaService and 
TestFunctionMetaService (#10137) (#10142)
    
    **Cherry-pick Information:**
    - Original commit: e928b2ff429af7d5fcc5636b60053aa027138ab1
    - Target branch: `branch-1.2`
    - Status: ✅ Clean cherry-pick (no conflicts)
    
    Co-authored-by: mchades <liminghu...@datastrato.com>
    Co-authored-by: Copilot <223556219+copi...@users.noreply.github.com>
---
 .../storage/relational/service/TestFilesetMetaService.java | 14 ++++++++++----
 .../relational/service/TestFunctionMetaService.java        | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git 
a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java
 
b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java
index 58b0eb7e6d..c292418c1e 100644
--- 
a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java
+++ 
b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java
@@ -199,20 +199,26 @@ public class TestFilesetMetaService extends 
TestJDBCBackend {
     }
     assertFalse(legacyRecordExistsInDB(fileset.id(), 
Entity.EntityType.FILESET));
     assertEquals(0, listFilesetVersions(fileset.id()).size());
-    assertEquals(3, listFilesetVersions(anotherFileset.id()).size());
+    Map<Integer, Long> anotherFilesetVersionsAfterHardDelete =
+        listFilesetVersions(anotherFileset.id());
+    assertTrue(anotherFilesetVersionsAfterHardDelete.containsKey(3));
+    assertEquals(0L, anotherFilesetVersionsAfterHardDelete.get(3));
 
     // soft delete for old version fileset
     for (Entity.EntityType entityType : Entity.EntityType.values()) {
       backend.deleteOldVersionData(entityType, 1);
     }
     Map<Integer, Long> versionDeletedMap = 
listFilesetVersions(anotherFileset.id());
-    assertEquals(3, versionDeletedMap.size());
+    assertTrue(versionDeletedMap.containsKey(3));
+    assertEquals(0L, versionDeletedMap.get(3));
     assertEquals(1, versionDeletedMap.values().stream().filter(value -> value 
== 0L).count());
-    assertEquals(2, versionDeletedMap.values().stream().filter(value -> value 
!= 0L).count());
 
     // hard delete for old version fileset
     backend.hardDeleteLegacyData(Entity.EntityType.FILESET, 
Instant.now().toEpochMilli() + 1000);
-    assertEquals(1, listFilesetVersions(anotherFileset.id()).size());
+    Map<Integer, Long> finalFilesetVersions = 
listFilesetVersions(anotherFileset.id());
+    assertTrue(finalFilesetVersions.containsKey(3));
+    assertEquals(0L, finalFilesetVersions.get(3));
+    assertEquals(1, finalFilesetVersions.values().stream().filter(value -> 
value == 0L).count());
   }
 
   @TestTemplate
diff --git 
a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFunctionMetaService.java
 
b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFunctionMetaService.java
index 99c6fd78af..a068b64550 100644
--- 
a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFunctionMetaService.java
+++ 
b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFunctionMetaService.java
@@ -347,20 +347,26 @@ public class TestFunctionMetaService extends 
TestJDBCBackend {
     }
     assertFalse(legacyRecordExistsInDB(function.id(), 
Entity.EntityType.FUNCTION));
     assertEquals(0, listFunctionVersions(function.id()).size());
-    assertEquals(3, listFunctionVersions(anotherFunction.id()).size());
+    Map<Integer, Long> anotherFunctionVersionsAfterHardDelete =
+        listFunctionVersions(anotherFunction.id());
+    assertTrue(anotherFunctionVersionsAfterHardDelete.containsKey(3));
+    assertEquals(0L, anotherFunctionVersionsAfterHardDelete.get(3));
 
     // Soft delete old versions
     for (Entity.EntityType entityType : Entity.EntityType.values()) {
       backend.deleteOldVersionData(entityType, 1);
     }
     Map<Integer, Long> versionDeletedMap = 
listFunctionVersions(anotherFunction.id());
-    assertEquals(3, versionDeletedMap.size());
+    assertTrue(versionDeletedMap.containsKey(3));
+    assertEquals(0L, versionDeletedMap.get(3));
     assertEquals(1, versionDeletedMap.values().stream().filter(value -> value 
== 0L).count());
-    assertEquals(2, versionDeletedMap.values().stream().filter(value -> value 
!= 0L).count());
 
     // Hard delete old versions
     backend.hardDeleteLegacyData(Entity.EntityType.FUNCTION, 
Instant.now().toEpochMilli() + 1000);
-    assertEquals(1, listFunctionVersions(anotherFunction.id()).size());
+    Map<Integer, Long> finalFunctionVersions = 
listFunctionVersions(anotherFunction.id());
+    assertTrue(finalFunctionVersions.containsKey(3));
+    assertEquals(0L, finalFunctionVersions.get(3));
+    assertEquals(1, finalFunctionVersions.values().stream().filter(value -> 
value == 0L).count());
   }
 
   @TestTemplate