modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlTest.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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.  Oracle designates this

@@ -52,12 +52,12 @@
 import javafx.scene.control.Skin;
 import javafx.scene.control.Tooltip;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import sun.util.logging.PlatformLogger;
-import sun.util.logging.PlatformLogger.Level;
+import com.sun.javafx.logging.PlatformLogger;
+import com.sun.javafx.logging.PlatformLogger.Level;
 
 import static org.junit.Assert.*;
 
 /**
  * Things every Control needs to test:

@@ -104,18 +104,16 @@
         s.setNode(skinNode);
     }
 
     private void disableLogging() {
         final PlatformLogger logger = Logging.getControlsLogger();
-        originalLogLevel = logger.level();
-        logger.setLevel(Level.OFF);
+        logger.disableLogging();
     }
 
     private void enableLogging() {
         final PlatformLogger logger = Logging.getControlsLogger();
-//        logger.setLevel(originalLogLevel);
-        logger.setLevel(Level.FINE);
+        logger.enableLogging();
     }
 
     @Test public void focusTraversableIsTrueByDefault() {
         assertTrue(c.isFocusTraversable());
     }