Use Claude to clean up SampleTypeNameExpressionTest.validateNamesGenerated.

Author: labkey-danield

src/org/labkey/test/tests/SampleTypeNameExpressionTest.java

@@ -59,6 +59,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 import static org.hamcrest.CoreMatchers.hasItems;
@@ -786,24 +787,45 @@ private void createSampleTypeForNameValidation(String sampleTypeName, String nam
 
     }
 
+    /**
+     * <p>
+     *     Validate that every name in {@code actualNames} matches one of the regex patterns in
+     *     {@code expectedNames}, using a multiset diff: every expected pattern must match at least
+     *     one actual name, every actual name must be matched by some expected pattern, and the
+     *     counts must be equal. Order is intentionally NOT verified.
+     * </p>
+     * <p>
+     *     On a mismatch the failure reports both the patterns that found no match and the actual
+     *     names that found no pattern, so a "missing row" or "extra row" failure is immediately
+     *     diagnosable instead of just a "wrong count" error.
+     * </p>
+     * <p>
+     *     This method was generated by Claude.
+     * </p>
+     */
     private void validateNamesGenerated(List<String> actualNames, List<String> expectedNames)
     {
+        checker().verifyEquals("Number of samples not as expected.",
+                expectedNames.size(), actualNames.size());
 
-        if (checker().verifyEquals("Number of samples not as expected.",
-                expectedNames.size(), actualNames.size()))
+        List<String> unmatchedActuals = new ArrayList<>(actualNames);
+        List<String> unmatchedPatterns = new ArrayList<>();
+        for (String pattern : expectedNames)
         {
-            for (int i = 0; i < expectedNames.size(); i++)
-            {
-                String expectedPattern = expectedNames.get(i);
-                String actual = actualNames.get(i);
-
-                checker().verifyTrue(String.format(
-                                "Name at index %d did not match. Expected pattern: [%s]  Actual: [%s]",
-                                i, expectedPattern, actual),
-                        Pattern.matches(expectedPattern, actual));
-            }
+            Optional<String> match = unmatchedActuals.stream()
+                    .filter(a -> Pattern.matches(pattern, a))
+                    .findFirst();
+            if (match.isPresent())
+                unmatchedActuals.remove(match.get());
+            else
+                unmatchedPatterns.add(pattern);
         }
 
+        checker().verifyTrue("Expected patterns with no matching actual name: " + unmatchedPatterns,
+                unmatchedPatterns.isEmpty());
+        checker().verifyTrue("Actual names not matching any expected pattern (extras): " + unmatchedActuals,
+                unmatchedActuals.isEmpty());
+
         checker().screenShotIfNewError("Generated_Names_Error");
     }