[jbosstools-commits] JBoss Tools SVN: r44556 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection and 1 other directories.

Wednesday, 17 October 2012


Author: dmaliarevich
Date: 2012-10-17 06:35:47 -0400 (Wed, 17 Oct 2012)
New Revision: 44556

Modified:
  
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java
  
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java
  
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
  
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html
  
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-12843 - Some VPE tests are failing when run on Git
repository, fixed.

Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java	2012-10-17
07:58:36 UTC (rev 44555)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java	2012-10-17
10:35:47 UTC (rev 44556)
@@ -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();
 			

Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java	2012-10-17
07:58:36 UTC (rev 44555)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java	2012-10-17
10:35:47 UTC (rev 44556)
@@ -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 {

Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java	2012-10-17
07:58:36 UTC (rev 44555)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java	2012-10-17
10:35:47 UTC (rev 44556)
@@ -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("<test></test>"); //$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);
 

Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html	2012-10-17
07:58:36 UTC (rev 44555)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html	2012-10-17
10:35:47 UTC (rev 44556)
@@ -1,13 +1,6 @@
 <html>
 <head></head>
 <body>
-<input type ="button" value="1" />
-<p/>
-<input type ="button" value="2" />
-<p/>
-<input type ="button" value="3" />
-<p/>
-<input type ="button" value="4" />
-<p/>
+<span>span1</span><p/><span>span2</span><p/><span>span3</span><p/>
 </body>
 </html>
\ No newline at end of file

Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java	2012-10-17
07:58:36 UTC (rev 44555)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java	2012-10-17
10:35:47 UTC (rev 44556)
@@ -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<nsIDOMNode> 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$
 	}
 	
 }


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r44556 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection and 1 other directories.