8242505: Some WebKit tests might fail because Microsoft libraries are not loaded

Reviewed-by: ghb

Author: kevinrushforth

modules/javafx.web/src/test/java/test/com/sun/webkit/SharedBufferTest.java

@@ -25,6 +25,8 @@
 
 package test.com.sun.webkit;
 
+import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.tk.Toolkit;
 import com.sun.webkit.SharedBuffer;
 import com.sun.webkit.SharedBufferShim;
 import com.sun.webkit.WebPage;
@@ -50,6 +52,10 @@ public class SharedBufferTest {
 
     @BeforeClass
     public static void beforeClass() throws ClassNotFoundException {
+        if (PlatformUtil.isWindows()) {
+            // Must load Microsoft libs before loading jfxwebkit.dll
+            Toolkit.loadMSWindowsLibraries();
+        }
         Class.forName(WebPage.class.getName());
     }
 

modules/javafx.web/src/test/java/test/com/sun/webkit/SimpleSharedBufferInputStreamTest.java

@@ -25,6 +25,8 @@
 
 package test.com.sun.webkit;
 
+import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.tk.Toolkit;
 import com.sun.webkit.SharedBuffer;
 import com.sun.webkit.SharedBufferShim;
 import com.sun.webkit.SimpleSharedBufferInputStream;
@@ -52,6 +54,10 @@ public class SimpleSharedBufferInputStreamTest {
 
     @BeforeClass
     public static void beforeClass() throws ClassNotFoundException {
+        if (PlatformUtil.isWindows()) {
+            // Must load Microsoft libs before loading jfxwebkit.dll
+            Toolkit.loadMSWindowsLibraries();
+        }
         Class.forName(WebPage.class.getName());
     }