changeset 1079:f6614c2c89d8

Automated merge with file:///cygdrive/e/JavaFX/jfx-22-sync/rt
author Martin Sladecek <martin.sladecek@oracle.com>
date Wed, 16 May 2012 17:00:20 +0200
parents 68089c99e4ca 9c4c5df3a504
children 57217d4635f1
files
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/test/unit/javafx/scene/image/ImageTest.java	Wed May 16 16:16:37 2012 +0200
+++ b/javafx-ui-common/test/unit/javafx/scene/image/ImageTest.java	Wed May 16 17:00:20 2012 +0200
@@ -510,7 +510,6 @@
     }
     
     @Test
-    @Ignore
     public void createImageFromClasspathTest() {
         final String url = "javafx/scene/image/test.png";
         final String resolvedUrl = Thread.currentThread().getContextClassLoader().getResource(url).toString();
@@ -523,7 +522,6 @@
     }
     
     @Test
-    @Ignore
     public void createImageFromClasspathTest_withLeadingSlash() {
         final String url = "/javafx/scene/image/test.png";
         final String resolvedUrl = Thread.currentThread().getContextClassLoader().getResource(url.substring(1)).toString();