test/java/lang/System/LoggerFinder/internal/BaseDefaultLoggerFinderTest/BaseDefaultLoggerFinderTest.java

*** 53,62 ****
--- 53,63 ----
  import java.util.concurrent.atomic.AtomicReference;
  import java.util.function.Function;
  import jdk.internal.logger.DefaultLoggerFinder;
  import jdk.internal.logger.SimpleConsoleLogger;
  import sun.util.logging.PlatformLogger;
+ import java.lang.reflect.Module;
  
  /**
   * @test
   * @bug     8140364 8145686
   * @summary JDK implementation specific unit test for the base DefaultLoggerFinder.
*** 110,123 ****
          public final static AtomicBoolean fails = new AtomicBoolean();
          public final static AtomicReference<String> conf = new AtomicReference<>("");
          public final static AtomicLong sequencer = new AtomicLong();
  
  
!         public Logger getLogger(String name, Class<?> caller);
!         public Logger getLocalizedLogger(String name, ResourceBundle bundle, Class<?> caller);
!         void setLevel(Logger logger, Level level, Class<?> caller);
!         void setLevel(Logger logger, PlatformLogger.Level level, Class<?> caller);
          PlatformLogger.Bridge asPlatformLoggerBridge(Logger logger);
      }
  
      public static class BaseLoggerFinder extends DefaultLoggerFinder implements TestLoggerFinder {
  
--- 111,124 ----
          public final static AtomicBoolean fails = new AtomicBoolean();
          public final static AtomicReference<String> conf = new AtomicReference<>("");
          public final static AtomicLong sequencer = new AtomicLong();
  
  
!         public Logger getLogger(String name, Module caller);
!         public Logger getLocalizedLogger(String name, ResourceBundle bundle, Module caller);
!         void setLevel(Logger logger, Level level, Module caller);
!         void setLevel(Logger logger, PlatformLogger.Level level, Module caller);
          PlatformLogger.Bridge asPlatformLoggerBridge(Logger logger);
      }
  
      public static class BaseLoggerFinder extends DefaultLoggerFinder implements TestLoggerFinder {
  
*** 128,147 ****
                  throw new RuntimeException("Simulate exception while loading provider");
              }
          }
  
          @Override
!         public void setLevel(Logger logger, Level level, Class<?> caller) {
              PrivilegedAction<Void> pa = () -> {
                  setLevel(logger, PlatformLogger.toPlatformLevel(level), caller);
                  return null;
              };
              AccessController.doPrivileged(pa);
          }
  
          @Override
!         public void setLevel(Logger logger, PlatformLogger.Level level, Class<?> caller) {
              PrivilegedAction<Logger> pa = () -> demandLoggerFor(logger.getName(), caller);
              Logger impl = AccessController.doPrivileged(pa);
              SimpleConsoleLogger.class.cast(impl)
                      .getLoggerConfiguration()
                      .setPlatformLevel(level);
--- 129,148 ----
                  throw new RuntimeException("Simulate exception while loading provider");
              }
          }
  
          @Override
!         public void setLevel(Logger logger, Level level, Module caller) {
              PrivilegedAction<Void> pa = () -> {
                  setLevel(logger, PlatformLogger.toPlatformLevel(level), caller);
                  return null;
              };
              AccessController.doPrivileged(pa);
          }
  
          @Override
!         public void setLevel(Logger logger, PlatformLogger.Level level, Module caller) {
              PrivilegedAction<Logger> pa = () -> demandLoggerFor(logger.getName(), caller);
              Logger impl = AccessController.doPrivileged(pa);
              SimpleConsoleLogger.class.cast(impl)
                      .getLoggerConfiguration()
                      .setPlatformLevel(level);
*** 604,618 ****
      private static void testLogger(TestLoggerFinder provider,
              Map<Logger, String> loggerDescMap,
              String name,
              ResourceBundle loggerBundle,
              Logger logger,
!             Class<?> caller) {
  
          System.out.println("Testing " + loggerDescMap.get(logger) + " [" + logger +"]");
          AtomicLong sequencer = TestLoggerFinder.sequencer;
  
          Foo foo = new Foo();
          String fooMsg = foo.toString();
          for (Level loggerLevel : Level.values()) {
              provider.setLevel(logger, loggerLevel, caller);
              for (Level messageLevel : Level.values()) {
--- 605,620 ----
      private static void testLogger(TestLoggerFinder provider,
              Map<Logger, String> loggerDescMap,
              String name,
              ResourceBundle loggerBundle,
              Logger logger,
!             Class<?> callerClass) {
  
          System.out.println("Testing " + loggerDescMap.get(logger) + " [" + logger +"]");
          AtomicLong sequencer = TestLoggerFinder.sequencer;
  
+         Module caller = callerClass.getModule();
          Foo foo = new Foo();
          String fooMsg = foo.toString();
          for (Level loggerLevel : Level.values()) {
              provider.setLevel(logger, loggerLevel, caller);
              for (Level messageLevel : Level.values()) {