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

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -62,11 +62,11 @@
  * @summary JDK implementation specific unit test for the base DefaultLoggerFinder.
  *          Tests the behavior of DefaultLoggerFinder and SimpleConsoleLogger
  *          implementation.
  * @modules java.base/sun.util.logging
  *          java.base/jdk.internal.logger
- * @build AccessSystemLogger BaseDefaultLoggerFinderTest CustomSystemClassLoader
+ * @build AccessSystemLogger BaseDefaultLoggerFinderTest CustomSystemClassLoader BaseLoggerFinder
  * @run  driver AccessSystemLogger
  * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest NOSECURITY
  * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest NOPERMISSIONS
  * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest WITHPERMISSIONS
  * @run  main/othervm -Xbootclasspath/a:boot -Djava.system.class.loader=CustomSystemClassLoader BaseDefaultLoggerFinderTest WITHCUSTOMWRAPPERS

@@ -95,11 +95,11 @@
     final static AccessSystemLogger accessSystemLogger = new AccessSystemLogger();
     static final Class<?>[] providerClass;
     static {
         try {
             providerClass = new Class<?>[] {
-                ClassLoader.getSystemClassLoader().loadClass("BaseDefaultLoggerFinderTest$BaseLoggerFinder"),
+                ClassLoader.getSystemClassLoader().loadClass("BaseLoggerFinder"),
             };
         } catch (ClassNotFoundException ex) {
             throw new ExceptionInInitializerError(ex);
         }
     }

@@ -118,47 +118,10 @@
         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 {
-
-        static final RuntimePermission LOGGERFINDER_PERMISSION =
-                    new RuntimePermission("loggerFinder");
-        public BaseLoggerFinder() {
-            if (fails.get()) {
-                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);
-        }
-
-        @Override
-        public PlatformLogger.Bridge asPlatformLoggerBridge(Logger logger) {
-            PrivilegedAction<PlatformLogger.Bridge> pa = () ->
-                PlatformLogger.Bridge.convert(logger);
-            return AccessController.doPrivileged(pa);
-        }
-
-    }
-
     public static class MyBundle extends ResourceBundle {
 
         final ConcurrentHashMap<String,String> map = new ConcurrentHashMap<>();
 
         @Override

@@ -475,11 +438,11 @@
             switch (testCase) {
                 case NOSECURITY:
                     System.out.println("\n*** Without Security Manager\n");
                     System.out.println(TestLoggerFinder.conf.get());
                     provider = getLoggerFinder(expectedClass);
-                    if (!provider.getClass().getName().equals("BaseDefaultLoggerFinderTest$BaseLoggerFinder")) {
+                    if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
                         throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
                     }
                     test(provider, true);
                     System.out.println("Tetscase count: " + TestLoggerFinder.sequencer.get());
                     break;

@@ -496,11 +459,11 @@
                         }
                         final boolean control = allowControl.get().get();
                         try {
                             allowControl.get().set(true);
                             provider = getLoggerFinder(expectedClass);
-                            if (!provider.getClass().getName().equals("BaseDefaultLoggerFinderTest$BaseLoggerFinder")) {
+                            if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
                                 throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
                             }
                         } finally {
                             allowControl.get().set(control);
                         }

@@ -514,11 +477,11 @@
                     setSecurityManager();
                     final boolean control = allowControl.get().get();
                     try {
                         allowControl.get().set(true);
                         provider = getLoggerFinder(expectedClass);
-                        if (!provider.getClass().getName().equals("BaseDefaultLoggerFinderTest$BaseLoggerFinder")) {
+                        if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
                             throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
                         }
                         test(provider, true);
                     } finally {
                         allowControl.get().set(control);

@@ -530,11 +493,11 @@
                     setSecurityManager();
                     final boolean previous = allowControl.get().get();
                     try {
                         allowControl.get().set(true);
                         provider = getLoggerFinder(expectedClass);
-                        if (!provider.getClass().getName().equals("BaseDefaultLoggerFinderTest$BaseLoggerFinder")) {
+                        if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
                             throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
                         }
                         test(provider, CustomLoggerWrapper::new, true);
                     } finally {
                         allowControl.get().set(previous);

@@ -548,11 +511,11 @@
                     setSecurityManager();
                     final boolean before = allowControl.get().get();
                     try {
                         allowControl.get().set(true);
                         provider = getLoggerFinder(expectedClass);
-                        if (!provider.getClass().getName().equals("BaseDefaultLoggerFinderTest$BaseLoggerFinder")) {
+                        if (!provider.getClass().getName().equals("BaseLoggerFinder")) {
                             throw new RuntimeException("Unexpected provider: " + provider.getClass().getName());
                         }
                         test(provider, ReflectionLoggerWrapper::new, true);
                     } finally {
                         allowControl.get().set(before);