[jbosstools-commits] JBoss Tools SVN: r22423 - in trunk/jst: tests/org.jboss.tools.jst.jsp.test/projects and 8 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri May 28 17:52:36 EDT 2010
Author: dgolovin
Date: 2010-05-28 17:52:35 -0400 (Fri, 28 May 2010)
New Revision: 22423
Removed:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForCompositeComponentTest/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForELinStyleTest/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1813Test/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTest/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Test/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForELinStyleTest.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForUnclosedELTest.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/OpenOnsTest.java
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/TestsWebArtefacts/
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebContentAssistProviderTest.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/browse/JBDS-1202 problems running tests
jst component tests fix:
- tests that requires jsf moved to jsf
- manifest errors fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -24,52 +24,63 @@
* @author Viacheslav Kabanovich
*/
public class LibraryScanner implements IFileScanner {
+
+ public static final String FILE_SYSTEMS_PATH = "FileSystems"; //$NON-NLS-1$
+ public static final String FILE_SYSTEM_JAR_PATH = "FileSystemJar"; //$NON-NLS-1$
+ public static final String META_INF_PATH = "META-INF"; //$NON-NLS-1$
+
+ public static final String JAR_SUFFIX = ".jar"; //$NON-NLS-1$
+ public static final String ZIP_SUFFIX = ".zip"; //$NON-NLS-1$
+
//Now it is absolute file on disk
IPath sourcePath = null;
public LibraryScanner() {}
public boolean isRelevant(IFile f) {
- if(EclipseResourceUtil.isJar(f.getName())) return true;
- return false;
+ String name = f.getName().toLowerCase();
+ return name.endsWith(JAR_SUFFIX) || name.endsWith(ZIP_SUFFIX);
}
public boolean isLikelyComponentSource(IFile f) {
XModel model = InnerModelHelper.createXModel(f.getProject());
- if(model == null) return false;
- XModelObject o = EclipseResourceUtil.getObjectByResource(model, f);
- if(o == null) return false;
- if(!o.getModelEntity().getName().equals("FileSystemJar")) { //$NON-NLS-1$
- ((FileSystemsImpl)o.getModel().getByPath("FileSystems")).updateOverlapped(); //$NON-NLS-1$
- o = EclipseResourceUtil.getObjectByResource(f);
- if(o == null || !o.getModelEntity().getName().equals("FileSystemJar")) return false; //$NON-NLS-1$
+ boolean result = false;
+ if(model != null) {
+ XModelObject o = EclipseResourceUtil.getObjectByResource(model, f);
+ if(o != null) {
+ if(o.getModelEntity().getName().equals(FILE_SYSTEM_JAR_PATH)) {
+ result = isLikelyComponentSource(o);
+ } else {
+ ((FileSystemsImpl)o.getModel().getByPath(FILE_SYSTEMS_PATH)).updateOverlapped();
+ o = EclipseResourceUtil.getObjectByResource(f);
+ result = o != null && o.getModelEntity().getName().equals(FILE_SYSTEM_JAR_PATH);
+ }
+ }
}
- return isLikelyComponentSource(o);
+ return result;
}
public LoadedDeclarations parse(IFile f, IKbProject sp) throws ScannerException {
XModel model = InnerModelHelper.createXModel(f.getProject());
- if(model == null) return null;
XModelObject o = EclipseResourceUtil.getObjectByResource(model, f);
- if(o == null) return null;
- if(!o.getModelEntity().getName().equals("FileSystemJar")) { //$NON-NLS-1$
- ((FileSystemsImpl)o.getModel().getByPath("FileSystems")).updateOverlapped(); //$NON-NLS-1$
+ if(!o.getModelEntity().getName().equals(FILE_SYSTEM_JAR_PATH)) {
+ ((FileSystemsImpl)o.getModel().getByPath(FILE_SYSTEMS_PATH)).updateOverlapped();
o = EclipseResourceUtil.getObjectByResource(f);
- if(o == null || !o.getModelEntity().getName().equals("FileSystemJar")) return null; //$NON-NLS-1$
+ if(o == null || !o.getModelEntity().getName().equals(FILE_SYSTEM_JAR_PATH)) return null;
}
return parse(o, f.getFullPath(), sp);
}
public boolean isLikelyComponentSource(XModelObject o) {
if(o == null) return false;
- if(o.getChildByPath("META-INF") != null) return true; //$NON-NLS-1$
+ if(o.getChildByPath(META_INF_PATH) != null) return true;
return false;
}
public LoadedDeclarations parse(XModelObject o, IPath path, IKbProject sp) throws ScannerException {
if(o == null) return null;
sourcePath = path;
- XModelObject metaInf = o.getChildByPath("META-INF"); //$NON-NLS-1$
+ XModelObject metaInf = o.getChildByPath(META_INF_PATH);
if(metaInf == null) return null;
LoadedDeclarations ds = new LoadedDeclarations();
@@ -107,9 +118,6 @@
XMLScanner s = new XMLScanner();
LoadedDeclarations ds1 = s.parse(tld, path, sp);
ds = add(ds, ds1);
- if(ds1 != null && !ds1.isEmpty()) {
- System.out.println(tld.getPath() + ":" + ds1.getLibraries().get(0).getURI());
- }
} else if(tld.getFileType() == XModelObject.FOLDER) {
LoadedDeclarations ds1 = parseInPackages(tld, path, sp);
ds = add(ds, ds1);
@@ -148,7 +156,7 @@
public static boolean isCompositeComponentFile(XModelObject o) {
if(o == null) return false;
String entity = o.getModelEntity().getName();
- if(entity.startsWith(JSF2ResourcesScanner.ENT_COMPOSITE_COMPONENT)) return true; //$NON-NLS-1$
+ if(entity.startsWith(JSF2ResourcesScanner.ENT_COMPOSITE_COMPONENT)) return true;
return false;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -52,6 +52,9 @@
public static final String ATTR_FUNC_NAME = "function-name"; //$NON-NLS-1$
public static final String ATTR_COMPONENT_TYPE = "component-type"; //$NON-NLS-1$
+ public static final String XML_SUFFIX = ".xml";
+ public static final String TLD_SUFFIX = ".tld";
+
public XMLScanner() {}
/**
@@ -61,9 +64,8 @@
* @return
*/
public boolean isRelevant(IFile resource) {
- if(resource.getName().endsWith(".xml")) return true; //$NON-NLS-1$
- if(resource.getName().endsWith(".tld")) return true; //$NON-NLS-1$
- return false;
+ String name = resource.getName().toLowerCase();
+ return name.endsWith(XML_SUFFIX) || name.endsWith(TLD_SUFFIX); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -3,45 +3,23 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.jst.jsp.test.ca.CAForCompositeComponentTest;
-import org.jboss.tools.jst.jsp.test.ca.CAForELinStyleTest;
-import org.jboss.tools.jst.jsp.test.ca.CAForIDTest;
-import org.jboss.tools.jst.jsp.test.ca.CAForUnclosedELTest;
import org.jboss.tools.jst.jsp.test.ca.Jbide1791Test;
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1704Test;
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1717Test;
-import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1807Test;
-import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1813Test;
-import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide2016Test;
-import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide2437Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test;
-import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1759Test;
-import org.jboss.tools.jst.jsp.test.ca.MissingKBBuilderTest;
-import org.jboss.tools.jst.jsp.test.ca.StrutsJspJbide1648Test;
public class JstJspAllTests {
public static Test suite() {
TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test");
- suite.addTestSuite(CAForUnclosedELTest.class);
- suite.addTestSuite(CAForCompositeComponentTest.class);
- suite.addTestSuite(MissingKBBuilderTest.class);
- suite.addTestSuite(JsfJspJbide1807Test.class);
- suite.addTestSuite(CAForIDTest.class);
- suite.addTestSuite(JsfJspJbide1813Test.class);
suite.addTestSuite(JstJspJbide1585Test.class);
- suite.addTestSuite(StrutsJspJbide1648Test.class);
suite.addTestSuite(JstJspJbide1641Test.class);
suite.addTestSuite(JsfJspJbide1704Test.class);
suite.addTestSuite(JsfJspJbide1717Test.class);
- suite.addTestSuite(JstJspJbide1759Test.class);
suite.addTestSuite(Jbide1791Test.class);
- suite.addTestSuite(JsfJspJbide2437Test.class);
suite.addTestSuite(JspPreferencesPageTest.class);
- suite.addTestSuite(JsfJspJbide2016Test.class);
- suite.addTestSuite(CAForELinStyleTest.class);
-
+
return suite;
}
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,47 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class CAForCompositeComponentTest extends ContentAssistantTestCase{
- TestProjectProvider provider = null;
- boolean makeCopy = true;
- private static final String PROJECT_NAME = "CAForCompositeComponentTest";
- private static final String PAGE_NAME = "/WebContent/pages/greeting.xhtml";
- private static final String TAG_NAME = "/WebContent/resources/sample/tag2.xhtml";
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testCAForCompositeComponent(){
- String[] proposals = {
- "sample:tag", "sample:tag2", "sample:tag3"
- };
-
- checkProposals(PAGE_NAME, "<sample:tag />", 8, proposals, false);
-
- proposals = new String[]{
- "aaa"
- };
- checkProposals(PAGE_NAME, "<sample:tag />", 12, proposals, false);
- }
-
- /**
- * JBIDE-5941
- */
- public void testCAForCCAttrs(){
- String[] proposals = {
- "cc.attrs.a2", "cc.attrs.b3", "cc.attrs.onclick"
- };
-
- checkProposals(TAG_NAME, "#{cc.attrs.}", 11, proposals, false);
-
- }
-}
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForELinStyleTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForELinStyleTest.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForELinStyleTest.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,29 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class CAForELinStyleTest extends ContentAssistantTestCase{
- TestProjectProvider provider = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "CAForELinStyleTest";
- private static final String PAGE_NAME = "/WebContent/pages/greeting.xhtml";
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testCAForELinStyleTest(){
- String[] proposals = {
- "person",
- };
-
- checkProposals(PAGE_NAME, "background-color:#{}", 19, proposals, false);
- }
-}
\ No newline at end of file
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,45 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class CAForIDTest extends ContentAssistantTestCase{
- TestProjectProvider provider = null;
- boolean makeCopy = true;
- private static final String PROJECT_NAME = "CAForIDTest";
- private static final String PAGE_NAME = "/WebContent/pages/inputUserName.jsp";
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testCAForIDTest(){
- String[] proposals = {
- "greetingForm",
- };
-
- checkProposals(PAGE_NAME, "<a4j:commandButton focus=\"\"/>", 26, proposals, false, false);
- }
-
- public void testCAForConverterIDTest(){
- String[] proposals = {
- "converter1",
- };
-
- checkProposals(PAGE_NAME, "<h:inputText value=\"#{user.name}\" required=\"true\" converter=\"\">", 61, proposals, false, false);
- }
-
- public void testCAForValidatorIDTest(){
- String[] proposals = {
- "validator1",
- };
-
- checkProposals(PAGE_NAME, "<f:validator validatorId=\"\" />", 26, proposals, false, false);
- }
-}
\ No newline at end of file
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForUnclosedELTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForUnclosedELTest.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForUnclosedELTest.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,30 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class CAForUnclosedELTest extends ContentAssistantTestCase{
- TestProjectProvider provider = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "CAForELinStyleTest";
- private static final String PAGE_NAME = "/WebContent/pages/greeting.xhtml";
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testCAForUnclosedELTest(){
- String[] proposals = {
- "person",
- };
-
- checkProposals(PAGE_NAME, "<ui:define name=\"pageTitle#{ \"", 30, proposals, false);
- checkProposals(PAGE_NAME, "<ui:define name=\"pageHeader\">Greeting Page#{ </ui:define>", 46, proposals, false);
- }
-}
\ No newline at end of file
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,35 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class JsfJspJbide1807Test extends ContentAssistantTestCase{
- TestProjectProvider provider = null;
- boolean makeCopy = true;
- private static final String PROJECT_NAME = "JsfJspJbide1807Test";
- private static final String PAGE_NAME = "/WebContent/pages/greeting.xhtml";
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testJsfJspJbide1807Test(){
-
- // JBIDE-4341: the EL proposals are not to be returned (and tested) here anymore.
- // - The EL-proposals are removed from the test-list.
- // - The "/pages" proposal is added as the main case to test
- String[] proposals={
- "/pages/",
- "/templates/",
- "#{}"
- };
-
- checkProposals(PAGE_NAME, "<input type=\"image\" src=\"", 25, proposals, true, true);
- }
-}
\ No newline at end of file
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,35 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class JsfJspJbide1813Test extends ContentAssistantTestCase{
- TestProjectProvider provider = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "JsfJspJbide1813Test";
- private static final String PAGE_NAME = "/WebContent/pages/greeting.xhtml";
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testJsfJspJbide1813Test(){
-
- // JBIDE-4341: the EL proposals are not to be returned (and tested) here anymore.
- // The EL-proposals are removed from the test-list.
- //
- String[] proposals={
- "ltr",
- "rtl",
- "#{}"
- };
-
- checkProposals(PAGE_NAME, "dir=\"\"", 5, proposals, true);
- }
-}
\ No newline at end of file
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,29 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class JsfJspJbide2016Test extends ContentAssistantTestCase{
- TestProjectProvider provider = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "JsfJbide2016Test";
- private static final String PAGE_NAME = "/WebContent/pages/greeting.jsp";
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testJsfJspJbide2016Test(){
- String[] proposals = {
- "user.name",
- };
-
- checkProposals(PAGE_NAME, "value=\"#{user.}\"", 14, proposals, false);
- }
-}
\ No newline at end of file
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,82 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.FindReplaceDocumentAdapter;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class JsfJspJbide2437Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
-
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "JsfJbide1704Test";
- private static final String PAGE_NAME = "/WebContent/pages/greeting1.xhtml";
-
- public static Test suite() {
- return new TestSuite(JsfJspJbide2437Test.class);
- }
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- provider.dispose();
- }
-
- public void testJsfJspJbide2437 () throws BadLocationException {
- openEditor(PAGE_NAME);
- JobUtils.waitForIdle();
- ICompletionProposal[] result= null;
- String errorMessage = null;
-
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0, "/templates/common.xhtml", true, true, false, false);
-
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, reg.getOffset(), contentAssistant);
- assertNotNull("Cannot obtain IContentAssistProcessor instance",p);
- result= p.computeCompletionProposals(viewer, reg.getOffset());
-
- boolean bELProposalsFound = false;
- boolean bTemplatePathProposalsFound = false;
- for (int k = 0; result != null && k < result.length &&
- (!bELProposalsFound || !bTemplatePathProposalsFound); k++) {
- if (result[k] instanceof AutoContentAssistantProposal) {
- AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)result[k];
-
- // Test the display string for the proposals - it has to shown the thmplate path beginning or EL-expression beginning
- // because the CA is started the calculation from the very beginning of the attribute value.
- String dispString = proposal.getDisplayString();
-
- assertFalse("The CA proposal returned NULL display string.", (dispString == null));
-
- if (dispString.startsWith("#{") || dispString.startsWith("${")) {
- bELProposalsFound = true;
- } else if (dispString.indexOf("/") != -1) {
- bTemplatePathProposalsFound = true;
- }
- }
- }
-
- // There should be proposals for template paths
- assertTrue("Content Assistant peturned no proposals for template paths.", bTemplatePathProposalsFound);
- // There should be proposals for EL-expresions
-
- // JBIDE-4341: JstJspAllTests/testJsfJspJbide1813Test failing with missing applicationScope in completions
- // Due to the current EL-prompting rules there is no EL-proposals allowed if there are no EL-starting char
- // sequence in the text. So, The following code line is commented out. This is the subject to rollback in the future.
- //
-// assertTrue("Content Assistant peturned no proposals for EL.", bELProposalsFound);
-
- closeEditor();
- }
-
-}
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,148 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
-/**
- * JBIDE-4341 JstJspAllTests/testJsfJspJbide1813Test failing with missing applicationScope in completions
- *
- * The #{ characters are added to INSERTION_BEGIN_STRING, but it is a subject to rollback in the future.
- * The current EL-prompting rules don't allow to call prompting on EL when there is no EL-starting
- * char sequence in the text. This doing this test to be completely useless.
- *
- * @author Jeremy
- *
- */
-public class JstJspJbide1759Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "JsfJbide1704Test";
- private static final String PAGE_NAME = "/WebContent/pages/greeting";
- private static final String[] PAGE_EXTS = {".jsp", ".xhtml"};
- private static final String INSERT_BEFORE_STRING = "<h:outputText";
- private static final String INSERTION_BEGIN_STRING = "<h:outputText value=\"#{";
- private static final String INSERTION_END_STRING = "\" />";
- private static final String WHITESPACE_INSERTION_STRING = "";
-
- public static Test suite() {
- return new TestSuite(JstJspJbide1759Test.class);
- }
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testJstJspJbide1759() {
- try {
- JobUtils.waitForIdle();
- } catch (Exception e) {
- e.printStackTrace();
- }
- assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
-
- for (int i = 0; i < PAGE_EXTS.length; i++) {
- testJstJspJbide1759(PAGE_NAME + PAGE_EXTS[i]);
- }
- }
-
- private void testJstJspJbide1759(String pageName) {
-
- openEditor(pageName);
-
- // Find start of <h:outputText> tag
- String documentContent = document.get();
- int start = (documentContent == null ? -1 : documentContent.indexOf(INSERT_BEFORE_STRING));
-
- assertTrue("Cannot find the starting point in the test file \"" + pageName + "\"", (start != -1));
-
- // First of all perform the test on a region placed in one space behind empty-valued attribute -
- // this is to return normal list of attribute names proposal list
-
- String documentContentModified = documentContent.substring(0, start) +
- INSERTION_BEGIN_STRING + WHITESPACE_INSERTION_STRING + INSERTION_END_STRING + documentContent.substring(start);
-
- int offsetToTest = start + INSERTION_BEGIN_STRING.length();
-
-
- jspTextEditor.setText(documentContentModified);
-
- ICompletionProposal[] result= null;
- String errorMessage = null;
-
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
- if (p != null) {
- try {
- result= p.computeCompletionProposals(viewer, offsetToTest);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- errorMessage= p.getErrorMessage();
- }
-
-
- List<String> customCompletionProposals = new ArrayList<String>();
- for (int i = 0; i < result.length; i++) {
- // There should be at least one proposal of type CustomCompletionProposal in the result
- if (result[i] instanceof CustomCompletionProposal) {
- customCompletionProposals.add(((CustomCompletionProposal)result[i]).getReplacementString());
- }
- }
- assertFalse("Content Assistant returned no proposals of type CustomCompletionProposal.",customCompletionProposals.isEmpty());
-
- try {
- JobUtils.waitForIdle();
- } catch (Exception e) {
- e.printStackTrace();
- assertTrue("Waiting for the jobs to complete has failed.", false);
- }
-
- // Next perform the test on a region placed in one space behind an attribute those value is a container
- // (contains JSF expression) - this has to return the same normal list of attribute names proposal list as
- // we got at the first step (because the tag is the same, but only the attribute value is changed)
-
- documentContentModified = documentContent.substring(0, start) +
- INSERTION_BEGIN_STRING + INSERTION_END_STRING + documentContent.substring(start);
-
- offsetToTest = start + INSERTION_BEGIN_STRING.length();
-
- jspTextEditor.setText(documentContentModified);
-
- p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
- if (p != null) {
- try {
- result= p.computeCompletionProposals(viewer, offsetToTest);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- errorMessage= p.getErrorMessage();
- }
-
- for (int i = 0; i < result.length; i++) {
- // There should be the same proposals as in the saved result
- if (result[i] instanceof CustomCompletionProposal) {
- assertTrue("Content Assistant returned additional proposal (proposal returned doesn't exist in the saved list).",
- customCompletionProposals.contains(((CustomCompletionProposal)result[i]).getReplacementString()));
- customCompletionProposals.remove(((CustomCompletionProposal)result[i]).getReplacementString());
- }
- }
- assertTrue("Content Assistant didn't return some of the required proposals.",customCompletionProposals.isEmpty());
-
- closeEditor();
- }
-}
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,61 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class MissingKBBuilderTest extends ContentAssistantTestCase{
- TestProjectProvider provider = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "MissingKBBuilderTest";
- private static final String PAGE_NAME = "/WebContent/pages/inputname.xhtml";
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testCAForIDTest(){
- String[] proposals = {
- "resources"
- };
-
- ICompletionProposal[] ps = checkProposals(PAGE_NAME, "<f:loadBundle basename=\"\" var=\"msg\" />", 24);
- System.out.println("-1->" + (ps == null ? 0 : ps.length));
- JobUtils.waitForIdle(2000);
- ps = checkProposals(PAGE_NAME, "<f:loadBundle basename=\"\" var=\"msg\" />", 24, proposals, false);
- System.out.println("-2->" + (ps == null ? 0 : ps.length));
- }
-
- protected ICompletionProposal[] checkProposals(String fileName, String substring, int offset){
- openEditor(fileName);
-
- int position = 0;
- if (substring != null) {
- String documentContent = document.get();
- position = documentContent.indexOf(substring);
- }
-
- ICompletionProposal[] result = null;
-
- IContentAssistProcessor p = TestUtil.getProcessor(viewer, position + offset, contentAssistant);
- if (p != null) {
- try {
- result = p.computeCompletionProposals(viewer, position + offset);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- }
-
- return result;
- }
-
-}
\ No newline at end of file
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,75 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class StrutsJspJbide1648Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "StrutsJbide1648Test";
- private static final String[] PAGE_NAMES = {
- "/WebContent/pages/a.jsp",
- "/WebContent/pages/a.xhtml"
- };
-
- public static Test suite() {
- return new TestSuite(StrutsJspJbide1648Test.class);
- }
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testStrutsJspJbide1648() {
- try {
- JobUtils.waitForIdle();
- } catch (Exception e) {
- e.printStackTrace();
- }
- assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
-
- for (int i = 0; i < PAGE_NAMES.length; i++) {
- doTestOnPage(PAGE_NAMES[i]);
- }
-
- }
-
- private void doTestOnPage(String pageName) {
- openEditor(pageName);
-
- ICompletionProposal[] result= null;
- String errorMessage = null;
-
- try {
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, 0, contentAssistant);
- if (p != null) {
- result= p.computeCompletionProposals(viewer, 0);
- errorMessage= p.getErrorMessage();
- }
-
- } catch (Throwable x) {
- x.printStackTrace();
- if (x instanceof NullPointerException) {
- assertTrue("Content Assistant failed with NullPointerException", false);
- } else {
- assertTrue("Content Assistant failed with exception: \n" + x.getLocalizedMessage(), false);
- }
- }
-
- closeEditor();
-
- }
-}
Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -7,16 +7,21 @@
public class JsfExtAllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for default package");
- //$JUnit-BEGIN$
-
- suite.addTest(new ProjectImportTestSetup(new TestSuite(OpenOnsTest.class),
- "org.jboss.tools.jst.text.ext.test",
- new String[]{"projects/HiperlinksTestProject"},
- new String[]{"HiperlinksTestProject"}));
+
+ // all tests were moved to jst.ui.test plugin
+ public void testJsfTextExt () {
- //$JUnit-END$
- return suite;
}
+// public static Test suite() {
+// TestSuite suite = new TestSuite("Test for default package");
+// //$JUnit-BEGIN$
+//
+// suite.addTest(new ProjectImportTestSetup(new TestSuite(OpenOnsTest.class),
+// "org.jboss.tools.jst.text.ext.test",
+// new String[]{"projects/HiperlinksTestProject"},
+// new String[]{"HiperlinksTestProject"}));
+//
+// //$JUnit-END$
+// return suite;
+// }
}
Deleted: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/OpenOnsTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/OpenOnsTest.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/OpenOnsTest.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,575 +0,0 @@
-package org.jboss.tools.jst.text.ext.test;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.FindReplaceDocumentAdapter;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.EditorPart;
-import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
-import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor;
-import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.WorkbenchUtils;
-
-public class OpenOnsTest extends TestCase {
-
- public static final String OPENON_TEST_PROJECT = "HiperlinksTestProject";
-
-
- public IProject project = null;
-
- protected void setUp() {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- OPENON_TEST_PROJECT);
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
- JobUtils.waitForIdle();
- IWorkbench workbench = PlatformUI.getWorkbench();
- }
-
- protected void tearDown() {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
- }
-
- public OpenOnsTest() {
- super("styleClass OpenOn tests");
- }
-
- public static final String WEB_XML_FILE_PATH = OPENON_TEST_PROJECT+"/WebContent/WEB-INF/web.xml";
-
- public void testFilterNameOpenOn() throws PartInitException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(WEB_XML_FILE_PATH);
- editor = ((EditorPartWrapper)editor).getEditor();
- JobUtils.waitForIdle();
- DefaultMultipageEditor xmlMultyPageEditor = (DefaultMultipageEditor) editor;
- xmlMultyPageEditor.selectPageByName("Source");
- ISourceViewer viewer = xmlMultyPageEditor.getSourceEditor().getTextViewer();
-
- IDocument document = viewer.getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- "Filter1", true, true, false, false);
- reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset()+reg.getLength()+1,
- "Filter1", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
- assertEquals("<filter-name>", selection.getText());
- }
-
- public void testRoleNameOpenOn() throws PartInitException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(WEB_XML_FILE_PATH);
- editor = ((EditorPartWrapper)editor).getEditor();
- JobUtils.waitForIdle();
- DefaultMultipageEditor xmlMultyPageEditor = (DefaultMultipageEditor) editor;
- xmlMultyPageEditor.selectPageByName("Source");
- ISourceViewer viewer = xmlMultyPageEditor.getSourceEditor().getTextViewer();
-
- IDocument document = viewer.getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- "Designer", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
- assertEquals("<role-name>", selection.getText());
- }
-
- public void testServletNameOpenOn() throws PartInitException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(WEB_XML_FILE_PATH);
- editor = ((EditorPartWrapper)editor).getEditor();
- JobUtils.waitForIdle();
- DefaultMultipageEditor xmlMultyPageEditor = (DefaultMultipageEditor) editor;
- xmlMultyPageEditor.selectPageByName("Source");
- ISourceViewer viewer = xmlMultyPageEditor.getSourceEditor().getTextViewer();
-
- IDocument document = viewer.getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- "Faces Servlet", true, true, false, false);
- reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset()+reg.getLength()+1,
- "Faces Servlet", true, true, false, false);
- reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset()+reg.getLength()+1,
- "Faces Servlet", true, true, false, false);
- reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset()+reg.getLength()+1,
- "Faces Servlet", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
- assertEquals("<servlet-name>", selection.getText());
- }
-
- public static final String TAGLIB_URI_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/tldUriHyperlinkTests.jsp";
-
- public void testTaglibUriFromJarOpenOn() throws BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(TAGLIB_URI_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
- IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- "jsf/core", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- System.out.println(fileName);
- assertTrue("jsf_core.tld".equals(fileName));
- }
- public static final String TAGLIB_URI_JSP_ROOT_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/jspTagsHyperlinkTests.jsp";
-
- public void testTaglibUriFromJarinJspRootOpenOn() throws BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(TAGLIB_URI_JSP_ROOT_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
- IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- "jsf/core", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
-
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- System.out.println(fileName);
- assertTrue("jsf_core.tld".equals(fileName));
- }
-
- public static final String STYLE_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/styleHyperlinkTests.jsp";
- public static final String CSS1_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/stylesheet/style1.css";
- public static final String CSS2_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/stylesheet/style2.css";
-
- public void testStylesheetOpenOn() throws BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(STYLE_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
- IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- "stylesheet/style1.css", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- assertTrue("style1.css".equals(fileName));
- }
-
- public void testStyleClassOpenOns() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(STYLE_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JobUtils.waitForIdle();
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
- IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument();
- IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- "style-class9\"", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- assertTrue("styleHyperlinkTests.jsp".equals(fileName));
-
- reg = new FindReplaceDocumentAdapter(document).find(0,
- "style-class3", true, true, false, false);
- links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- fileName = editor.getEditorInput().getName();
- assertTrue("style1.css".equals(fileName));
-
- reg = new FindReplaceDocumentAdapter(document).find(0,
- "style-class6", true, true, false, false);
- links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- links[0].open();
- JobUtils.waitForIdle();
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- fileName = editor.getEditorInput().getName();
- assertTrue("style2.css".equals(fileName));
- }
-
- public static final String CLASS_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/classHyperlinkTests.jsp";
- public static final String CLASS1_TEST_FILE = OPENON_TEST_PROJECT + "/JavaSource/org/jboss/test/ChangeListenerInstance.java";
-
- public void testClassNameOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(CLASS_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "org.jboss.tools.test.ChangeListenerInstance", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- assertTrue("ChangeListenerInstance.java".equals(fileName));
- }
-
- public void testTaglibTagNameOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(CLASS_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "view", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- System.out.println(links[0].getClass().getName());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- assertTrue("jsf_core.tld".equals(fileName));
- }
-
- public static final String USE_BEAN_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/beanHyperlinkTests.jsp";
-
- public void testUseBeanClassOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(USE_BEAN_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "b1", true, true, false, false);
- reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(reg.getOffset()+reg.getLength(),
- "b1", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
- assertEquals("<jsp:useBean id=\"b1\" class=\"org.jboss.tools.test.TestBean1\">", selection.getText());
-
- reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "org.jboss.tools.test.TestBean1", true, true, false, false);
- links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- String fileName = editor.getEditorInput().getName();
- assertTrue("TestBean1.java".equals(fileName));
- }
-
- public void testGetBeanPropertyOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(USE_BEAN_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "property1", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
-
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- String fileName = editor.getEditorInput().getName();
- assertTrue("TestBean1.java".equals(fileName));
- }
-
- public void testSetBeanPropertyOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(USE_BEAN_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "property2", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
-
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- String fileName = editor.getEditorInput().getName();
- assertTrue("TestBean1.java".equals(fileName));
- }
-
- public static final String FORWARD_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/forwardHiperlinkTests.jsp";
-
-
- public void testJspForwardOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(FORWARD_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(viewer.getDocument()).find(0,
- "forward/forwardHiperlinkPage2Tests.jsp", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- assertTrue("forwardHiperlinkPage2Tests.jsp".equals(fileName));
-
- reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "forwardHiperlinkPage1Tests.jsp", true, true, false, false);
- links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
-
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- fileName = editor.getEditorInput().getName();
- assertTrue("forwardHiperlinkPage1Tests.jsp".equals(fileName));
- }
-
- public static final String INCLUDE_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/includeHiperlinkTests.jsp";
-
-
- public void testJspIncludeOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(INCLUDE_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "include/includeHiperlinkPage2Tests.jsp", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- assertTrue("includeHiperlinkPage2Tests.jsp".equals(fileName));
-
- reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "includeHiperlinkPage1Tests.jsp", true, true, false, false);
- links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- fileName = editor.getEditorInput().getName();
- assertTrue("includeHiperlinkPage1Tests.jsp".equals(fileName));
- }
-
- public static final String FACELETS_XHTML_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/faceletsHiperlinkTests.xhtml";
-
-
- public void testJspXmlElementNameOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(FACELETS_XHTML_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "message", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- assertTrue("html_basic.tld".equals(fileName));
- }
-
- public static final String JSP_XMLNS_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/jspXmlFormatTests.jsp";
-
-
- public void testJspXmlnsNameOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(FACELETS_XHTML_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "http://java.sun.com/jsf/html", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- assertTrue("html_basic.tld".equals(fileName));
- }
-
- public static final String TLD_ATTRIBUTE_NAME_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/WEB-INF/tldAttributeNameOpenOnTests.tld";
-
- public void testTldAttributeNameOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(TLD_ATTRIBUTE_NAME_TEST_FILE);
- assertTrue(editor instanceof DefaultMultipageEditor);
- DefaultMultipageEditor tldEditor = (DefaultMultipageEditor) editor;
- tldEditor.selectPageByName("Source");
- ISourceViewer viewer = tldEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(tldEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "attr1", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
- assertEquals("<name>", selection.getText());
- }
-
- public static final String FACELET_TAGLIB_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/WEB-INF/faceletTaglibOpenOnTests.taglib.xml";
-
- public void testFaceletTaglibTypeOpenOn() throws CoreException, BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(FACELET_TAGLIB_TEST_FILE);
- editor = ((EditorPartWrapper)editor).getEditor();
- JobUtils.waitForIdle();
- DefaultMultipageEditor faceletEditor = (DefaultMultipageEditor) editor;
- faceletEditor.selectPageByName("Source");
- ISourceViewer viewer = faceletEditor.getSourceEditor().getTextViewer();
-
- // find a region that matches <type>java.lang.String</type>
- IRegion reg = new FindReplaceDocumentAdapter(faceletEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "java.lang.String", true, true, false, false);
-
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length != 0);
-
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- String title = editor.getTitle();
- assertTrue("java.lang.String declaration should be opened, but \'" + title + "\' is actially openned in active editor",
- title.startsWith("String."));
- }
-
- public static final String XHTML_STYLE_CLASS_NAME_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/xhtmlStyleClassHiperlinkTests.xhtml";
-
-
- public void testFacletsStyleClassOpenOnJbide2890() throws BadLocationException {
- IEditorPart editor = WorkbenchUtils.openEditor(XHTML_STYLE_CLASS_NAME_TEST_FILE);
- assertTrue(editor instanceof JSPMultiPageEditor);
- JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
- ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-
- IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
- "style-class1", true, true, false, false);
- IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
- assertNotNull(links);
- assertTrue(links.length!=0);
- //assertNotNull(links[0].getHyperlinkText());
- assertNotNull(links[0].toString());
- links[0].open();
- JobUtils.waitForIdle();
- editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
- String fileName = editor.getEditorInput().getName();
- assertTrue("style1.css".equals(fileName));
- }
-}
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -17,7 +17,7 @@
public static Test suite() {
TestSuite suite = new TestSuite(JstWebAllTests.class.getName());
- suite.addTest(WebContentAssistProviderTest.suite());
+ suite.addTestSuite(WebContentAssistProviderTest.class);
return suite;
}
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebContentAssistProviderTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebContentAssistProviderTest.java 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebContentAssistProviderTest.java 2010-05-28 21:52:35 UTC (rev 22423)
@@ -27,63 +27,15 @@
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.TestProjectProvider;
-
+/**
+ * Tests were moved to jsf.test plugin to fix tycho junit test errors
+ * @author eskimo
+ *
+ */
public class WebContentAssistProviderTest extends TestCase {
- TestProjectProvider provider = null;
- IProject project = null;
- boolean makeCopy = true;
- XModel projectModel;
- WebPromptingProvider webPromptingProvider;
-
- public static Test suite() {
- return new TestSuite(WebContentAssistProviderTest.class);
- }
-
- public void testTlds() {
- // Wait all the builders to finish
- JobUtils.waitForIdle(2000);
-
- List tldList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_GET_TAGLIBS, "", null);
- assertTrue("TLD list does not contain expected TLD in XModel.", tldList.contains("http://jboss.com/products/seam/taglib"));
- }
-
- public void testJsfBeanPropertyList() {
- // seam beans list
- List beanList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BEAN_PROPERTIES, "facesManagedBean", new Properties());
- assertTrue("Bean property list does not contain Managed bean property in XModel.", beanList.contains("property1"));
- }
-
- public void testBundles() {
- // bundle name list
- List bundleList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLES, "", null);
- assertTrue("Bundle name list does not contain expected name in XModel.", bundleList.contains("org.jboss.seam.example.numberguess.test"));
- // bundle property list
- List bundlePropertyList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLE_PROPERTIES, "org.jboss.seam.example.numberguess.test", null);
- assertTrue("Bundle property list does not contain expected property in XModel.", bundlePropertyList.contains("bundleProperty1"));
- }
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.web.test", null, "TestsWebArtefacts", makeCopy);
- project = provider.getProject();
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- project.build(IncrementalProjectBuilder.FULL_BUILD,null);
- XModelObject xmo = EclipseResourceUtil.getObjectByResource(project);
- assertNotNull("Can't get XModel Object for test project.", xmo);
- projectModel = xmo.getModel();
- Watcher.getInstance(projectModel).forceUpdate();
- projectModel.update();
- assertNotNull("Can't get XModel for test project.", projectModel);
-
- // Wait all the builders to finish
- JobUtils.waitForIdle(2000);
+ public void testJstComponentRelatedFunctionality() {
- webPromptingProvider = WebPromptingProvider.getInstance();
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.jdt.core.prefs 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.jdt.core.prefs 2010-05-28 21:52:35 UTC (rev 22423)
@@ -1,4 +1,4 @@
-#Mon Aug 31 15:12:26 CEST 2009
+#Fri May 28 11:59:32 PDT 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF 2010-05-28 20:44:53 UTC (rev 22422)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF 2010-05-28 21:52:35 UTC (rev 22423)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: WebService SWTBot Tests
Bundle-SymbolicName: org.jboss.tools.ws.ui.bot.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.jboss.tools.ui.bot.ext.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
More information about the jbosstools-commits
mailing list