changeset 1076:35e22645a978

Automated merge with file:///cygdrive/e/JavaFX/jfx-22-sync/rt
author Martin Sladecek <martin.sladecek@oracle.com>
date Wed, 16 May 2012 16:15:40 +0200
parents 5f70f96074ea 5defce2ac120
children 68089c99e4ca 9c4c5df3a504
files
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/test/unit/javafx/scene/image/ImageTest.java	Wed May 16 13:33:58 2012 +0200
+++ b/javafx-ui-common/test/unit/javafx/scene/image/ImageTest.java	Wed May 16 16:15:40 2012 +0200
@@ -51,6 +51,7 @@
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
+import org.junit.Ignore;
 
 public final class ImageTest {
     private final StubToolkit toolkit;
@@ -509,6 +510,7 @@
     }
     
     @Test
+    @Ignore
     public void createImageFromClasspathTest() {
         final String url = "javafx/scene/image/test.png";
         final String resolvedUrl = Thread.currentThread().getContextClassLoader().getResource(url).toString();
@@ -521,6 +523,7 @@
     }
     
     @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();