Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Thienel2012-12-24 12:41:56 +0000
committerFlorian Thienel2013-01-04 15:25:16 +0000
commitef7cb3c2af08d7027d3df8eeacb2026e97845d0a (patch)
tree35595ab4e6d658db6f402c487c51b44ff7345457 /org.eclipse.vex.core.tests
parent9b47a9907190b9e74086147ddd9381931104223b (diff)
downloadorg.eclipse.mylyn.docs.vex-ef7cb3c2af08d7027d3df8eeacb2026e97845d0a.tar.gz
org.eclipse.mylyn.docs.vex-ef7cb3c2af08d7027d3df8eeacb2026e97845d0a.tar.xz
org.eclipse.mylyn.docs.vex-ef7cb3c2af08d7027d3df8eeacb2026e97845d0a.zip
fix selection balancing for Comment
Signed-off-by: Florian Thienel <florian@thienel.org>
Diffstat (limited to 'org.eclipse.vex.core.tests')
-rw-r--r--org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DocumentTest.java17
-rw-r--r--org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/L2SelectionTest.java10
2 files changed, 24 insertions, 3 deletions
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DocumentTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DocumentTest.java
index 6b8305c9..eb756b66 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DocumentTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DocumentTest.java
@@ -77,14 +77,25 @@ public class DocumentTest {
}
@Test
- public void givenElementWithText_whenRangeBeginsFromStartOffset_shouldProvideParentAsCommenElement() throws Exception {
+ public void givenElementWithText_whenRangeBeginsFromStartOffset_shouldProvideParentAsCommenNode() throws Exception {
final Document document = new Document(new Element("root"));
final Element childElement = document.insertElement(1, new QualifiedName(null, "child"));
document.insertText(childElement.getEndOffset(), "Hello World");
- final Element commonElement = document.findCommonElement(childElement.getStartOffset(), childElement.getEndOffset() - 5);
+ final Node commonNode = document.findCommonNode(childElement.getStartOffset(), childElement.getEndOffset() - 5);
- assertSame(document.getRootElement(), commonElement);
+ assertSame(document.getRootElement(), commonNode);
+ }
+
+ @Test
+ public void givenElementWithText_whenRangeWithinText_shouldProvideElementAsCommonNode() throws Exception {
+ final Document document = new Document(new Element("root"));
+ final Element childElement = document.insertElement(1, new QualifiedName(null, "child"));
+ document.insertText(childElement.getEndOffset(), "Hello World");
+
+ final Node commonNode = document.findCommonNode(childElement.getStartOffset() + 2, childElement.getEndOffset() - 5);
+
+ assertSame(childElement, commonNode);
}
private static void assertNodesEqual(final List<? extends Node> expected, final List<? extends Node> actual) {
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/L2SelectionTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/L2SelectionTest.java
index 64fa4bd3..40f41e9f 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/L2SelectionTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/widget/L2SelectionTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.internal.dom.Comment;
import org.eclipse.vex.core.internal.dom.Element;
import org.junit.Before;
import org.junit.Test;
@@ -153,4 +154,13 @@ public class L2SelectionTest {
assertEquals(paraElement.getRange().resizeBy(1, -4), widget.getSelectedRange());
assertEquals(paraElement.getStartOffset() + 1, widget.getCaretOffset());
}
+
+ @Test
+ public void givenCarentInEmptyComment_whenMovedBeforeComment_shouldExpandSelectionToIncludeEndOffset() throws Exception {
+ final Comment comment = widget.insertComment();
+ widget.moveBy(-1, true);
+ assertTrue(widget.hasSelection());
+ assertEquals(comment.getRange(), widget.getSelectedRange());
+ assertEquals(comment.getStartOffset(), widget.getCaretOffset());
+ }
}

Back to the top