Refactor API tests to separate classes and package; point to UndoUtils in area's javadoc

richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/CaretTests.java

@@ -0,0 +1,55 @@
+package org.fxmisc.richtext.api;
+
+import javafx.stage.Stage;
+import org.fxmisc.richtext.Caret;
+import org.fxmisc.richtext.InlineCssTextAreaAppTest;
+import org.junit.Test;
+import org.testfx.util.WaitForAsyncUtils;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class CaretTests extends InlineCssTextAreaAppTest {
+
+    @Override
+    public void start(Stage stage) throws Exception {
+        super.start(stage);
+
+        // insure caret is always visible
+        area.setShowCaret(Caret.CaretVisibility.ON);
+
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 50; i++) {
+            sb.append(i).append("\n");
+        }
+        area.replaceText(sb.toString());
+        area.moveTo(0);
+        area.showParagraphAtTop(0);
+    }
+
+    @Test
+    public void testMoveCaretAndFollowIt() {
+        assertTrue(area.getCaretBounds().isPresent());
+
+        // move caret outside of viewport
+        area.moveTo(area.getLength());
+        area.requestFollowCaret();
+
+        // needed for test to pass
+        WaitForAsyncUtils.waitForFxEvents();
+
+        // viewport should update itself so caret is visible again
+        assertTrue(area.getCaretBounds().isPresent());
+    }
+
+    @Test
+    public void testMoveCaretWithoutFollowingIt() {
+        assertTrue(area.getCaretBounds().isPresent());
+
+        // move caret outside of viewport
+        area.moveTo(area.getLength());
+
+        // caret should not be visible
+        assertFalse(area.getCaretBounds().isPresent());
+    }
+}

richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/CharacterBoundsTest.java

@@ -0,0 +1,31 @@
+package org.fxmisc.richtext.api;
+
+import javafx.geometry.Bounds;
+import javafx.stage.Stage;
+import org.fxmisc.richtext.InlineCssTextAreaAppTest;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class CharacterBoundsTest extends InlineCssTextAreaAppTest {
+
+    @Override
+    public void start(Stage stage) throws Exception {
+        super.start(stage);
+        area.replaceText("a line of sample text");
+    }
+
+    @Test
+    public void selectionBoundsUnchangedWhenCallGetCharacterBounds() {
+        area.selectAll();
+        Bounds bounds = area.getSelectionBounds().get();
+
+        // getCharacterBoundsOnScreen() uses the selection shape to calculate the bounds
+        // so insure it doesn't affect the selection shape if something is selected
+        // before it gets called
+        area.getCharacterBoundsOnScreen(0, area.getLength() - 1);
+
+        assertEquals(bounds, area.getSelectionBounds().get());
+    }
+
+}

richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/HitTests.java

@@ -0,0 +1,168 @@
+package org.fxmisc.richtext.api;
+
+import com.nitorcreations.junit.runners.NestedRunner;
+import javafx.geometry.Bounds;
+import javafx.geometry.Insets;
+import javafx.geometry.Point2D;
+import javafx.geometry.Pos;
+import org.fxmisc.richtext.InlineCssTextAreaAppTest;
+import org.fxmisc.richtext.model.NavigationActions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.function.Consumer;
+
+import static javafx.scene.input.MouseButton.PRIMARY;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(NestedRunner.class)
+public class HitTests extends InlineCssTextAreaAppTest {
+
+    private void moveCaretToAreaEnd() {
+        area.moveTo(area.getLength());
+    }
+
+    public class WhenAreaIsPadded {
+
+        double paddingAmount = 20;
+
+        public class AndHitsOccurOutsideArea {
+
+            String text = "text";
+            String fullText = text + "\n" + text;
+
+            @Before
+            public void setup() {
+                interact(() -> area.replaceText(fullText));
+            }
+
+            @Test
+            public void clickingInTopPaddingMovesCaretToTopLine() {
+                interact(() -> area.setPadding(new Insets(paddingAmount, 0, 0, 0)));
+
+                moveCaretToAreaEnd();
+                moveTo(position(Pos.TOP_LEFT, 1, 2)).clickOn(PRIMARY);
+                assertEquals(0, area.getCurrentParagraph());
+
+                moveCaretToAreaEnd();
+                moveTo(position(Pos.TOP_CENTER, 0, 0)).clickOn(PRIMARY);
+                assertEquals(0, area.getCurrentParagraph());
+            }
+
+            @Test
+            public void clickingInLeftPaddingMovesCaretToBeginningOfLineOnSingleLineParagraph() {
+                interact(() -> area.setPadding(new Insets(0, 0, 0, paddingAmount)));
+
+                moveCaretToAreaEnd();
+                moveTo(position(Pos.TOP_LEFT, 1, 1)).clickOn(PRIMARY);
+                assertEquals(0, area.getCaretColumn());
+            }
+
+            @Test
+            public void clickingInRightPaddingMovesCaretToEndOfLineOnSingleLineParagraph() {
+                interact(() -> {
+                    area.setPadding(new Insets(0, paddingAmount, 0, 0));
+                    area.moveTo(0);
+
+                    // insure we're scrolled all the way to the right
+                    area.scrollBy(new Point2D(100, 0));
+                });
+
+                moveTo(position(Pos.TOP_RIGHT, -1, 1)).clickOn(PRIMARY);
+                assertEquals(area.getParagraphLenth(0), area.getCaretColumn());
+            }
+
+            @Test
+            public void clickingInBottomPaddingMovesCaretToBottomLine() {
+                interact(() -> {
+                    area.setPadding(new Insets(0, 0, paddingAmount, 0));
+                    area.moveTo(0);
+
+                    // insure we're scrolled all the way to the bottom
+                    area.scrollBy(new Point2D(0, 100));
+                });
+
+                moveTo(position(Pos.BOTTOM_CENTER, 0, -2)).clickOn(PRIMARY);
+                assertEquals(1, area.getCurrentParagraph());
+            }
+
+        }
+
+        public class AndHitsOccurInsideArea {
+
+            String text = "abcdefghijklmnopqrstuvwxyz";
+            String fullText;
+
+            {
+                int totalPars = 50;
+                int indexLimit = totalPars - 1;
+                StringBuilder sb = new StringBuilder();
+                Consumer<Integer> appendParagraph = i -> sb.append("Par #").append(i).append(" ").append(text);
+                for (int i = 0; i < indexLimit; i++) {
+                    appendParagraph.accept(i);
+                    sb.append("\n");
+                }
+                appendParagraph.accept(indexLimit);
+                fullText = sb.toString();
+            }
+
+            @Before
+            public void setup() {
+                interact(() -> {
+                    area.replaceText(fullText);
+                    area.setPadding(new Insets(paddingAmount));
+                    area.setStyle("-fx-font-family: monospace; -fx-font-size: 12pt;");
+                });
+            }
+
+            @Test
+            public void clickingCharacterShouldMoveCaretToThatPosition() {
+                int start = area.getAbsolutePosition(3, 8);
+                Bounds b = area.getCharacterBoundsOnScreen(start, start + 1).get();
+                moveTo(b).clickOn(PRIMARY);
+                assertEquals(start, area.getCaretPosition());
+            }
+
+            @Test
+            public void prevPageMovesCaretToTopOfPage() {
+                // Mac: failed; Windows: untested
+                // TODO: test on respective OS and update expected values to be correct
+                run_only_on_linux();
+
+                area.showParagraphAtBottom(area.getParagraphs().size() - 1);
+                // move to last line, column 0
+                area.moveTo(area.getParagraphs().size() - 1, 0);
+
+                interact(() -> {
+                    // hit is called here
+                    area.prevPage(NavigationActions.SelectionPolicy.CLEAR);
+                });
+
+                assertEquals(0, area.getCaretColumn());
+                assertEquals(32, area.getCurrentParagraph());
+            }
+
+            @Test
+            public void nextPageMovesCaretToBottomOfPage() {
+                // Mac: failed; Windows: untested
+                // TODO: test on respective OS and update expected values to be correct
+                run_only_on_linux();
+
+                area.showParagraphAtTop(0);
+                area.moveTo(0);
+
+                interact(() -> {
+                    // hit is called here
+                    area.nextPage(NavigationActions.SelectionPolicy.CLEAR);
+                });
+
+                assertEquals(0, area.getCaretColumn());
+                assertEquals(17, area.getCurrentParagraph());
+            }
+
+        }
+
+    }
+
+}

richtextfx/src/integrationTest/java/org/fxmisc/richtext/view/MouseOverTextDelayTests.java → richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/MouseOverTextDelayTests.java

@@ -1,4 +1,4 @@
-package org.fxmisc.richtext.view;
+package org.fxmisc.richtext.api;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.geometry.Pos;

richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/ParagraphLinesCountTests.java

@@ -0,0 +1,35 @@
+package org.fxmisc.richtext.api;
+
+import org.fxmisc.richtext.InlineCssTextAreaAppTest;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+public class ParagraphLinesCountTests extends InlineCssTextAreaAppTest {
+
+    @Test
+    public void multiLineReturnsCorrectCount() {
+        String[] lines = {
+                "01 02 03 04 05",
+                "11 12 13 14 15",
+                "21 22 23 24 25"
+        };
+        interact(() -> {
+            area.setWrapText(true);
+            stage.setWidth(120);
+            area.replaceText(String.join(" ", lines));
+        });
+
+        assertEquals(3, area.getParagraphLinesCount(0));
+    }
+
+    @Test
+    public void singleLineReturnsOne() {
+        interact(() -> area.replaceText("some text"));
+        assertFalse(area.isWrapText());
+
+        assertEquals(1, area.getParagraphLinesCount(0));
+    }
+
+}

richtextfx/src/integrationTest/java/org/fxmisc/richtext/view/UndoManagerTests.java → richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/UndoManagerTests.java

@@ -1,4 +1,4 @@
-package org.fxmisc.richtext.view;
+package org.fxmisc.richtext.api;
 
 import org.fxmisc.richtext.InlineCssTextAreaAppTest;
 import org.fxmisc.richtext.util.UndoUtils;