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

[yuqi4733]

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

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


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

commit 3f6032f4084dc04ee2bd78892a65cd7652e1fcf9
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Mar 3 17:08:11 2026 +0800

    [Cherry-pick to branch-1.1] [#10136] fix(test): Replace brittle version 
count assertions with semantic checks in TestFilesetMetaService and 
TestFunctionMetaService (#10137) (#10141)
    
    **Cherry-pick Information:**
    - Original commit: e928b2ff429af7d5fcc5636b60053aa027138ab1
    - Target branch: `branch-1.1`
    - Status: ⚠️ **Has conflicts - manual resolution required**
    
    Please review and resolve the conflicts before merging.
    
    ---------
    
    Co-authored-by: mchades <liminghu...@datastrato.com>
    Co-authored-by: Copilot <223556219+copi...@users.noreply.github.com>
---
 .../storage/relational/service/TestFilesetMetaService.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 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 93cc6d63ae..5a803de6eb 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
@@ -191,20 +191,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