modules/graphics/src/test/java/com/sun/javafx/css/converters/URLConverterTest.java

rev 9240 : 8076423: JEP 253: Prepare JavaFX UI Controls & CSS APIs for Modularization

@@ -21,13 +21,12 @@
  * 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.css.converters;
+package javafx.css.converter;
 
-import java.net.URL;
 import javafx.css.ParsedValue;
 import javafx.css.StyleConverter;
 import javafx.scene.text.Font;
 import com.sun.javafx.css.ParsedValueImpl;
 import org.junit.Test;

@@ -53,44 +52,44 @@
      */
     @Test
     public void testConvertWithNullBaseURL() {
         
         ParsedValue[] values = new ParsedValue[] {
-            new ParsedValueImpl<String,String>("com/sun/javafx/css/converters/some.txt", null),
+            new ParsedValueImpl<String,String>("javafx/css/converter/some.txt", null),
             new ParsedValueImpl<String,String>(null,null)
         };
         ParsedValueImpl<ParsedValue[], String> value = 
             new ParsedValueImpl<ParsedValue[], String>(values, URLConverter.getInstance());
                 
         Font font = null;
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        String expResult = cl.getResource("com/sun/javafx/css/converters/some.txt").toExternalForm();
+        String expResult = cl.getResource("javafx/css/converter/some.txt").toExternalForm();
         String result = value.convert(font);
         assertEquals(expResult, result);
     }
 
     public void testConvertWithBaseURL() {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         String base = cl.getResource("com/..").toExternalForm();
         ParsedValue[] values = new ParsedValue[] {
-            new ParsedValueImpl<String,String>("com/sun/javafx/css/converters/some.txt", null),
+            new ParsedValueImpl<String,String>("javafx/css/converter/some.txt", null),
             new ParsedValueImpl<String,String>(base,null)
         };
         ParsedValueImpl<ParsedValue[], String> value = 
             new ParsedValueImpl<ParsedValue[], String>(values, URLConverter.getInstance());
                 
         Font font = null;
-        String expResult = cl.getResource("com/sun/javafx/css/converters/some.txt").toExternalForm();
+        String expResult = cl.getResource("javafx/css/converter/some.txt").toExternalForm();
         String result = value.convert(font);
         assertEquals(expResult, result);
     }
     
     @Test
     public void testConvertWithAbsoluteURLAndNullBaseURL() {
         
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        String expResult = cl.getResource("com/sun/javafx/css/converters/some.txt").toExternalForm();
+        String expResult = cl.getResource("javafx/css/converter/some.txt").toExternalForm();
         ParsedValue[] values = new ParsedValue[] {
             new ParsedValueImpl<String,String>(expResult, null),
             new ParsedValueImpl<String,String>(null,null)
         };
         ParsedValueImpl<ParsedValue[], String> value = 

@@ -104,11 +103,11 @@
     @Test
     public void testConvertWithAbsoluteURLWithBaseURL() {
         
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         String baseURL = cl.getResource("com/..").toExternalForm();
-        String expResult = cl.getResource("com/sun/javafx/css/converters/some.txt").toExternalForm();
+        String expResult = cl.getResource("javafx/css/converter/some.txt").toExternalForm();
         ParsedValue[] values = new ParsedValue[] {
             new ParsedValueImpl<String,String>(expResult, null),
             new ParsedValueImpl<String,String>(baseURL,null)
         };
         ParsedValueImpl<ParsedValue[], String> value =