[#1420] fix ResourceBundle test

remkop · Feb 24, 2023 · cc0602b · cc0602b
1 parent 65b52d0
commit cc0602b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/picocli-codegen-tests-java9plus/build.gradle b/picocli-codegen-tests-java9plus/build.gradle
@@ -31,6 +31,10 @@ test {
 
     // https://github.com/google/compile-testing/issues/222
     jvmArgs('--add-opens', 'jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED')
+
+    testLogging {
+        //showStandardStreams = true
+    }
 }
 
 jar {

diff --git a/...s/src/test/java/picocli/annotation/processing/tests/AbstractCommandSpecProcessorTest.java b/...s/src/test/java/picocli/annotation/processing/tests/AbstractCommandSpecProcessorTest.java
@@ -7,6 +7,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import picocli.CommandLine;
 import picocli.codegen.annotation.processing.AbstractCommandSpecProcessor;
 
 import javax.tools.Diagnostic;
@@ -283,20 +284,27 @@ private void validateErrorMessages(Compilation compilation, List<String> expecte
 
     @Test
     public void testCommandWithBundleLoaded() {
+        CommandLine.tracer().setLevel(CommandLine.TraceLevel.DEBUG);
         AbstractCommandSpecProcessor.setLoadResourceBundles(true);
         Compilation compilation = compareCommandYamlDump(slurp("/picocli/examples/messages/CommandWithBundle.yaml"),
                 JavaFileObjects.forResource("picocli/examples/messages/CommandWithBundle.java"));
 
         assertOnlySourceVersionWarning(compilation);
+        CommandLine.tracer().setLevel(CommandLine.TraceLevel.WARN);
     }
 
     @Test
     public void testCommandWithBundleNotLoaded() {
+        CommandLine.tracer().setLevel(CommandLine.TraceLevel.DEBUG);
         AbstractCommandSpecProcessor.setLoadResourceBundles(false);
-        Compilation compilation = compareCommandYamlDump(slurp("/picocli/examples/messages/CommandWithBundle-NotLoaded.yaml"),
-            JavaFileObjects.forResource("picocli/examples/messages/CommandWithBundle.java"));
+        try {
+            Compilation compilation = compareCommandYamlDump(slurp("/picocli/examples/messages/CommandWithBundle-NotLoaded.yaml"),
+                JavaFileObjects.forResource("picocli/examples/messages/CommandWithBundle2.java"));
 
-        assertOnlySourceVersionWarning(compilation);
+            assertOnlySourceVersionWarning(compilation);
+        } finally {
+            CommandLine.tracer().setLevel(CommandLine.TraceLevel.WARN);
+        }
     }
 
     private void assertOnlySourceVersionWarning(Compilation compilation) {

diff --git a/...egen-tests-java9plus/src/test/resources/picocli/examples/messages/CommandWithBundle2.java b/...egen-tests-java9plus/src/test/resources/picocli/examples/messages/CommandWithBundle2.java
@@ -0,0 +1,8 @@
+package picocli.example.messages.CommandWithBundle;
+
+import picocli.CommandLine.Command;
+
+@Command(resourceBundle = "command-method-demo")
+public class CommandWithBundle2 {
+// we need a separate class, identical to CommandWithBundle, to avoid caching across tests
+}
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -8414,10 +8414,12 @@ void updateFromCommand(Command cmd, CommandSpec commandSpec, boolean loadResourc
                 if (!empty(cmd.resourceBundle())) { // else preserve superclass bundle
                     if (loadResourceBundle) { // error if resource bundle does not exist
                         messages(new Messages(commandSpec, cmd.resourceBundle()));
-                    } else {
-                        ResourceBundle rb = null; // from annotation processor, we may not be able to load the ResourceBundle
-                        try { rb = ResourceBundle.getBundle(cmd.resourceBundle()); } catch (MissingResourceException ignored) {}
-                        messages(new Messages(commandSpec, cmd.resourceBundle(), rb));
+                    } else { // from annotation processor, we may not be able to load the ResourceBundle
+                        try {
+                            messages(new Messages(commandSpec, cmd.resourceBundle()));
+                        } catch (MissingResourceException ignored) {
+                            messages(new Messages(commandSpec, cmd.resourceBundle(), null));
+                        }
                     }
                 }
                 if (isNonDefault(cmd.abbreviateSynopsis(), DEFAULT_ABBREVIATE_SYNOPSIS))      {abbreviateSynopsis = cmd.abbreviateSynopsis();}
@@ -11622,8 +11624,10 @@ public Messages(CommandSpec spec, String baseName, ResourceBundle rb) {
             }
             private static ResourceBundle createBundle(String baseName) {
                 if (loadBundles) {
+                    tracer().debug("Messages: Loading ResourceBundle[base=%s]...", baseName);
                     return ResourceBundle.getBundle(baseName);
                 } else {
+                    tracer().debug("Messages: Returning new dummy ResourceBundle", loadBundles);
                     return new ResourceBundle() {
                         @Override
                         protected Object handleGetObject(String key) { return null; }
@@ -11668,6 +11672,7 @@ private static Set<String> keys(ResourceBundle rb) {
              * @param loadBundles true if bundles should be loaded (default), false if bundles should not be loaded
              */
             public static final void setLoadBundles(boolean loadBundles) {
+                tracer().debug("Messages: loadBundles was set to %s", loadBundles);
             	Messages.loadBundles = loadBundles;
             }
 

diff --git a/src/test/java/picocli/I18nTest.java b/src/test/java/picocli/I18nTest.java
@@ -15,6 +15,7 @@
  */
 package picocli;
 
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.ProvideSystemProperty;
@@ -774,6 +775,7 @@ public void testTracingWithResourceBundle() {
 
         String expected = String.format("" +
                 "[picocli DEBUG] Creating CommandSpec for picocli.I18nCommand@6bcae9 with factory picocli.CommandLine$DefaultFactory%n" +
+                "[picocli DEBUG] Messages: Loading ResourceBundle[base=picocli.SharedMessages]...%n" +
                 "[picocli DEBUG] Created Messages from resourceBundle[base=picocli.SharedMessages] for command 'i18n-top' (command 'i18n-top' (user object: picocli.I18nCommand@6bcae9))%n" +
                 "[picocli DEBUG] Creating CommandSpec for class picocli.CommandLine$HelpCommand with factory picocli.CommandLine$DefaultFactory%n" +
                 "[picocli DEBUG] Adding subcommand 'help' to 'i18n-top'%n" +
@@ -786,6 +788,7 @@ public void testTracingWithResourceBundle() {
                 "[picocli DEBUG] Created Messages from resourceBundle[base=picocli.SharedMessages] for command 'i18n-sub' (command 'i18n-sub' (user object: class picocli.I18nSubcommand))%n" +
                 "[picocli DEBUG] Created Messages from resourceBundle[base=picocli.SharedMessages] for command 'help' (command 'help' (user object: class picocli.CommandLine$HelpCommand))%n" +
                 "[picocli DEBUG] Creating CommandSpec for class picocli.I18nSubcommand2 with factory picocli.CommandLine$DefaultFactory%n" +
+                "[picocli DEBUG] Messages: Loading ResourceBundle[base=picocli.ResourceBundlePropagationTest]...%n" +
                 "[picocli DEBUG] Created Messages from resourceBundle[base=picocli.ResourceBundlePropagationTest] for command 'sub2' (command 'sub2' (user object: class picocli.I18nSubcommand2))%n" +
                 "[picocli DEBUG] Creating CommandSpec for class picocli.CommandLine$HelpCommand with factory picocli.CommandLine$DefaultFactory%n" +
                 "[picocli DEBUG] Adding subcommand 'help' to 'sub2'%n" +