(accumulo) branch main updated: Test fixes to account for new Scan ref table (#4690)

[cshannon]

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

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 9d9175aea7 Test fixes to account for new Scan ref table (#4690)
9d9175aea7 is described below

commit 9d9175aea7a7894a43261302e749a04a169d0df5
Author: Christopher L. Shannon <cshan...@apache.org>
AuthorDate: Fri Jun 21 17:50:51 2024 -0400

    Test fixes to account for new Scan ref table (#4690)
---
 test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java        | 6 ++++--
 .../accumulo/test/functional/TabletStateChangeIteratorIT.java       | 3 ++-
 .../main/java/org/apache/accumulo/test/manager/MergeStateIT.java    | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java 
b/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java
index c9aed19795..7bd28961df 100644
--- a/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java
@@ -189,8 +189,10 @@ public class MetaSplitIT extends AccumuloClusterHarness {
   private void verifyMetadataTableScan(AccumuloClient client) throws Exception 
{
     var tables = client.tableOperations().tableIdMap();
     var expectedExtents = tables.entrySet().stream()
-        .filter(e -> 
!e.getKey().startsWith("accumulo.")).map(Map.Entry::getValue).map(TableId::of)
-        .map(tid -> new KeyExtent(tid, null, 
null)).collect(Collectors.toSet());
+        .filter(e -> !e.getKey().equals(AccumuloTable.ROOT.tableName())
+            && !e.getKey().equals(AccumuloTable.METADATA.tableName()))
+        .map(Map.Entry::getValue).map(TableId::of).map(tid -> new 
KeyExtent(tid, null, null))
+        .collect(Collectors.toSet());
     // Verify we have 11 tablets for metadata
     assertEquals(11, expectedExtents.size());
 
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
 
b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index 09290f82ad..727f13e74b 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -271,7 +271,8 @@ public class TabletStateChangeIteratorIT extends 
AccumuloClusterHarness {
 
     // metadata should be stable with only 6 rows (2 for each table)
     log.debug("Gathered {} rows to create copy {}", mutations.size(), copy);
-    assertEquals(6, mutations.size(), "Metadata should have 6 rows (2 for each 
table)");
+    assertEquals(7, mutations.size(),
+        "Metadata should have 7 rows (2 for each table + " + "Scan ref 
table)");
     client.tableOperations().create(copy);
 
     try (BatchWriter writer = client.createBatchWriter(copy)) {
diff --git 
a/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java 
b/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
index 3b0e648002..196beb6e7e 100644
--- a/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
@@ -154,7 +154,9 @@ public class MergeStateIT extends ConfigurableMacBase {
           count++;
         }
       }
-      assertEquals(0, count); // the normal case is to skip tablets in a good 
state
+
+      // There should be 1 because of the Scan Ref table
+      assertEquals(1, count); // the normal case is to skip tablets in a good 
state
 
       // Create the hole
       // Split the tablet at one end of the range