### Eclipse Workspace Patch 1.0
#P org.jboss.tools.vpe.ui.test
Index: resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html
===================================================================
--- resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html (revision 44474)
+++ resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html (working copy)
@@ -1,13 +1,6 @@
-
-
-
-
-
-
-
-
+span1span2span3
\ No newline at end of file
Index: src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java
===================================================================
--- src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java (revision 44474)
+++ src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java (working copy)
@@ -46,13 +46,19 @@
JSPMultiPageEditor part = openEditor(input);
ITextViewer viewer = part.getSourceEditor().getTextViewer();
- int startSelectionOffcet = TestUtil.getLinePositionOffcet(viewer, 6, 1);
- int length = TestUtil.getLinePositionOffcet(viewer, 9, 4)-startSelectionOffcet;
+ int startSelectionOffcet = TestUtil.getLinePositionOffcet(viewer, 4, 1);
+ int length = TestUtil.getLinePositionOffcet(viewer, 4, 45)-startSelectionOffcet;
viewer.setSelectedRange(startSelectionOffcet, length);
VpeController vpeController = TestUtil.getVpeController(part);
vpeController.sourceSelectionChanged();
List selectedNodes = vpeController.getXulRunnerEditor().getSelectedNodes();
- assertEquals("Shuld be selected ",3,selectedNodes.size()); //$NON-NLS-1$
+ /*
+ * When Git repository is checked out on Windows OS
+ * git could add window style caret return symbol,
+ * after that additional text nodes appear.
+ * To fix it: test page was changed.
+ */
+ assertEquals("Shuld be selected ",4,selectedNodes.size()); //$NON-NLS-1$
}
}
#P org.jboss.tools.jsf.vpe.jsf.test
Index: src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
===================================================================
--- src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java (revision 44130)
+++ src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java (working copy)
@@ -15,6 +15,7 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
@@ -125,14 +126,12 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- StyledText styledText = part.getSourceEditor().getTextViewer()
- .getTextWidget();
-
+ StructuredTextViewer textViewer = part.getSourceEditor().getTextViewer();
+ StyledText styledText = textViewer.getTextWidget();
+ int offset = TestUtil.getLinePositionOffcet(textViewer, 8, 14);
for (int i = 0; i < 20; i++) {
-
- styledText.setCaretOffset(311);
- IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 311);
+ styledText.setCaretOffset(offset);
+ IndexedRegion treeNode = ContentAssistUtils.getNodeAt(textViewer, offset);
Node node = (Node) treeNode;
assertNotNull(node);
@@ -183,15 +182,16 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- StyledText styledText = part.getSourceEditor().getTextViewer()
- .getTextWidget();
-
- styledText.setCaretOffset(285);
+ StructuredTextViewer textViewer = part.getSourceEditor().getTextViewer();
+ StyledText styledText = textViewer.getTextWidget();
+ int offset = TestUtil.getLinePositionOffcet(textViewer, 6, 25);
+
+ styledText.setCaretOffset(offset);
styledText.insert(""); //$NON-NLS-1$
TestUtil.delay(450);
TestUtil.waitForJobs();
- IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 290);
+ offset = TestUtil.getLinePositionOffcet(textViewer, 6, 30);
+ IndexedRegion treeNode = ContentAssistUtils.getNodeAt(textViewer, offset);
Node node = (Node) treeNode;
assertNotNull(node);
Index: src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java
===================================================================
--- src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java (revision 44130)
+++ src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java (working copy)
@@ -75,7 +75,7 @@
assertEquals(simpleTextNode ,domMapping.getNearElementMappingAtVisualNode(domNode).getSourceNode());
assertEquals("Node should be a text node", nsIDOMNode.TEXT_NODE,domNode.getNodeType()); //$NON-NLS-1$
- assertEquals(simpleTextNode.getNodeValue(), domNode.getNodeValue());
+ assertEquals(simpleTextNode.getNodeValue().trim(), domNode.getNodeValue().trim());
}
public void testForElText() throws Throwable {
Index: src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java
===================================================================
--- src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java (revision 44130)
+++ src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java (working copy)
@@ -17,6 +17,7 @@
import org.eclipse.swt.custom.StyledText;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
@@ -57,12 +58,12 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- StyledText styledText = part.getSourceEditor().getTextViewer()
- .getTextWidget();
+ StructuredTextViewer textViewer = part.getSourceEditor().getTextViewer();
+ StyledText styledText = textViewer.getTextWidget();
+ int offset = TestUtil.getLinePositionOffcet(textViewer, 12, 9);
- styledText.setCaretOffset(424);
- Node h_outputText = (Node) ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 424);
+ styledText.setCaretOffset(offset);
+ Node h_outputText = (Node) ContentAssistUtils.getNodeAt(textViewer, offset);
assertNotNull(h_outputText);
@@ -77,8 +78,8 @@
//text formating for h:output
assertEquals(8, h_output_template.getTextFormattingData().getAllFormatData().length);
- Node h_dataTable = (Node) ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 473);
+ offset = TestUtil.getLinePositionOffcet(textViewer, 13, 9);
+ Node h_dataTable = (Node) ContentAssistUtils.getNodeAt(textViewer, offset);
assertNotNull(h_dataTable);
@@ -90,8 +91,8 @@
assertEquals(9, h_data_Table.getTextFormattingData().getAllFormatData().length);
- Node span =(Node) ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 615);
+ offset = TestUtil.getLinePositionOffcet(textViewer, 21, 4);
+ Node span =(Node) ContentAssistUtils.getNodeAt(textViewer, offset);
dependencySet=new HashSet();