(commons-bcel) branch master updated: Fix constant pool module access test (#492)

[ggregory]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git


The following commit(s) were added to refs/heads/master by this push:
     new bfead0ab Fix constant pool module access test (#492)
bfead0ab is described below

commit bfead0ab010b626ac0b92cfbf3dad26d631464cf
Author: nbauma109 <nbauma...@users.noreply.github.com>
AuthorDate: Sun Feb 1 16:42:40 2026 +0100

    Fix constant pool module access test (#492)
    
    * Update test ConstantPoolModuleAccessTest for Java 26-ea
    
    * fix sun.util.resources.LocaleData$LocaleDataResourceBundleProvider
    
    ---------
    
    Co-authored-by: nbauma109 <nbauma...@github.com>
---
 .../bcel/classfile/ConstantPoolModuleAccessTest.java     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java 
b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java
index 2c9b1cce..f4a17aad 100644
--- a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java
@@ -179,8 +179,12 @@ public final class ConstantPoolModuleAccessTest {
                         
expected.add("jdk.internal.logger.DefaultLoggerFinder");
                         
expected.add("sun.text.spi.JavaTimeDateTimePatternProvider");
                         
expected.add("sun.util.locale.provider.LocaleDataMetaInfo");
-                        
expected.add("sun.util.resources.LocaleData$CommonResourceBundleProvider");
-                        
expected.add("sun.util.resources.LocaleData$SupplementaryResourceBundleProvider");
+                        if (javaClass.getMajor() <= Const.MAJOR_25) {
+                            
expected.add("sun.util.resources.LocaleData$CommonResourceBundleProvider");
+                            
expected.add("sun.util.resources.LocaleData$SupplementaryResourceBundleProvider");
+                        } else {
+                            
expected.add("sun.util.resources.LocaleData$LocaleDataResourceBundleProvider");
+                        }
                         expected.add("sun.util.spi.CalendarProvider");
                         assertEquals(expected, Arrays.asList(usedClassNames));
                     } else if 
(urlPath.contains("/jdk.management.agent/module-info.class") && 
javaClass.getMajor() < Const.MAJOR_21) {
@@ -261,8 +265,12 @@ public final class ConstantPoolModuleAccessTest {
                         assertEquals(expected, Arrays.asList(usedClassNames));
                     } else if 
(urlPath.contains("/jdk.jpackage/module-info.class")) {
                         final List<String> expected = new ArrayList<>();
-                        expected.add("jdk.jpackage.internal.Bundler");
-                        expected.add("jdk.jpackage.internal.Bundlers");
+                        if (javaClass.getMajor() <= Const.MAJOR_25) {
+                            expected.add("jdk.jpackage.internal.Bundler");
+                            expected.add("jdk.jpackage.internal.Bundlers");
+                        } else {
+                            
expected.add("jdk.jpackage.internal.cli.CliBundlingEnvironment");
+                        }
                         assertEquals(expected, Arrays.asList(usedClassNames));
                     } else if 
(urlPath.contains("/jdk.naming.ldap/module-info.class")) {
                         final List<String> expected = new ArrayList<>();