Author: mareshkau Date: 2008-08-04 13:41:38 -0400 (Mon, 04 Aug 2008) New Revision: 9501 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2505/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2505/testJBIDE2505.jsp Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/perfomanceTest/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/perfomance/ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.classpath trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 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/JBIDE1615Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2297Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java 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/JBIDE788Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1568Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeNodeMapping.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java Log: swallowing of exception was removed Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.classpath 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.classpath 2008-08-04 17:41:38 UTC (rev 9501) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.settings/org.eclipse.jdt.core.prefs 2008-08-04 17:41:38 UTC (rev 9501) @@ -0,0 +1,7 @@ +#Mon Aug 04 20:09:07 EEST 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2008-08-04 17:41:38 UTC (rev 9501) @@ -18,7 +18,9 @@ org.mozilla.xpcom, org.jboss.tools.vpe.ui.test;visibility:=reexport, org.eclipse.jface.text -Eclipse-LazyStart: true Bundle-ClassPath: jsf-test.jar -Export-Package: org.jboss.tools.jsf.vpe.jsf.test, - org.jboss.tools.jsf.vpe.jsf.test.perfomance +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Package: org.jboss.tools.jsf.vpe.jsf.test + + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2505/testJBIDE2505.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2505/testJBIDE2505.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2505/testJBIDE2505.jsp 2008-08-04 17:41:38 UTC (rev 9501) @@ -0,0 +1,26 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> + +<html> + <head> + <title>Input User Name Page</title> + </head> + <body> + + <f:view> + <h1><h:outputText value="#{Message.header}"/></h1> + <h1 style="FONT-FAMILY: 'Century Schoolbook L';">Test te1xt </h1> + <h:messages style="color: red"/> + + <h:form id="greetingForm"> + <h:outputText value="#{Message.prompt_message}"/> + <h:inputText value="#{user.name}" required="true"> + <f:validateLength maximum="30" minimum="3"/> + </h:inputText> + + <h:commandButton action="hello" value="Say Hello!" /> + + </h:form> + </f:view> + </body> +</html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -29,6 +29,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2219Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2297Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2434Test; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2505Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test; @@ -37,7 +38,6 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1718Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2170Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test; -import org.jboss.tools.jsf.vpe.jsf.test.perfomance.PerfomanceTest; import org.jboss.tools.vpe.ui.test.VpeTestSetup; import org.jboss.tools.vpe.ui.test.beans.ImportBean; @@ -50,6 +50,8 @@ public class JsfAllTests { + public static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ + public static Test suite() { TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); // $NON-NLS-1$ //$NON-NLS-1$ @@ -76,23 +78,16 @@ suite.addTestSuite(JsfJbide2362Test.class); suite.addTestSuite(JBIDE2119Test.class); suite.addTestSuite(JBIDE2219Test.class); + suite.addTestSuite(JBIDE2505Test.class); // $JUnit-END$ // added by Max Areshkau // add here projects which should be imported for junit tests List<ImportBean> projectToImport = new ArrayList<ImportBean>(); ImportBean importBean = new ImportBean(); - importBean.setImportProjectName(JsfComponentTest.IMPORT_PROJECT_NAME); + importBean.setImportProjectName(JsfAllTests.IMPORT_PROJECT_NAME); importBean.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); projectToImport.add(importBean); - // Perfomance Tests - // TODO dsakovich adjust perfomance tests -// suite.addTestSuite(PerfomanceTest.class); - ImportBean importPerfomanceBean = new ImportBean(); - importPerfomanceBean.setImportProjectName(PerfomanceTest.IMPORT_PROJECT_NAME); - importPerfomanceBean.setImportProjectPath(JsfTestPlugin.getPluginResourcePath()); - projectToImport.add(importPerfomanceBean); - return new VpeTestSetup(suite, projectToImport); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -14,6 +14,7 @@ import org.eclipse.swt.custom.StyledText; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; @@ -24,8 +25,6 @@ */ public class JBIDE1105Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME="JBIDE/1105/employee.xhtml"; //$NON-NLS-1$ public JBIDE1105Test(String name) { @@ -38,7 +37,7 @@ setException(null); // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + TEST_PAGE_NAME, file); //$NON-NLS-1$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -32,10 +33,8 @@ */ public class JBIDE1460Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; + private static final String TEST_PAGE_NAME = "JBIDE/1460/JBIDE-1460.xhtml"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME = "JBIDE/1460/JBIDE-1460.xhtml"; - public JBIDE1460Test(String name) { super(name); } @@ -49,14 +48,14 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); - assertNotNull("Could not open specified file " + file.getFullPath(), + assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$ file); IEditorInput input = new FileEditorInput(file); - assertNotNull("Editor input is null", input); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ // open and get editor JSPMultiPageEditor part = openEditor(input); @@ -81,7 +80,7 @@ nsIDOMNode span = elements.get(0); nsIDOMNode text = span.getFirstChild(); - assertEquals(text.getNodeValue().trim(), "#{item.nodes}"); + assertEquals(text.getNodeValue().trim(), "#{item.nodes}"); //$NON-NLS-1$ if (getException() != null) { throw getException(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -19,6 +19,7 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; @@ -31,8 +32,6 @@ */ public class JBIDE1479Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ - public static final String TEST_PAGE_NAME = "JBIDE/1479/employee.xhtml"; //$NON-NLS-1$ public JBIDE1479Test(String name) { @@ -44,7 +43,7 @@ setException(null); // get test page path final IFile file = (IFile) TestUtil.getComponentPath( - TEST_PAGE_NAME, IMPORT_PROJECT_NAME); + TEST_PAGE_NAME, JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + TEST_PAGE_NAME, //$NON-NLS-1$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -31,10 +32,8 @@ */ public class JBIDE1484Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; + private static final String TEST_PAGE_NAME = "JBIDE/1484/JBIDE-1484.jsp"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME = "JBIDE/1484/JBIDE-1484.jsp"; - public JBIDE1484Test(String name) { super(name); @@ -49,14 +48,14 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); - assertNotNull("Could not open specified file " + file.getFullPath(), + assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$ file); IEditorInput input = new FileEditorInput(file); - assertNotNull("Editor input is null", input); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ // open and get editor JSPMultiPageEditor part = openEditor(input); @@ -84,9 +83,9 @@ nsIDOMElement elementInput2 = (nsIDOMElement) elements.get(2) .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - assertEquals(" ", elementInput0.getAttribute("value")); - assertEquals(" ", elementInput1.getAttribute("value")); - assertEquals("test", elementInput2.getAttribute("value")); + assertEquals(" ", elementInput0.getAttribute("value")); //$NON-NLS-1$//$NON-NLS-2$ + assertEquals(" ", elementInput1.getAttribute("value")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("test", elementInput2.getAttribute("value")); //$NON-NLS-1$ //$NON-NLS-2$ if (getException() != null) { throw getException(); } 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 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -19,6 +19,7 @@ import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; 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; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.template.VpeTemplate; @@ -33,8 +34,6 @@ */ public class JBIDE1494Test extends VpeTest{ - public static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME = "JBIDE/1494/JBIDE-1494.xhtml"; //$NON-NLS-1$ public JBIDE1494Test(String name) { @@ -49,7 +48,7 @@ // Tests CA // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + TEST_PAGE_NAME, file); //$NON-NLS-1$ IEditorInput input = new FileEditorInput(file); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -32,10 +33,8 @@ */ public class JBIDE1615Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; + private static final String TEST_PAGE_NAME = "JBIDE/1615/JBIDE-1615.xhtml"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME = "JBIDE/1615/JBIDE-1615.xhtml"; - public JBIDE1615Test(String name) { super(name); } @@ -49,14 +48,14 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); - assertNotNull("Could not open specified file " + file.getFullPath(), + assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$ file); IEditorInput input = new FileEditorInput(file); - assertNotNull("Editor input is null", input); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ // open and get editor JSPMultiPageEditor part = openEditor(input); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -32,12 +33,10 @@ */ public class JBIDE1720Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; + private static final String TEST_PAGE_NAME1 = "JBIDE/1720/JBIDE-1720-selectOneRadio.jsp"; //$NON-NLS-1$ + private static final String TEST_PAGE_NAME2 = "JBIDE/1720/JBIDE-1720-selectOneListBox.jsp"; //$NON-NLS-1$ + private static final String TEST_PAGE_NAME3 = "JBIDE/1720/JBIDE-1720-selectOneMenu.jsp"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME1 = "JBIDE/1720/JBIDE-1720-selectOneRadio.jsp"; - private static final String TEST_PAGE_NAME2 = "JBIDE/1720/JBIDE-1720-selectOneListBox.jsp"; - private static final String TEST_PAGE_NAME3 = "JBIDE/1720/JBIDE-1720-selectOneMenu.jsp"; - public JBIDE1720Test(String name) { super(name); } @@ -51,7 +50,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME1, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + file.getFullPath(), file); @@ -126,7 +125,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME3, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + file.getFullPath(), file); @@ -206,7 +205,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME2, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + file.getFullPath(), file); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -32,8 +33,6 @@ */ public class JBIDE1730Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME1 = "JBIDE/1730/JBIDE-1730.jsp"; //$NON-NLS-1$ public JBIDE1730Test(String name) { @@ -49,7 +48,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME1, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$ file); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -30,10 +31,8 @@ */ public class JBIDE1744Test extends VpeTest { - private static final String IMPORT_PROJECT_NAME = "jsfTest"; + private static final String TEST_PAGE_NAME = "JBIDE/1744/JBIDE-1744.jsp"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME = "JBIDE/1744/JBIDE-1744.jsp"; - /** * @param name */ @@ -50,14 +49,14 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); - assertNotNull("Could not open specified file " + file.getFullPath(), + assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$ file); IEditorInput input = new FileEditorInput(file); - assertNotNull("Editor input is null", input); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ // open and get editor JSPMultiPageEditor part = openEditor(input); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -30,9 +31,8 @@ */ public class JBIDE2119Test extends VpeTest { - private static final String IMPORT_PROJECT_NAME = "jsfTest"; - private static final String TEST_PAGE_NAME = "JBIDE/2119/JBIDE-2119.jsp"; + private static final String TEST_PAGE_NAME = "JBIDE/2119/JBIDE-2119.jsp"; //$NON-NLS-1$ /** * @param name @@ -50,14 +50,14 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); - assertNotNull("Could not open specified file " + file.getFullPath(), + assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$ file); IEditorInput input = new FileEditorInput(file); - assertNotNull("Editor input is null", input); + assertNotNull("Editor input is null", input); //$NON-NLS-1$ // open and get editor JSPMultiPageEditor part = openEditor(input); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -15,6 +15,7 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; @@ -26,7 +27,6 @@ */ public class JBIDE2219Test extends VpeTest { - private static final String TEST_PROJECT_NAME="jsfTest"; //$NON-NLS-1$ public JBIDE2219Test(String name) { super(name); @@ -40,7 +40,7 @@ // Tests CA // get test page path IFile file = (IFile) TestUtil.getComponentPath("JBIDE/2219/testJBIDE2219.xhtml", //$NON-NLS-1$ - TEST_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + "JBIDE/2219/testJBIDE2219.xhtml", file); //$NON-NLS-1$ //$NON-NLS-2$ IEditorInput input = new FileEditorInput(file); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2297Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2297Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2297Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -12,6 +12,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.eclipse.core.resources.IFile; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; @@ -23,8 +24,6 @@ */ public class JBIDE2297Test extends VpeTest{ - public static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME1 = "JBIDE/2297/JBIDE-2297.xhtml"; //$NON-NLS-1$ private static final String TEST_PAGE_NAME2 ="JBIDE/2297/limitedEntry.jsp"; //$NON-NLS-1$ @@ -34,10 +33,10 @@ } public void testJBIDE2297() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath(TEST_PAGE_NAME1,IMPORT_PROJECT_NAME)); + performTestForVpeComponent((IFile) TestUtil.getComponentPath(TEST_PAGE_NAME1,JsfAllTests.IMPORT_PROJECT_NAME)); } public void testJBIDE2297_jsp() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath(TEST_PAGE_NAME2,IMPORT_PROJECT_NAME)); + performTestForVpeComponent((IFile) TestUtil.getComponentPath(TEST_PAGE_NAME2,JsfAllTests.IMPORT_PROJECT_NAME)); } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -13,6 +13,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; @@ -25,8 +26,6 @@ */ public class JBIDE2434Test extends VpeTest{ - private static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ - public JBIDE2434Test(String name) { super(name); } @@ -35,7 +34,7 @@ * @throws Throwable */ public void testOpenAndCloPageWithCycleFacelets() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("JBIDE/2434/FaceletForm.xhtml",IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + performTestForVpeComponent((IFile) TestUtil.getComponentPath("JBIDE/2434/FaceletForm.xhtml",JsfAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } /** * Tests visual refresh method @@ -49,7 +48,7 @@ // Tests CA // get test page path IFile file = (IFile) TestUtil.getComponentPath("JBIDE/2434/FaceletBlank.xhtml", //$NON-NLS-1$ - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + "JBIDE/2434/FaceletBlank.xhtml", file); //$NON-NLS-1$ //$NON-NLS-2$ IEditorInput input = new FileEditorInput(file); 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 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -21,6 +21,7 @@ import org.eclipse.ui.progress.UIJob; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; 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; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; @@ -36,8 +37,6 @@ */ public class JBIDE675Test extends VpeTest { - private static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ - private static final String TEST_PAGE_NAME = "JBIDE/675/testChangeOnUserInputTextNode.xhtml"; //$NON-NLS-1$ @@ -59,7 +58,7 @@ // Tests CA // get test page path IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + TEST_PAGE_NAME, file); //$NON-NLS-1$ IEditorInput input = new FileEditorInput(file); @@ -120,8 +119,8 @@ // Tests CA // get test page path IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/testUserInputOnTag.xhtml", //$NON-NLS-1$ - IMPORT_PROJECT_NAME); - assertNotNull("Could not open specified file " + "JBIDE/675/testUserInputOnTag.xhtml", file); //$NON-NLS-1$ + JsfAllTests.IMPORT_PROJECT_NAME); + assertNotNull("Could not open specified file " + "JBIDE/675/testUserInputOnTag.xhtml", file); //$NON-NLS-1$ //$NON-NLS-2$ IEditorInput input = new FileEditorInput(file); @@ -179,7 +178,7 @@ // Tests CA // get test page path IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/testInsertTag.xhtml", //$NON-NLS-1$ - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + "JBIDE/675/testInsertTag.xhtml", file); //$NON-NLS-1$ //$NON-NLS-2$ IEditorInput input = new FileEditorInput(file); @@ -237,7 +236,7 @@ // Tests CA // get test page path IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/employee.xhtml", //$NON-NLS-1$ - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + "JBIDE/675/employee.xhtml", file); //$NON-NLS-1$ //$NON-NLS-2$ IEditorInput input = new FileEditorInput(file); @@ -285,7 +284,7 @@ // Tests CA // get test page path IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/employee.xhtml", //$NON-NLS-1$ - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + "JBIDE/675/employee.xhtml", file); //$NON-NLS-1$ //$NON-NLS-2$ IEditorInput input = new FileEditorInput(file); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -21,6 +21,7 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; @@ -34,8 +35,6 @@ */ public class JBIDE788Test extends VpeTest { - private static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ - private static final String CA_NAME = "org.eclipse.wst.html.HTML_DEFAULT"; //$NON-NLS-1$ public JBIDE788Test(String name) { @@ -254,7 +253,7 @@ String partOfString, int lineIndex, int linePosition,boolean isCheck) throws CoreException { // get test page path IFile file = (IFile) TestUtil.getComponentPath(testPagePath, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$ file); @@ -265,7 +264,7 @@ // open and get editor JSPMultiPageEditor part = openEditor(input); - int position = getLinePositionOffcet(part.getSourceEditor().getTextViewer(), lineIndex, linePosition); + int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), lineIndex, linePosition); // insert string part.getSourceEditor().getTextViewer().getTextWidget() @@ -314,46 +313,4 @@ TestUtil.delay(1000L); return results; } - /** - * Utility function which is used to calculate offcet in document by line number and character position - * - * @param textViewer - * @param lineIndex - * @param linePosition - * @return offcet in document - * @throws IllegalArgumentException - */ - private static final int getLinePositionOffcet(ITextViewer textViewer, int lineIndex, int linePosition) throws IllegalArgumentException { - - int resultOffcet = 0; - - if(textViewer==null) { - - throw new IllegalArgumentException("Text viewer shouldn't be a null"); //$NON-NLS-1$ - } - //lineIndex-1 becose calculating of line begibns in eclipse from one, but should be form zero - resultOffcet=textViewer.getTextWidget().getOffsetAtLine(lineIndex-1); - //here we get's tabs length - //for more example you can see code org.eclipse.ui.texteditor.AbstractTextEditor@getCursorPosition() and class $PositionLabelValue - int tabWidth = textViewer.getTextWidget().getTabs(); - int characterOffset=0; - String currentString = textViewer.getTextWidget().getLine(lineIndex-1); - int pos=1; - for (int i= 0; (i < currentString.length())&&(pos<linePosition); i++) { - if ('\t' == currentString.charAt(i)) { - - characterOffset += (tabWidth == 0 ? 0 : 1); - pos+=tabWidth; - }else{ - pos++; - characterOffset++; - } - } - resultOffcet+=characterOffset; - if(textViewer.getTextWidget().getLineAtOffset(resultOffcet)!=(lineIndex-1)) { - - throw new IllegalArgumentException("Incorrect character position in line"); //$NON-NLS-1$ - } - return resultOffcet; - } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -17,6 +17,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -48,8 +49,6 @@ // import project name - public static final String IMPORT_PROJECT_NAME = "jsfTest"; - public JsfJbide1467Test(String name) { super(name); } @@ -67,7 +66,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath( - "JBIDE/1467/JBIDE-1467.jsp", IMPORT_PROJECT_NAME); + "JBIDE/1467/JBIDE-1467.jsp", JsfAllTests.IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + file.getFullPath(), file); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -17,6 +17,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -54,7 +55,6 @@ */ public class JsfJbide1501Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; public JsfJbide1501Test(String name) { super(name); @@ -71,7 +71,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath( - "JBIDE/1501/JBIDE-1501_multiple.jsp", IMPORT_PROJECT_NAME); + "JBIDE/1501/JBIDE-1501_multiple.jsp", JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); @@ -126,7 +126,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath( - "JBIDE/1501/JBIDE-1501_size.jsp", IMPORT_PROJECT_NAME); + "JBIDE/1501/JBIDE-1501_size.jsp", JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1568Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1568Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1568Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -11,6 +11,7 @@ package org.jboss.tools.jsf.vpe.jsf.test.jbide; import org.eclipse.core.resources.IFile; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; @@ -22,20 +23,19 @@ */ public class JsfJbide1568Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME="jsfTest"; public JsfJbide1568Test(String name) { super(name); } public void testJBIDE1568Body() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("JBIDE/1568/JBIDE-1568-body.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + performTestForVpeComponent((IFile) TestUtil.getComponentPath("JBIDE/1568/JBIDE-1568-body.jsp",JsfAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testJBIDE1568RichFaces() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("JBIDE/1568/JBIDE-1568-richfaces.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + performTestForVpeComponent((IFile) TestUtil.getComponentPath("JBIDE/1568/JBIDE-1568-richfaces.jsp",JsfAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testJBIDE1568Seam() throws Throwable { - performTestForVpeComponent((IFile) TestUtil.getComponentPath("JBIDE/1568/JBIDE-1568-seam.xhtml",IMPORT_PROJECT_NAME)); // $NON-NLS-1$ + performTestForVpeComponent((IFile) TestUtil.getComponentPath("JBIDE/1568/JBIDE-1568-seam.xhtml",JsfAllTests.IMPORT_PROJECT_NAME));//$NON-NLS-1$ } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -17,6 +17,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -37,16 +38,14 @@ */ public class JsfJbide1718Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; + private static final String DIR_TEST_PAGE_NAME = "JBIDE/1718/JBIDE-1718-dir.jsp"; //$NON-NLS-1$ - private static final String DIR_TEST_PAGE_NAME = "JBIDE/1718/JBIDE-1718-dir.jsp"; + private static final String ESCAPE_TEST_PAGE_NAME = "JBIDE/1718/JBIDE-1718-escape.jsp"; //$NON-NLS-1$ - private static final String ESCAPE_TEST_PAGE_NAME = "JBIDE/1718/JBIDE-1718-escape.jsp"; + private static final String DISABLED_TEST_PAGE_NAME = "JBIDE/1718/JBIDE-1718-disabled.jsp"; //$NON-NLS-1$ - private static final String DISABLED_TEST_PAGE_NAME = "JBIDE/1718/JBIDE-1718-disabled.jsp"; + private static final String FORMAT_TEST_PAGE_NAME = "JBIDE/1718/JBIDE-1718-format.jsp"; //$NON-NLS-1$ - private static final String FORMAT_TEST_PAGE_NAME = "JBIDE/1718/JBIDE-1718-format.jsp"; - public JsfJbide1718Test(String name) { super(name); } @@ -64,7 +63,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(DIR_TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); @@ -151,7 +150,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(ESCAPE_TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); @@ -198,7 +197,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(DISABLED_TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); @@ -246,7 +245,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(FORMAT_TEST_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); @@ -292,7 +291,7 @@ nsIDOMNode text = children.item(i); - if ("paramValue".equals(text.getNodeValue())) { + if ("paramValue".equals(text.getNodeValue())) { //$NON-NLS-1$ isFind = true; break; } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.util.DocTypeUtil; import org.jboss.tools.vpe.ui.test.TestUtil; @@ -30,8 +31,6 @@ */ public class JsfJbide2170Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ - private static final String WITHOUT_DOCTYPE_TEST_PAGE_NAME = "JBIDE/2170/there_is_not_doctype.xhtml"; //$NON-NLS-1$ private static final String WITH_DOCTYPE_TEST_PAGE_NAME = "JBIDE/2170/there_is_doctype.xhtml"; //$NON-NLS-1$ @@ -59,7 +58,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath( - WITHOUT_DOCTYPE_TEST_PAGE_NAME, IMPORT_PROJECT_NAME); + WITHOUT_DOCTYPE_TEST_PAGE_NAME, JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); @@ -105,7 +104,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath( - WITH_DOCTYPE_TEST_PAGE_NAME, IMPORT_PROJECT_NAME); + WITH_DOCTYPE_TEST_PAGE_NAME, JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); @@ -150,7 +149,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath( - TEMPLATE_DOCTYPE_TEST_PAGE_NAME, IMPORT_PROJECT_NAME); + TEMPLATE_DOCTYPE_TEST_PAGE_NAME, JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); @@ -195,7 +194,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath( - COMPLEX_DOCTYPE_TEST_PAGE_NAME, IMPORT_PROJECT_NAME); + COMPLEX_DOCTYPE_TEST_PAGE_NAME, JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -26,6 +26,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; @@ -47,7 +48,6 @@ */ public class JsfJbide2362Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$ private static final String SELECTION_PAGE_NAME = "JBIDE/2362/selection.jsp"; //$NON-NLS-1$ private static final String EDITING_PAGE_NAME = "JBIDE/2362/editing.jsp"; //$NON-NLS-1$ @@ -86,7 +86,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(SELECTION_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); @@ -161,7 +161,7 @@ // get test page path IFile file = (IFile) TestUtil.getComponentPath(EDITING_PAGE_NAME, - IMPORT_PROJECT_NAME); + JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput input = new FileEditorInput(file); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -142,7 +142,6 @@ import org.jboss.tools.vpe.editor.util.DocTypeUtil; import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.jboss.tools.vpe.editor.util.VisualDomUtil; -import org.jboss.tools.vpe.editor.util.VpeDebugUtil; import org.jboss.tools.vpe.editor.util.VpeDndUtil; import org.jboss.tools.vpe.messages.VpeUIMessages; import org.jboss.tools.vpe.selbar.SelectionBar; @@ -3257,4 +3256,11 @@ } } + /** + * @return the visualSelectionController + */ + public VpeSelectionController getVisualSelectionController() { + return visualSelectionController; + } + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -977,7 +977,6 @@ public void removeNode(Node sourceNode) { //remove from cash should be called first - getPageContext().removeNodeFromVpeCash(sourceNode); domMapping.remove(sourceNode); getSourceNodes().remove(sourceNode); if (sourceNode instanceof INodeNotifier) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -67,9 +67,6 @@ WtpKbConnector connector; private nsIDOMNode currentVisualNode; - //Added by Max Areshkau to increase perfomance of VPE JBIDE-675 - private Map<Node,VpeCreationData> vpeCash; - public VpePageContext(VpeTemplateManager templateManager, BundleMap bundle, VpeEditorPart editPart) { this.bundle = bundle; this.editPart = editPart; @@ -117,8 +114,6 @@ public void clearAll() { bundleDependencySet.clear(); bundle.clearAll(); - //clean a cash nodes - clearVpeCash(); } public void dispose() { @@ -342,79 +337,6 @@ } /** - * Removes information about source node from vpe cash - * @param sourceNode - */ - public void removeNodeFromVpeCash(Node sourceNode) { - - getVpeCash().remove(sourceNode); - Node parentNode = sourceNode.getParentNode(); - //we should on change remove also parent nodes because information for - //this nodes doen't actual when we change child - while(parentNode!=null) { - getVpeCash().remove(parentNode); - parentNode=parentNode.getParentNode(); - } - } - /** - * Clears all information in cash - */ - public void clearVpeCash() { - - getVpeCash().clear(); - } - /** - * Checs is creation data exist in cash - * @param sourceNode - * @return true - if date exist - * false -otherwise - */ - public boolean isCreationDataExistInCash(Node sourceNode){ - -// Iterator<Node> keys = getVpeCash().keySet().iterator(); -// -// //Map.get() doesn't work correctly for this situation -//// while(keys.hasNext()){ -//// Node key= keys.next(); -//// if(sourceNode.isEqu alNode(key)) { -//// return true; -//// } -//// } -//// return false; - return getVpeCash().containsKey(sourceNode); - } - /** - * Inserts creation data into cash - * @param sourceNode - * @param creationData - */ - public void addCreationDataToCash(Node sourceNode,VpeCreationData creationData) { - //TODO Max Areshkau JBIDE-675 Adds data to cash, think about cloning creationData - getVpeCash().put(sourceNode, creationData); - } - /** - * Looks creates data in cash - * @param sourceNode - * @return returns creation data - */ - public VpeCreationData getVpeCreationDataFromCash(Node sourceNode) { - - return getVpeCash().get(sourceNode); - } - /** - * Return vpe Cash - * @return the vpeCash - */ - private Map<Node, VpeCreationData> getVpeCash() { - - if(vpeCash ==null) { - - vpeCash = new HashMap<Node, VpeCreationData>(); - } - return vpeCash; - } - - /** * Processes display events to prevent eclipse froze */ public void processDisplayEvents() { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeNodeMapping.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeNodeMapping.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeNodeMapping.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -14,12 +14,6 @@ import org.w3c.dom.Node; public class VpeNodeMapping { -// public static final int EMPTY_MAPPING = 0; -// public static final int TEXT_MAPPING = 1; -// public static final int ELEMENT_MAPPING = 2; -// public static final int COMMENT_MAPPING = 3; -// public static final int DOCUMENT_MAPPING = 4; - private Node sourceNode; private nsIDOMNode visualNode; @@ -28,23 +22,6 @@ this.visualNode = visualNode; } -// public int getType() { -// if (sourceNode != null) { -// switch (sourceNode.getNodeType()) { -// case Node.TEXT_NODE: -// return TEXT_MAPPING; -// case Node.ELEMENT_NODE: -// return ELEMENT_MAPPING; -// case Node.COMMENT_NODE: -// return COMMENT_MAPPING; -// case Node.DOCUMENT_NODE: -// return DOCUMENT_MAPPING; -// } -// return COMMENT_MAPPING; -// } -// return EMPTY_MAPPING; -// } - public Node getSourceNode() { return sourceNode; } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2008-08-04 17:41:38 UTC (rev 9501) @@ -17,7 +17,8 @@ org.jboss.tools.vpe.xulrunner, org.mozilla.xpcom, org.jboss.tools.jst.firstrun, - org.eclipse.wst.server.core + org.eclipse.wst.server.core, + org.eclipse.jface.text Eclipse-LazyStart: true Bundle-ClassPath: . Export-Package: org.jboss.tools.vpe.ui.test, Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-08-04 17:22:47 UTC (rev 9500) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-08-04 17:41:38 UTC (rev 9501) @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.ITextViewer; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.IOverwriteQuery; @@ -248,4 +249,46 @@ importBean.setImportProjectPath(resourcePath); return importBean; } + /** + * Utility function which is used to calculate offcet in document by line number and character position + * + * @param textViewer + * @param lineIndex + * @param linePosition + * @return offcet in document + * @throws IllegalArgumentException + */ + public static final int getLinePositionOffcet(ITextViewer textViewer, int lineIndex, int linePosition) throws IllegalArgumentException { + + int resultOffcet = 0; + + if(textViewer==null) { + + throw new IllegalArgumentException("Text viewer shouldn't be a null"); //$NON-NLS-1$ + } + //lineIndex-1 becose calculating of line begibns in eclipse from one, but should be form zero + resultOffcet=textViewer.getTextWidget().getOffsetAtLine(lineIndex-1); + //here we get's tabs length + //for more example you can see code org.eclipse.ui.texteditor.AbstractTextEditor@getCursorPosition() and class $PositionLabelValue + int tabWidth = textViewer.getTextWidget().getTabs(); + int characterOffset=0; + String currentString = textViewer.getTextWidget().getLine(lineIndex-1); + int pos=1; + for (int i= 0; (i < currentString.length())&&(pos<linePosition); i++) { + if ('\t' == currentString.charAt(i)) { + + characterOffset += (tabWidth == 0 ? 0 : 1); + pos+=tabWidth; + }else{ + pos++; + characterOffset++; + } + } + resultOffcet+=characterOffset; + if(textViewer.getTextWidget().getLineAtOffset(resultOffcet)!=(lineIndex-1)) { + + throw new IllegalArgumentException("Incorrect character position in line"); //$NON-NLS-1$ + } + return resultOffcet; + } }