tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupCommon.java

rev 9491 : 8145203: Refactor systemTests for clear separation of tests
Reviewed-by: kcr

@@ -21,25 +21,26 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package com.sun.javafx.application;
+package test.com.sun.javafx.application;
 
+import com.sun.javafx.application.PlatformImplShim;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import junit.framework.AssertionFailedError;
-import util.Util;
+import test.util.Util;
 
 import static org.junit.Assert.*;
-import static util.Util.TIMEOUT;
+import static test.util.Util.TIMEOUT;
 
 /**
  * Test program for Platform startup.
  * Each of the tests must be run in a separate JVM which is why each
  * is in its own subclass.

@@ -116,11 +117,11 @@
             Util.runAndWait(mainStage::hide);
 
             // Test exit behavior after another short delay
             Thread.sleep(SLEEP_TIME);
 
-            final CountDownLatch exitLatch = PlatformImpl.test_getPlatformExitLatch();
+            final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch();
 
             if (implicitExit) {
                 // Verify that that the runtime has exited
                 assertEquals(0, exitLatch.getCount());