Author: yradtsevich
Date: 2010-02-23 13:03:26 -0500 (Tue, 23 Feb 2010)
New Revision: 20449
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java
Removed:
trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportBean.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java
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/JBIDE4213Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlTestPlugin.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java
trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd
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/VpeAllTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5837
Make possible to run VPE JUnit tests one by one
- testProject element was added to the vpe.tests extension point (this is the new way to
declare necessary projects now).
- ProjectsLoader created. Now it is used to access all test projects.
- All references to the ImportBean (the old way) were removed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml 2010-02-23 17:54:07
UTC (rev 20448)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/plugin.xml 2010-02-23 18:03:26
UTC (rev 20449)
@@ -2,6 +2,9 @@
<extension
point="org.jboss.tools.vpe.ui.tests">
<tests
testSuite="org.jboss.tools.jsf.vpe.ajax4jsf.test.Ajax4JsfAllTests"
name="Tests For Ajax For JSF Components"/>
+ <testProject
+ name="ajax4jsfTests"
+ path="resources/ajax4jsfTests"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,10 +10,6 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.ajax4jsf.test;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
import junit.framework.Test;
@@ -26,14 +22,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("Tests for Vpe Ajax For JSF components");
//$NON-NLS-1$
suite.addTestSuite(Ajax4JsfComponentContentTest.class);
- List<ImportBean> projectToImport = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(Ajax4JsfAllTests.IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(Ajax4JsfTestPlugin.
- getPluginResourcePath());
- projectToImport.add(importBean);
-
- return new VpeTestSetup(suite, projectToImport);
-
+
+ return new VpeTestSetup(suite);
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml 2010-02-23 17:54:07
UTC (rev 20448)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/plugin.xml 2010-02-23 18:03:26
UTC (rev 20449)
@@ -8,6 +8,10 @@
name="Facelets Tests"
testSuite="org.jboss.tools.jsf.vpe.facelets.test.FaceletsAllTests">
</tests>
+ <testProject
+ name="faceletsTest"
+ path="resources/faceletsTest">
+ </testProject>
</extension>
</plugin>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,14 +10,10 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.facelets.test;
-import java.util.ArrayList;
-import java.util.List;
-
import junit.framework.Test;
import junit.framework.TestSuite;
import org.jboss.tools.jsf.vpe.facelets.test.jbide.JBIDE3416Test;
-import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
public class FaceletsAllTests {
@@ -26,21 +22,14 @@
public static final String IMPORT_PROJECT_NAME = "faceletsTest";
//$NON-NLS-1$
public static Test suite() {
-
- TestSuite suite = new TestSuite("Tests for Vpe Facelets components");
- // $JUnit-BEGIN$
-
- suite.addTestSuite(FaceletsComponentTest.class);
- suite.addTestSuite(JBIDE3416Test.class);
- suite.addTestSuite(FaceletsComponentContentTest.class);
-
- // $JUnit-END$
- List<ImportBean> importProjects = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(FaceletsTestPlugin.getPluginResourcePath());
- importProjects.add(importBean);
- return new VpeTestSetup(suite,importProjects);
-
+ TestSuite suite = new TestSuite("Tests for Vpe Facelets components");
+ // $JUnit-BEGIN$
+
+ suite.addTestSuite(FaceletsComponentTest.class);
+ suite.addTestSuite(JBIDE3416Test.class);
+ suite.addTestSuite(FaceletsComponentContentTest.class);
+
+ // $JUnit-END$
+ return new VpeTestSetup(suite);
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml 2010-02-23 17:54:07 UTC
(rev 20448)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/plugin.xml 2010-02-23 18:03:26 UTC
(rev 20449)
@@ -4,9 +4,32 @@
<extension
point="org.jboss.tools.vpe.ui.tests">
<tests
- name="JSf Tests"
- testSuite="org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests">
- </tests>
+ name="JsfAllTests"
+ testSuite="org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests"/>
+ <testProject
+ name="jsfTest"
+ path="resources/jsfTest"/>
+ <testProject
+ name="jsf2test"
+ path="resources/jsf2test"/>
+ <testProject
+ name="customFaceletsTestProject"
+ path="resources/customFaceletsTestProject"/>
+ <testProject
+ name="JBIDE3247"
+ path="resources/JBIDE3247"/>
+ <testProject
+ name="i18nTest"
+ path="resources/i18nTest"/>
+ <testProject
+ name="naturesCheckTest"
+ path="resources/naturesCheckTest"/>
+ <testProject
+ name="jsfLocales"
+ path="resources/jsfLocales"/>
+ <testProject
+ name="JBIDE5460TestProject"
+ path="resources/JBIDE5460TestProject"/>
</extension>
</plugin>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -95,13 +95,4 @@
protected String getTestProjectName() {
return JsfAllTests.IMPORT_JSF_20_PROJECT_NAME;
}
-
- @Override
- protected void setUp() throws Exception {
- if(!ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME).isAccessible())
{
- ResourcesUtils.importProjectIntoWorkspace((JsfTestPlugin.getPluginResourcePath()
- +
File.separator+JsfAllTests.IMPORT_JSF_20_PROJECT_NAME),JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
- }
- }
-
}
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 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,9 +10,6 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test;
-import java.util.ArrayList;
-import java.util.List;
-
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -61,7 +58,6 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3632Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3650Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3734Test;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.EditingSPecialSymbolsVPE_JBIDE3810;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3969Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4037Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4179Test;
@@ -70,35 +66,34 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4509Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4510Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4534Test;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.MessageResolutionInPreviewTabTest;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.NaturesChecker_JBIDE5701;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.RefreshBundles_JBIDE5460;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218;
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.JBIDE924Test;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.MozDirtyTest_JBIDE5105;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.NullPointerWithStyleProperty_JBIDE5193;
-import
org.jboss.tools.jsf.vpe.jsf.test.jbide.TestForUsingComponentsLibrariesWithDefaultNamespace;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestOpenOnForXhtmlFiles_JBIDE5577;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.VpeI18nTest_JBIDE4887;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1568Test;
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.jbide.MessageResolutionInPreviewTabTest;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.MozDirtyTest_JBIDE5105;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.NaturesChecker_JBIDE5701;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.NullPointerWithStyleProperty_JBIDE5193;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnCssClassTest_JBIDE4775;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInsideJspRoot_JBIDE4852;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.RefreshBundles_JBIDE5460;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectAllAndCut_JBIDE4853;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectWholeElement_JBIDE4713;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218;
+import
org.jboss.tools.jsf.vpe.jsf.test.jbide.TestForUsingComponentsLibrariesWithDefaultNamespace;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestOpenOnForXhtmlFiles_JBIDE5577;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.VPERefreshTest;
-import org.jboss.tools.tests.ImportBean;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.VpeI18nTest_JBIDE4887;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
/**
@@ -118,7 +113,7 @@
public static final String IMPORT_NATURES_CHECKER_PROJECT =
"naturesCheckTest"; //$NON-NLS-1$
public static final String IMPORT_JSF_LOCALES_PROJECT_NAME = "jsfLocales";
//$NON-NLS-1$
public static final String IMPORT_JBIDE5460_PROJECT_NAME =
"JBIDE5460TestProject"; //$NON-NLS-1$
-
+
public static Test suite() {
TestSuite suite = new TestSuite("Tests for Vpe Jsf components");
//$NON-NLS-1$
@@ -209,51 +204,8 @@
suite.addTestSuite(NaturesChecker_JBIDE5701.class);
suite.addTestSuite(FacetProcessingTest.class);
suite.addTestSuite(RefreshBundles_JBIDE5460.class);
-
- // $JUnit-END$
- // added by Max Areshkau
- // add here projects which should be imported for junit tests
- List<ImportBean> projectToImport = new ArrayList<ImportBean>();
- ImportBean importBeanJsf1 = new ImportBean();
- importBeanJsf1.setImportProjectName(JsfAllTests.IMPORT_PROJECT_NAME);
- importBeanJsf1.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(importBeanJsf1);
-
- ImportBean importBeanJBIDE5460 = new ImportBean();
- importBeanJBIDE5460.setImportProjectName(JsfAllTests.IMPORT_JBIDE5460_PROJECT_NAME);
- importBeanJBIDE5460.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(importBeanJBIDE5460);
-
- ImportBean importBeanJsf20 = new ImportBean();
- importBeanJsf20.setImportProjectName(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
- importBeanJsf20.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(importBeanJsf20);
- ImportBean customFaceletsTestProject = new ImportBean();
- customFaceletsTestProject.setImportProjectName(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
- customFaceletsTestProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(customFaceletsTestProject);
-
- ImportBean jbide3247TestProject = new ImportBean();
- jbide3247TestProject.setImportProjectName(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
- jbide3247TestProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(jbide3247TestProject);
-
- ImportBean i18nTestProject = new ImportBean();
- i18nTestProject.setImportProjectName(JsfAllTests.IMPORT_I18N_PROJECT_NAME);
- i18nTestProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(i18nTestProject);
-
- ImportBean naturesCheckTestProject = new ImportBean();
- naturesCheckTestProject.setImportProjectName(JsfAllTests.IMPORT_NATURES_CHECKER_PROJECT);
- naturesCheckTestProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(naturesCheckTestProject);
-
- ImportBean jsfLocalesProject = new ImportBean();
- jsfLocalesProject.setImportProjectName(JsfAllTests.IMPORT_JSF_LOCALES_PROJECT_NAME);
- jsfLocalesProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(jsfLocalesProject);
-
- return new VpeTestSetup(suite, projectToImport);
+ // $JUnit-END$
+ return new VpeTestSetup(suite);
}
}
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4213Test.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,21 +10,16 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
import org.jboss.tools.jst.web.project.WebProject;
import org.jboss.tools.jst.web.tld.ITaglibMapping;
import org.jboss.tools.jst.web.tld.TaglibMapping;
+import org.jboss.tools.vpe.ui.test.ProjectsLoader;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
@@ -45,7 +40,8 @@
TestUtil.waitForJobs();
setException(null);
- IProject project =
ResourcesPlugin.getWorkspace().getRoot().getProject("customFaceletsTestProject");
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
assertNotNull(project);
IModelNature nature = EclipseResourceUtil.getModelNature(project);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,13 +10,9 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
-import java.lang.reflect.Method;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -24,10 +20,6 @@
import org.eclipse.jdt.internal.core.JarEntryFile;
import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -36,14 +28,9 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.ui.test.OpenOnUtil;
+import org.jboss.tools.vpe.ui.test.ProjectsLoader;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
@@ -58,8 +45,8 @@
}
//tests openOn from taglib
public void testOpenOnTaglibDefinitionFile() throws Throwable {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
IFile file = (IFile)
project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 12, 17,
"paginator.xhtml"); //$NON-NLS-1$
@@ -79,8 +66,8 @@
//test for <function-class>
public void testJBIDE4638OpenOnForFunctionClass() throws Throwable{
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
IFile file = (IFile)
project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 31, 37,
"FaceletFunctions.java"); //$NON-NLS-1$
@@ -88,31 +75,32 @@
//test for <function-class>
public void testJBIDE4638OpenOnForLibraryClass() throws Throwable{
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
IFile file = (IFile)
project.findMember("WebContent/WEB-INF/test.taglib.xml"); //$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 6, 25,
"CoreLibrary.java"); //$NON-NLS-1$
}
//test for <function-class>
public void testJBIDE4638OpenOnForHandlerClass() throws Throwable{
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
IFile file = (IFile)
project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 22, 23,
"IfHandler.java"); //$NON-NLS-1$
}
//test for <handler-class> in tag
public void testJBIDE4638OpenOnForHandlerClassWithTagAxis() throws Throwable{
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
IFile file = (IFile)
project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 36, 29,
"IfHandler.java"); //$NON-NLS-1$
}
//test for
https://jira.jboss.org/jira/browse/JBIDE-4635
public void testJBIDE4635OpenOn() throws Throwable{
- IProject project =
ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
IFile file = (IFile) project.findMember("WebContent/pages/index.xhtml");
//$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
OpenOnUtil.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 11, 11,
"mareshkau.taglib.xml"); //$NON-NLS-1$
@@ -124,7 +112,8 @@
//test for
https://jira.jboss.org/jira/browse/JBIDE-5099
public void testJBIDE5099OpenOn() throws Throwable{
- IProject project =
ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
IFile file = (IFile)
project.findMember("WebContent/pages/JBIDE/5015/login.xhtml"); //$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
@@ -133,7 +122,8 @@
//test for
https://jira.jboss.org/jira/browse/JBIDE-5099
public void testJBIDE5099JarOpenOn() throws Throwable{
- IProject project =
ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
IFile file = (IFile)
project.findMember("WebContent/pages/JBIDE/5015/login.xhtml"); //$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
@@ -154,8 +144,8 @@
@SuppressWarnings("restriction")
private static final void checkOpenOnFromJarFile(final String jarFilePath,final String
jarEntryPath,
final int line, final int position,final String expectedResult) throws Throwable {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
IJavaProject javaProject = JavaCore.create(project);
IFile jarArchive = (IFile) project.findMember(jarFilePath);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4510Test.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -24,6 +24,7 @@
import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.ui.test.ProjectsLoader;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
import org.mozilla.interfaces.nsIDOMDocument;
@@ -41,8 +42,8 @@
}
public void testCorrectDoctypeOnFileFromJarArchive() throws Throwable {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
/*
* Project should exist in the workspace
*/
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -28,6 +28,7 @@
import org.jboss.tools.jst.web.project.WebProject;
import org.jboss.tools.jst.web.tld.TaglibMapping;
import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.ui.test.ProjectsLoader;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
@@ -47,8 +48,8 @@
protected void setUp() throws Exception {
super.setUp();
setVpeController(null);
- this.project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
+ this.project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
this.nonUIJob = new Job("Revalidate Taglibs Test Job name"){ //$NON-NLS-1$
@SuppressWarnings("synthetic-access")
@Override
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnInJarPackageFragment_JBIDE5682.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -26,6 +26,7 @@
import org.eclipse.ui.editors.text.EditorsUI;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.vpe.ui.test.OpenOnUtil;
+import org.jboss.tools.vpe.ui.test.ProjectsLoader;
import org.jboss.tools.vpe.ui.test.VpeTest;
/**
@@ -47,8 +48,8 @@
}
public void testOpenOnInJarPackageFragment() throws Throwable {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
IJavaProject javaProject = JavaCore.create(project);
IPackageFragmentRoot fragmentRoot = javaProject
.getPackageFragmentRoot(javaProject.getPath().toString() + "/"
//$NON-NLS-1$
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnTLDPackedInJar_JBIDE5693.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -27,6 +27,7 @@
import org.eclipse.ui.editors.text.EditorsUI;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.vpe.ui.test.OpenOnUtil;
+import org.jboss.tools.vpe.ui.test.ProjectsLoader;
import org.jboss.tools.vpe.ui.test.VpeTest;
/**
@@ -47,8 +48,8 @@
}
public void testOpenOnTLDPackedInJar() throws Throwable{
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+ IProject project = ProjectsLoader.getInstance()
+ .getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
IJavaProject javaProject = JavaCore.create(project);
IPackageFragmentRoot fragmentRoot = javaProject
.getPackageFragmentRoot(""+project.getLocation() + "/"
//$NON-NLS-1$ //$NON-NLS-2$
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -31,14 +31,15 @@
public class RefreshBundles_JBIDE5460 extends VpeTest {
- private static String TEST_PAGE = "tableBasic/tableBasic.xhtml";
//$NON-NLS-1$
+ private static String TEST_PAGE = "html/tableBasic/tableBasic.xhtml";
//$NON-NLS-1$
public RefreshBundles_JBIDE5460(String name) {
super(name);
}
public void testRefreshBundles() throws Throwable{
- IFile file = (IFile) getFile(TEST_PAGE, JsfAllTests.IMPORT_JBIDE5460_PROJECT_NAME);
+ IFile file = (IFile) TestUtil.getWebContentPath(
+ TEST_PAGE, JsfAllTests.IMPORT_JBIDE5460_PROJECT_NAME);
assertNotNull("Could not open specified file. componentPage = "
//$NON-NLS-1$
+ TEST_PAGE
@@ -55,15 +56,4 @@
TestUtil.delay(2000);
}
-
- private IResource getFile(String pagePath, String projectName) throws CoreException{
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projectName);
- if (project != null) {
- return project.getFolder("WebContent/html").findMember(pagePath);
-
- }
- return null;
- }
-
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml 2010-02-23 17:54:07 UTC
(rev 20448)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/plugin.xml 2010-02-23 18:03:26 UTC
(rev 20449)
@@ -2,6 +2,10 @@
<extension
point="org.jboss.tools.vpe.ui.tests">
<tests
testSuite="org.jboss.tools.jsf.vpe.jstl.test.JstlAllTests" name="Tests For
Jstl Components"/>
+ <testProject
+ name="jstlTests"
+ path="resources/jstlTests">
+ </testProject>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,31 +10,18 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jstl.test;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.tools.tests.ImportBean;
-import org.jboss.tools.vpe.ui.test.VpeTestSetup;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.tools.vpe.ui.test.VpeTestSetup;
+
public class JstlAllTests {
public static final String IMPORT_PROJECT_NAME = "jstlTests";
//$NON-NLS-1$
public static Test suite() {
-
- TestSuite suite = new TestSuite("Tests for Vpe JSTL components");
//$NON-NLS-1$
-
- suite.addTestSuite(JstlComponentContentTest.class);
-
- List<ImportBean> projectToImport = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(JstlAllTests.IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(JstlTestPlugin.getPluginResourcePath());
- projectToImport.add(importBean);
-
- return new VpeTestSetup(suite, projectToImport);
+ TestSuite suite = new TestSuite("Tests for Vpe JSTL components");
//$NON-NLS-1$
+ suite.addTestSuite(JstlComponentContentTest.class);
+ return new VpeTestSetup(suite);
}
}
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlTestPlugin.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlTestPlugin.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/src/org/jboss/tools/jsf/vpe/jstl/test/JstlTestPlugin.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -1,11 +1,6 @@
package org.jboss.tools.jsf.vpe.jstl.test;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
/**
@@ -51,22 +46,4 @@
public static JstlTestPlugin getDefault() {
return plugin;
}
-
- /**
- * Gets the path to the "resources" folder.
- *
- * @return the path string
- */
- public static String getPluginResourcePath() {
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- URL url = null;
- try {
- url = bundle == null ? null : FileLocator.resolve(bundle
- .getEntry("/resources")); //$NON-NLS-1$ //$NON-NLS-1$
- } catch (Exception e) {
- url = bundle.getEntry("/resources"); //$NON-NLS-1$ //$NON-NLS-1$
- }
- return (url == null) ? null : url.getPath();
- }
-
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml 2010-02-23 17:54:07
UTC (rev 20448)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/plugin.xml 2010-02-23 18:03:26
UTC (rev 20449)
@@ -7,6 +7,10 @@
name="MyFaces Tests"
testSuite="org.jboss.tools.jsf.vpe.myfaces.test.MyFacesAllTests">
</tests>
+ <testProject
+ name="myFacesTest"
+ path="resources/myFacesTest">
+ </testProject>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/src/org/jboss/tools/jsf/vpe/myfaces/test/MyFacesAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -1,12 +1,8 @@
package org.jboss.tools.jsf.vpe.myfaces.test;
-import java.util.ArrayList;
-import java.util.List;
-
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
/**
@@ -26,15 +22,6 @@
// $JUnit-BEGIN$
suite.addTestSuite(MyFacesComponentTest.class);
// $JUnit-END$
-
- List<ImportBean> projectToImport = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean
- .setImportProjectName(MyFacesComponentTest.IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(MyFacesTestPlugin
- .getPluginResourcePath());
- projectToImport.add(importBean);
-
- return new VpeTestSetup(suite, projectToImport);
+ return new VpeTestSetup(suite);
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml 2010-02-23 17:54:07
UTC (rev 20448)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/plugin.xml 2010-02-23 18:03:26
UTC (rev 20449)
@@ -3,7 +3,12 @@
<plugin>
<extension
point="org.jboss.tools.vpe.ui.tests">
- <tests
testSuite="org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests"
name="Tests For Rich Faces Components"/>
+ <tests
+ testSuite="org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests"
+ name="Tests For Rich Faces Components"/>
+ <testProject
+ name="richFacesTest"
+ path="resources/richFacesTest"/>
</extension>
</plugin>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,9 +10,6 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.richfaces.test;
-import java.util.ArrayList;
-import java.util.List;
-
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -26,7 +23,6 @@
import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1639Test;
import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1682Test;
import org.jboss.tools.jsf.vpe.richfaces.test.jbide.RichFacesJBIDE1169Test;
-import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
/**
@@ -65,16 +61,6 @@
suite.addTestSuite(RichFacesComponentContentTest.class);
// $JUnit-END$
-
- List<ImportBean> projectToImport = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(RichFacesAllTests.IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(RichFacesTestPlugin
- .getPluginResourcePath());
- projectToImport.add(importBean);
-
- return new VpeTestSetup(suite, projectToImport);
-
+ return new VpeTestSetup(suite);
}
-
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml 2010-02-23 17:54:07 UTC
(rev 20448)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/plugin.xml 2010-02-23 18:03:26 UTC
(rev 20449)
@@ -5,8 +5,10 @@
point="org.jboss.tools.vpe.ui.tests">
<tests
name="Vpe test's for seam ui components"
- testSuite="org.jboss.tools.jsf.vpe.seam.test.SeamAllTests">
- </tests>
+ testSuite="org.jboss.tools.jsf.vpe.seam.test.SeamAllTests"/>
+ <testProject
+ name="SeamTest"
+ path="resources/SeamTest"/>
</extension>
</plugin>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,15 +10,11 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.seam.test;
-import java.util.ArrayList;
-import java.util.List;
+import org.jboss.tools.vpe.ui.test.VpeTestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.tests.ImportBean;
-import org.jboss.tools.vpe.ui.test.VpeTestSetup;
-
/**
* Class for testing all Seam components
*
@@ -31,17 +27,11 @@
public static final String IMPORT_PROJECT_NAME = "SeamTest"; //$NON-NLS-1$
public static Test suite() {
- TestSuite suite = new TestSuite("Tests for Vpe Seam components");
//$NON-NLS-1$
- // $JUnit-BEGIN$
- suite.addTestSuite(SeamComponentTest.class);
- suite.addTestSuite(SeamComponentContentTest.class);
- // $JUnit-END$
- List<ImportBean> importProjects = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(SeamAllTests.IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(SeamTestPlugin.getPluginResourcePath());
- importProjects.add(importBean);
- return new VpeTestSetup(suite, importProjects);
-
+ TestSuite suite = new TestSuite("Tests for Vpe Seam components");
//$NON-NLS-1$
+ // $JUnit-BEGIN$
+ suite.addTestSuite(SeamComponentTest.class);
+ suite.addTestSuite(SeamComponentContentTest.class);
+ // $JUnit-END$
+ return new VpeTestSetup(suite);
}
}
Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml 2010-02-23
17:54:07 UTC (rev 20448)
+++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/plugin.xml 2010-02-23
18:03:26 UTC (rev 20449)
@@ -6,8 +6,10 @@
<tests
description="Unit tests for Struts support in VPE"
name="Struts Tests"
-
testSuite="org.jboss.tools.struts.vpe.struts.test.StrutsAllTests">
- </tests>
+
testSuite="org.jboss.tools.struts.vpe.struts.test.StrutsAllTests"/>
+ <testProject
+ name="StrutsTest"
+ path="resources/StrutsTest"/>
</extension>
</plugin>
Modified:
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java
===================================================================
---
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/src/org/jboss/tools/struts/vpe/struts/test/StrutsAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,14 +10,11 @@
******************************************************************************/
package org.jboss.tools.struts.vpe.struts.test;
-import static org.jboss.tools.vpe.ui.test.TestUtil.createImportBeanList;
+import org.jboss.tools.vpe.ui.test.VpeTestSetup;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.vpe.ui.test.TestUtil;
-import org.jboss.tools.vpe.ui.test.VpeTestSetup;
-
-
/**
* Class for testing all RichFaces components
*
@@ -28,7 +25,6 @@
public class StrutsAllTests {
public static Test suite() {
-
TestSuite suite = new TestSuite("Tests for Vpe Struts components");
//$NON-NLS-1$
// $JUnit-BEGIN$
suite.addTestSuite(StrutsHTMLComponentTest.class);
@@ -39,8 +35,6 @@
suite.addTestSuite(StrutsTilesComponentTest.class);
//cleanUpTests();
// $JUnit-END$
- return new
VpeTestSetup(suite,createImportBeanList(StrutsHTMLComponentTest.IMPORT_PROJECT_NAME,
StrutsTestPlugin.getPluginResourcePath()));
-
+ return new VpeTestSetup(suite);
}
-
}
Deleted:
trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportBean.java
===================================================================
---
trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportBean.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportBean.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -1,52 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007 Red Hat, Inc.
-* Distributed under license by Red Hat, Inc. All rights reserved.
-* This program is made available under the terms of the
-* Eclipse Public License v1.0 which accompanies this distribution,
-* and is available at
http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* Red Hat, Inc. - initial API and implementation
-******************************************************************************/
-package org.jboss.tools.tests;
-
-/**
- * @author Max Areshkau
- *
- * Contains information about projects which should be imported
- */
-public class ImportBean {
- /**
- * Contains import project Name
- */
- private String importProjectName;
- /**
- * Contains import project path
- */
- private String importProjectPath;
- /**
- * @return the importProjectName
- */
- public String getImportProjectName() {
- return importProjectName;
- }
- /**
- * @param importProjectName the importProjectName to set
- */
- public void setImportProjectName(String importProjectName) {
- this.importProjectName = importProjectName;
- }
- /**
- * @return the importProjectPath
- */
- public String getImportProjectPath() {
- return importProjectPath;
- }
- /**
- * @param importProjectPath the importProjectPath to set
- */
- public void setImportProjectPath(String importProjectPath) {
- this.importProjectPath = importProjectPath;
- }
-
-}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2010-02-23 17:54:07 UTC (rev
20448)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/plugin.xml 2010-02-23 18:03:26 UTC (rev
20449)
@@ -6,8 +6,10 @@
<tests
description="Tests for Html templates"
name="Tests for Html templates"
- testSuite="org.jboss.tools.vpe.html.test.HtmlAllTests">
- </tests>
+ testSuite="org.jboss.tools.vpe.html.test.HtmlAllTests"/>
+ <testProject
+ name="htmlTest"
+ path="resources/htmlTest"/>
</extension>
</plugin>
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,13 +10,9 @@
******************************************************************************/
package org.jboss.tools.vpe.html.test;
-import java.util.ArrayList;
-import java.util.List;
-
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.html.test.jbide.JBIDE3280Test;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
@@ -40,13 +36,8 @@
suite.addTestSuite(JBIDE3280Test.class);
suite.addTestSuite(HtmlComponentTest.class);
suite.addTestSuite(HtmlComponentContentTest.class);
-
- List<ImportBean> projectToImport = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(HtmlTestPlugin.getPluginResourcePath());
- projectToImport.add(importBean);
- return new VpeTestSetup(suite,projectToImport);
+
+ return new VpeTestSetup(suite);
}
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2010-02-23 17:54:07 UTC (rev
20448)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/plugin.xml 2010-02-23 18:03:26 UTC (rev
20449)
@@ -6,8 +6,10 @@
<tests
description="JSP Tests"
name="JSP Tests"
- testSuite="org.jboss.tools.vpe.jsp.test.JSPAllTests">
- </tests>
+ testSuite="org.jboss.tools.vpe.jsp.test.JSPAllTests"/>
+ <testProject
+ name="jspTest"
+ path="resources/jspTest"/>
</extension>
</plugin>
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/src/org/jboss/tools/vpe/jsp/test/JSPAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,30 +10,19 @@
******************************************************************************/
package org.jboss.tools.vpe.jsp.test;
-import java.util.ArrayList;
-import java.util.List;
+import org.jboss.tools.vpe.ui.test.VpeTestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.tests.ImportBean;
-import org.jboss.tools.vpe.ui.test.VpeTestSetup;
-
public class JSPAllTests {
public static Test suite() {
-
- TestSuite suite = new TestSuite("Tests for Vpe JSP components");
//$NON-NLS-1$
- // $JUnit-BEGIN$
-
- suite.addTestSuite(JSPComponentTest.class);
-
- // $JUnit-END$
- List<ImportBean> importProjects = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(JSPComponentTest.IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(JSPTestPlugin.getPluginResourcePath());
- importProjects.add(importBean);
- return new VpeTestSetup(suite,importProjects);
-
+ TestSuite suite = new TestSuite("Tests for Vpe JSP components");
//$NON-NLS-1$
+ // $JUnit-BEGIN$
+
+ suite.addTestSuite(JSPComponentTest.class);
+
+ // $JUnit-END$
+ return new VpeTestSetup(suite);
}
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,14 +10,10 @@
******************************************************************************/
package org.jboss.tools.vpe.test;
-import java.util.ArrayList;
-import java.util.List;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.jboss.tools.jsf.vpe.jsf.test.JsfComponentTest;
-import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
-import org.jboss.tools.tests.ImportBean;
+
import org.jboss.tools.vpe.editor.template.VpeTemplateManagerTest;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
@@ -37,12 +33,7 @@
suite.addTestSuite(TemplateSchemeValidateTest.class);
suite.addTestSuite(TemplatesExpressionParsingTest.class);
suite.addTestSuite(VpeTemplateManagerTest.class);
- List<ImportBean> projectToImport = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(JsfComponentTest.IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
- projectToImport.add(importBean);
- return new VpeTestSetup(suite, projectToImport);
+ return new VpeTestSetup(suite);
}
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2010-02-23 17:54:07 UTC (rev
20448)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2010-02-23 18:03:26 UTC (rev
20449)
@@ -9,5 +9,8 @@
name="UI tests of VPE"
testSuite="org.jboss.tools.vpe.ui.test.VpeUiTests">
</tests>
+ <testProject
+ name="TestProject"
+ path="resources/TestProject"/>
</extension>
</plugin>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd 2010-02-23 17:54:07
UTC (rev 20448)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/schema/vpe.tests.exsd 2010-02-23 18:03:26
UTC (rev 20449)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.jboss.tools.vpe.ui.test">
+<schema targetNamespace="org.jboss.tools.vpe.ui.test"
xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.jboss.tools.vpe.ui.test"
id="vpe.tests" name="Visual Editor Tests"/>
@@ -11,9 +11,15 @@
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="tests"/>
+ <element ref="testProject" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
<attribute name="point" type="string"
use="required">
<annotation>
@@ -71,6 +77,35 @@
</complexType>
</element>
+ <element name="testProject">
+ <annotation>
+ <documentation>
+ Project to be loaded to perform the tests.
+Example of using:
+<testProject name="jsfTest"
path="resources/jsfTest"/>
+ </documentation>
+ </annotation>
+ <complexType>
+ <attribute name="name" type="string"
use="required">
+ <annotation>
+ <documentation>
+ Name of the project.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="path" type="string"
use="required">
+ <annotation>
+ <documentation>
+ Path to the project within the plugin.
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="resource"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
<annotation>
<appInfo>
<meta.section type="since"/>
@@ -107,13 +142,5 @@
</documentation>
</annotation>
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
</schema>
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java
(rev 0)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.osgi.framework.Bundle;
+
+/**
+ * Singleton class to operate on test projects.
+ *
+ * @see {@code org.jboss.tools.vpe.ui.tests} extension point
+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class ProjectsLoader {
+ private static final String TEST_PROJECT_ELEMENT = "testProject";
+ private static final String TEST_PROJECT_PATH_ATTRIBUTE = "path";
+ private static final String TEST_PROJECT_NAME_ATTRIBUTE = "name";
+ private Map<String, String> projectNameToPath;
+ private static ProjectsLoader instance = null;
+
+ private ProjectsLoader() {
+ loadProjectPaths();
+ }
+
+ /**
+ * Returns the instance of {@link ProjectsLoader}
+ */
+ public static ProjectsLoader getInstance() {
+ if (instance == null) {
+ instance = new ProjectsLoader();
+ }
+
+ return instance;
+ }
+
+ /**
+ * Returns instance of {@link IProject} by {@code projectName}.
+ * If the project does not exist in the workspace, imports it from the
+ * resources specified by extensions of {@code org.jboss.tools.vpe.ui.tests}
+ * extension point. Returns {@code null} if the project is not declared in
+ * the extensions.
+ */
+ public IProject getProject(String projectName) {
+ IProject project = getExistingProject(projectName);
+
+ if (project == null) {
+ String projectPath = projectNameToPath.get(projectName);
+ if (projectPath != null) {
+ project = ResourcesUtils.importProjectIntoWorkspace(
+ projectPath, projectName);
+ }
+ }
+
+ return project;
+ }
+
+ /**
+ * Returns a workspace project by its {@code projectName}, or {@code null}
+ * if there is no project with this name in the workspace.
+ */
+ public static IProject getExistingProject(String projectName) {
+ IProject project = ResourcesPlugin.getWorkspace().getRoot()
+ .getProject(projectName);
+ if (project.isAccessible()) {
+ return project;
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Loads project names and paths to them from the extensions of
+ * {@link VpeAllTests#VPE_TEST_EXTENTION_POINT_ID}. And stores
+ * loaded data in {@link #projectNameToPath}.
+ */
+ private void loadProjectPaths() {
+ projectNameToPath = new HashMap<String, String>();
+ IExtensionRegistry extensionRepository = Platform
+ .getExtensionRegistry();
+
+ IExtensionPoint extensionPoint = extensionRepository
+ .getExtensionPoint(VpeAllTests.VPE_TEST_EXTENTION_POINT_ID);
+ IExtension[] extensions = extensionPoint.getExtensions();
+ for (IExtension extension : extensions) {
+ IConfigurationElement[] confElements = extension
+ .getConfigurationElements();
+ for (IConfigurationElement configurationElement : confElements) {
+ if (TEST_PROJECT_ELEMENT.equals(configurationElement.getName())) {
+ try {
+ Bundle bundle = Platform.getBundle(configurationElement
+ .getNamespaceIdentifier());
+
+ String pluginRoot = FileLocator
+ .resolve(bundle.getEntry("/")).getPath();
+ String name = configurationElement.getAttribute(TEST_PROJECT_NAME_ATTRIBUTE);
+ String path = configurationElement.getAttribute(TEST_PROJECT_PATH_ATTRIBUTE);
+ projectNameToPath.put(name, pluginRoot + path);
+ } catch (Exception e) {
+ VPETestPlugin.getDefault().logError(e);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Removes the project with the {@code projectName} from the workspace.
+ *
+ * @param projectName the project name
+ * @throws CoreException the core exception
+ */
+ static public void removeProject(String projectName) throws CoreException {
+ IProject project = ProjectsLoader.getExistingProject(projectName);
+ removeProject(project);
+ }
+
+ /**
+ * Removes given {@code project} from the workspace
+ *
+ * @param project project to remove
+ * @throws CoreException
+ */
+ private static void removeProject(IProject project) throws CoreException {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ try {
+ if (project != null) {
+ project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT,
+ new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ }
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+ }
+
+ /**
+ * Removes all projects from the workspace
+ *
+ * @throws CoreException
+ */
+ static public void removeAllProjects() throws CoreException {
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
+ .getProjects();
+ for (IProject project: projects) {
+ removeProject(project);
+ }
+ }
+}
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 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -11,7 +11,6 @@
package org.jboss.tools.vpe.ui.test;
import java.io.File;
-import java.util.ArrayList;
import java.util.List;
import junit.framework.Assert;
@@ -19,9 +18,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
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;
@@ -31,9 +28,6 @@
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.ResourcesUtils;
-import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.VpeEditorPart;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
@@ -63,19 +57,7 @@
/** The Constant MAX_IDLE. */
public static final long MAX_IDLE = 15*1000L;
-
/**
- * Import project into workspace.
- *
- * @param path the path
- * @param projectName the project name
- * @deprecated Use {@link ResourcesUtils#importProjectIntoWorkspace(String,String)}
instead
- */
- static public void importProjectIntoWorkspace(String path, String projectName) {
- ResourcesUtils.importProjectIntoWorkspace(path, projectName);
- }
-
- /**
* Gets the component path.
*
* @param componentPage the component page
@@ -87,8 +69,7 @@
*/
public static IResource getComponentPath(String componentPage,
String projectName) throws CoreException {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projectName);
+ IProject project = ProjectsLoader.getInstance().getProject(projectName);
if (project != null) {
return project.getFolder(COMPONENTS_PATH).findMember(componentPage);
@@ -99,8 +80,7 @@
public static IResource getResource(String path,
String projectName) throws CoreException {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projectName);
+ IProject project = ProjectsLoader.getInstance().getProject(projectName);
if (project != null) {
return project.findMember(path);
}
@@ -120,8 +100,7 @@
*/
public static IResource getWebContentPath(String componentPage,
String projectName) throws CoreException {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projectName);
+ IProject project = ProjectsLoader.getInstance().getProject(projectName);
if (project != null) {
return project.getFolder(WEBCONTENT_PATH).findMember(componentPage);
}
@@ -140,28 +119,6 @@
}
/**
- * Removes the project.
- *
- * @param projectName the project name
- *
- * @throws CoreException the core exception
- */
- static public void removeProject(String projectName) throws CoreException {
- boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- try {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projectName);
- if (project != null) {
- project.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT,
- new NullProgressMonitor());
- JobUtils.waitForIdle();
- }
- } finally {
- ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- }
- }
-
- /**
* Process UI input but do not return for the specified time interval.
*
* @param waitTimeMillis the number of milliseconds
@@ -275,37 +232,6 @@
}
/**
- * Creates the import bean list.
- *
- * @param projectName the project name
- * @param resourcePath the resource path
- *
- * @return the list< import bean>
- */
- static public List<ImportBean> createImportBeanList(String projectName,
- String resourcePath) {
- List<ImportBean> projectToImport = new ArrayList<ImportBean>();
- projectToImport.add(createImportBean(projectName, resourcePath));
- return projectToImport;
- }
-
- /**
- * Creates the import bean.
- *
- * @param projectName the project name
- * @param resourcePath the resource path
- *
- * @return the import bean
- */
- static public ImportBean createImportBean(String projectName,
- String resourcePath) {
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(projectName);
- importBean.setImportProjectPath(resourcePath);
- return importBean;
- }
-
- /**
* Utility function which returns node mapping by source position(line and position in
line).
*
* @param linePosition the line position
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.test;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import junit.framework.Test;
@@ -30,10 +29,9 @@
*/
public class VpeAllTests {
+ public static final String TESTS_ELEMENT = "tests";
public static final String VPE_TEST_EXTENTION_POINT_ID =
"org.jboss.tools.vpe.ui.tests"; //$NON-NLS-1$
-
- public static final String TEST_SUITE_PARAM = "testSuite"; //$NON-NLS-1$
-
+ public static final String TEST_SUITE_PARAM = "testSuite"; //$NON-NLS-1$
public static final String METHOD_SUITE_NAME = "suite"; //$NON-NLS-1$
public static final String VPE_TEST_PROJECT_NAME = "vpeTest"; //$NON-NLS-1$
@@ -52,29 +50,21 @@
for (IConfigurationElement configurationElement : confElements) {
String clazz = configurationElement
.getAttribute(TEST_SUITE_PARAM);
- try {
- Bundle bundle = Platform.getBundle(configurationElement
- .getNamespaceIdentifier());
- Class<?> testObject = bundle.loadClass(clazz);
- Method method = testObject.getMethod(METHOD_SUITE_NAME, null);
- // null -because static method
- Object res = method.invoke(null, null);
- if (res instanceof Test) {
- Test testSuite = (Test) res;
- result.addTest(testSuite);
+ if (TESTS_ELEMENT.equals(configurationElement.getName())) {
+ try {
+ Bundle bundle = Platform.getBundle(configurationElement
+ .getNamespaceIdentifier());
+ Class<?> testObject = bundle.loadClass(clazz);
+ Method method = testObject.getMethod(METHOD_SUITE_NAME, null);
+ // null -because static method
+ Object res = method.invoke(null, null);
+ if (res instanceof Test) {
+ Test testSuite = (Test) res;
+ result.addTest(testSuite);
+ }
+ } catch (Exception e) {
+ VPETestPlugin.getDefault().logError(e);
}
- } catch (ClassNotFoundException e) {
- VPETestPlugin.getDefault().logError(e);
- } catch (SecurityException e) {
- VPETestPlugin.getDefault().logError(e);
- } catch (NoSuchMethodException e) {
- VPETestPlugin.getDefault().logError(e);
- } catch (IllegalArgumentException e) {
- VPETestPlugin.getDefault().logError(e);
- } catch (IllegalAccessException e) {
- VPETestPlugin.getDefault().logError(e);
- } catch (InvocationTargetException e) {
- VPETestPlugin.getDefault().logError(e);
}
}
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -1,5 +1,5 @@
/*******************************************************************************
-* Copyright (c) 2007 Red Hat, Inc.
+* Copyright (c) 2007-2010 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -10,37 +10,24 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.test;
-import java.io.File;
-import java.util.List;
+import org.eclipse.ui.IViewReference;
+import org.eclipse.ui.PlatformUI;
import junit.extensions.TestSetup;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.test.util.ResourcesUtils;
-import org.jboss.tools.tests.ImportBean;
-
/**
* @author Max Areshkau
+ * @author Yahor Radtsevich (yradtsevich)
*
- * Class for setup-tear down junit tests(import project
- * into workspace and remove project from workspace)
+ * Class for tear down JUnit tests (remove projects from workspace)
+ *
*/
public class VpeTestSetup extends TestSetup {
+ private static final String CONTENT_OUTLINE_VIEW_ID =
"org.eclipse.ui.views.ContentOutline";
- /**
- * Contains test project names, which will be imported
- * in setUp method and removed in tear down method
- */
- private List<ImportBean> testProjectNames;
-
- private static final String CONTENT_OUTLINE_VIEW_ID =
"org.eclipse.ui.views.ContentOutline"; //$NON-NLS-1$
-
- public VpeTestSetup(TestSuite test, List<ImportBean> testProjectNames) {
+ public VpeTestSetup(TestSuite test) {
super(test);
- setTestProjects(testProjectNames);
}
/* (non-Javadoc)
@@ -48,13 +35,6 @@
*/
@Override
protected void setUp() throws Exception {
- super.setUp();
- for (ImportBean importBean : getTestProjects()) {
- if
(ResourcesPlugin.getWorkspace().getRoot().findMember(importBean.getImportProjectName()) ==
null) {
- ResourcesUtils.importProjectIntoWorkspace((importBean.getImportProjectPath()
- +
File.separator+importBean.getImportProjectName()),importBean.getImportProjectName());
- }
- }
//added by Maksim Areshkau, Fix for
https://jira.jboss.org/jira/browse/JBIDE-5820
https://jira.jboss.org/jira/browse/JBIDE-5821
//remove this code when we will move on wtp 3.2
IViewReference[] iviewReferences=
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getViewReferences();
@@ -70,25 +50,6 @@
*/
@Override
protected void tearDown() throws Exception {
-
- for(ImportBean importBean:getTestProjects()) {
- TestUtil.removeProject(importBean.getImportProjectName());
- }
- super.tearDown();
+ ProjectsLoader.removeAllProjects();
}
-
- /**
- * @return the testProjectNames
- */
- private List<ImportBean> getTestProjects() {
- return testProjectNames;
- }
-
- /**
- * @param testProjectNames the testProjectNames to set
- */
- private void setTestProjects(List<ImportBean> testProjectNames) {
- this.testProjectNames = testProjectNames;
- }
-
}
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-02-23
17:54:07 UTC (rev 20448)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2010-02-23
18:03:26 UTC (rev 20449)
@@ -10,10 +10,9 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.test;
-import java.util.ArrayList;
-import java.util.List;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.editor.menu.VpePopupMenuTest;
import org.jboss.tools.vpe.ui.test.dialog.VpeEditAnyDialogTest;
import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest;
@@ -21,9 +20,6 @@
import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTest;
import org.jboss.tools.vpe.ui.test.wizard.VpeImportExportUnknownTagsWizardsTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* @author mareshkau
*
@@ -39,15 +35,6 @@
suite.addTestSuite(VpeEditAnyDialogTest.class);
suite.addTestSuite(VpeImportExportUnknownTagsWizardsTest.class);
- /*
- * Add projects that will be used in junit tests.
- */
- List<ImportBean> projectToImport = new ArrayList<ImportBean>();
- ImportBean importBean = new ImportBean();
- importBean.setImportProjectName(VpeUiTests.IMPORT_PROJECT_NAME);
- importBean.setImportProjectPath(VPETestPlugin.getPluginResourcePath());
- projectToImport.add(importBean);
-
- return new VpeTestSetup(suite, projectToImport);
+ return new VpeTestSetup(suite);
}
}