(solr) branch main updated: SOLR-17698: Fix TestUseDocValuesAsStored for enums (#3390)

[houston]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new e3e85485dac SOLR-17698: Fix TestUseDocValuesAsStored for enums (#3390)
e3e85485dac is described below

commit e3e85485dac4a559665b10b1038f4dc7e0b780dd
Author: Houston Putman <hous...@apache.org>
AuthorDate: Mon Jun 16 13:50:41 2025 -0500

    SOLR-17698: Fix TestUseDocValuesAsStored for enums (#3390)
---
 .../src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java  | 7 ++++---
 solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java   | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java 
b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
index 438a72878b0..2b29b00c552 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java
@@ -399,11 +399,12 @@ public class TestUseDocValuesAsStored extends 
AbstractBadConfigTestBase {
       }
 
       // See SOLR-10924...
-      // Trie/String based Docvalues are sets, but stored values & Point DVs 
are ordered multisets,
-      // so cardinality depends on the value source
+      // Trie/String based Docvalues are sets, but stored values, Point DVs 
and Enum DVs are ordered
+      // multisets, so cardinality depends on the value source
       final int expectedCardinality =
           (isStoredField(field)
-                  || (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP) && 
!field.startsWith("test_s")))
+                  || (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP) && 
!field.startsWith("test_s"))
+                  || field.startsWith("enums"))
               ? value.length
               : valueSet.size();
       xpaths[value.length] =
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java 
b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 55ba5f42ef4..bfac37a82ff 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -2872,7 +2872,6 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase 
{
       private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Long.class, 
"solr.TrieLongField");
       private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Double.class, 
"solr.TrieDoubleField");
       private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Date.class, 
"solr.TrieDateField");
-      private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Enum.class, "solr.EnumField");
 
       System.setProperty(NUMERIC_POINTS_SYSPROP, "false");
     } else {
@@ -2885,7 +2884,6 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase 
{
       private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Long.class, 
"solr.LongPointField");
       private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Double.class, 
"solr.DoublePointField");
       private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Date.class, 
"solr.DatePointField");
-      private_RANDOMIZED_NUMERIC_FIELDTYPES.put(Enum.class, 
"solr.EnumFieldType");
 
       System.setProperty(NUMERIC_POINTS_SYSPROP, "true");
     }