Merge pull request #99 from hastebrot/master

refactor(ScrollPaneTest): Move ScrollPaneTest from unit tests to integra...
TestFX · Jun 19, 2014 · 57793d9 · 57793d9
2 parents e704b83 + 1eac198
commit 57793d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...stfx/robots/impl/ScrollRobotImplTest.java → ...ava/org/loadui/testfx/ScrollPaneTest.java b/...stfx/robots/impl/ScrollRobotImplTest.java → ...ava/org/loadui/testfx/ScrollPaneTest.java
@@ -13,10 +13,8 @@
  * either express or implied. See the Licence for the specific language governing permissions
  * and limitations under the Licence.
  */
-package org.loadui.testfx.robots.impl;
+package org.loadui.testfx;
 
-import static org.hamcrest.Matchers.is;
-import static org.loadui.testfx.Assertions.verifyThat;
 import javafx.geometry.VerticalDirection;
 import javafx.scene.Parent;
 import javafx.scene.control.ScrollPane;
@@ -27,16 +25,18 @@
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.junit.Test;
-import org.loadui.testfx.GuiTest;
 import org.loadui.testfx.controls.impl.VisibleNodesMatcher;
 import org.loadui.testfx.exceptions.NoNodesVisibleException;
 
-public class ScrollRobotImplTest extends GuiTest {
+import static org.hamcrest.Matchers.is;
+import static org.loadui.testfx.Assertions.verifyThat;
+
+public class ScrollPaneTest extends GuiTest {
     public static final int IMAGE_WIDTH = 525;
 
     public static final int IMAGE_HEIGHT = 448;
 
-    public static final String IMAGE_RESOURCE = "/java-duke-guitar.png";
+    public static final String IMAGE_RESOURCE = "java-duke-guitar.png";
 
     private static final String ID1 = "ID1";
 

diff --git a/...e/src/test/resources/java-duke-guitar.png → ...es/org/loadui/testfx/java-duke-guitar.png b/...e/src/test/resources/java-duke-guitar.png → ...es/org/loadui/testfx/java-duke-guitar.png