modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ErrorLoggingUtiltity.java

@@ -23,74 +23,59 @@
  * questions.
  */
 
 package test.com.sun.javafx.binding;
 
-import com.sun.javafx.binding.Logging;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
 import static org.junit.Assert.*;
 
-public class ErrorLoggingUtiltity {
-
-    static {
-        // initialize PlatformLogger
-        Logging.getLogger();
-    }
-
-    // getLogManager will redirect existing PlatformLogger to the Logger
-    private static final Logger logger = LogManager.getLogManager().getLogger("javafx.beans");
-
-    Level level;
-    LogRecord lastRecord;
+import com.sun.javafx.logging.PlatformLogger.Level;
 
-    Handler handler = new Handler() {
-
-        @Override
-        public void publish(LogRecord record) {
-            lastRecord = record;
-        }
+import com.sun.javafx.binding.Logging;
+import com.sun.javafx.binding.Logging.ErrorLogger.ErrorLogRecord;
+import com.sun.javafx.binding.Logging.ErrorLogger;
 
-        @Override
-        public void flush() {
-        }
+public class ErrorLoggingUtiltity {
 
-        @Override
-        public void close() throws SecurityException {
-        }
-    };
+    private static ErrorLogger loggingHolder = Logging.getLogger();
 
-    public void start() {
+    public static void start() {
         reset();
-        level = logger.getLevel();
-        logger.setLevel(Level.ALL);
-        logger.addHandler(handler);
+//      level = logger.getLevel();
+//      logger.setLevel(Level.ALL);
+//      logger.addHandler(handler);
     }
 
-    public void stop() {
-        logger.setLevel(level);
-        logger.removeHandler(handler);
+    public static void stop() {
+//      logger.setLevel(level);
+//      logger.removeHandler(handler);
     }
 
-    public void reset() {
-        lastRecord = null;
+    public static void reset() {
+        loggingHolder.setErrorLogRecord(null);
     }
 
-    public void checkFine(Class expectedException) {
+    public static boolean isEmpty() {
+        return loggingHolder.getErrorLogRecord() == null;
+    }
+
+    /**
+     * Convenience method for check(Level.FINE, expectedException)
+     */
+    public static void checkFine(Class<?> expectedException) {
         check(Level.FINE, expectedException);
     }
 
-    public void check(Level expectedLevel, Class expectedException) {
-        assertNotNull(lastRecord);
-        assertEquals(expectedLevel, lastRecord.getLevel());
-        assertTrue(expectedException.isAssignableFrom(lastRecord.getThrown().getClass()));
-        reset();
+    /**
+     * Convenience method for check(Level.WARNING, expectedException)
+     */
+    public static void checkWarning(Class<?> expectedException) {
+        check(Level.WARNING, expectedException);
     }
 
-    public boolean isEmpty() {
-        return lastRecord == null;
+    private static void check(Level expectedLevel, Class<?> expectedException) {
+        ErrorLogRecord errorLogRecord = loggingHolder.getErrorLogRecord();
+        assertNotNull(errorLogRecord);
+        assertEquals(expectedLevel, errorLogRecord.getLevel());
+        assertTrue(expectedException.isAssignableFrom(errorLogRecord.getThrown().getClass()));
+        reset();
     }
 }