modules/web/src/test/java/test/javafx/scene/web/DebuggerTest.java

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

@@ -27,10 +27,11 @@
 
 import com.sun.javafx.scene.web.Debugger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import javafx.scene.web.WebEngineShim;
 import javafx.util.Callback;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import org.junit.Test;
 import org.junit.After;

@@ -38,11 +39,11 @@
 public class DebuggerTest extends TestBase {
 
     @Test
     public void testSimpleMessageExchange() {
         submit(() -> {
-            Debugger debugger = getEngine().impl_getDebugger();
+            Debugger debugger = WebEngineShim.getDebugger(getEngine());
 
             final List<String> callbackMessages = new ArrayList<String>();
             debugger.setMessageCallback(message -> {
                 callbackMessages.add(message);
                 return null;

@@ -57,11 +58,11 @@
     }
 
     @Test
     public void testEnabledProperty() {
         submit(() -> {
-            Debugger debugger = getEngine().impl_getDebugger();
+            Debugger debugger = WebEngineShim.getDebugger(getEngine());
 
             assertEquals(false, debugger.isEnabled());
 
             debugger.setEnabled(true);
             assertEquals(true, debugger.isEnabled());

@@ -80,11 +81,11 @@
     }
 
     @Test
     public void testMessageCallbackProperty() {
         submit(() -> {
-            Debugger debugger = getEngine().impl_getDebugger();
+            Debugger debugger = WebEngineShim.getDebugger(getEngine());
             Callback<String,Void> callback = new Callback<String,Void>() {
                 public Void call(String message) {
                     return null;
                 }
             };

@@ -100,33 +101,33 @@
     }
 
     @Test
     public void testSendMessageIllegalStateException() {
         submit(() -> {
-            Debugger debugger = getEngine().impl_getDebugger();
+            Debugger debugger = WebEngineShim.getDebugger(getEngine());
             try {
                 debugger.sendMessage("foo");
                 fail("IllegalStateException expected but not thrown");
             } catch (IllegalStateException expected) {}
         });
     }
 
     @Test
     public void testSendMessageNullPointerException() {
         submit(() -> {
-            Debugger debugger = getEngine().impl_getDebugger();
+            Debugger debugger = WebEngineShim.getDebugger(getEngine());
             debugger.setEnabled(true);
             try {
                 debugger.sendMessage(null);
                 fail("NullPointerException expected but not thrown");
             } catch (NullPointerException expected) {}
         });
     }
 
     @Test
     public void testThreadCheck() {
-        Debugger debugger = getEngine().impl_getDebugger();
+        Debugger debugger = WebEngineShim.getDebugger(getEngine());
 
         try {
             debugger.isEnabled();
             fail("IllegalStateException expected but not thrown");
         } catch (IllegalStateException expected) {}

@@ -157,9 +158,9 @@
     }
 
     @After
     public void disableDebug() {
         submit(() -> {
-            getEngine().impl_getDebugger().setEnabled(false);
+            WebEngineShim.getDebugger(getEngine()).setEnabled(false);
         });
     }
 }