[jbosstools-commits] JBoss Tools SVN: r23638 - in trunk/jst/tests/org.jboss.tools.jst.web.ui.test: src/org/jboss/tools/jst/web/ui/test and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Jul 21 13:46:14 EDT 2010
Author: dgolovin
Date: 2010-07-21 13:46:14 -0400 (Wed, 21 Jul 2010)
New Revision: 23638
Removed:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java
Log:
Green Build
JSF related tests are moved to jsf.ui.test plug-in
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/org.eclipse.jdt.core.prefs 2010-07-21 15:28:37 UTC (rev 23637)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/org.eclipse.jdt.core.prefs 2010-07-21 17:46:14 UTC (rev 23638)
@@ -1,8 +0,0 @@
-#Fri Jun 11 14:44:27 MSD 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java 2010-07-21 15:28:37 UTC (rev 23637)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java 2010-07-21 17:46:14 UTC (rev 23638)
@@ -1,143 +0,0 @@
-package org.jboss.tools.jst.web.ui.test;
-
-import junit.framework.TestCase;
-
-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.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.tools.common.meta.key.WizardKeys;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
-import org.jboss.tools.common.model.ui.action.AddNatureActionDelegate;
-import org.jboss.tools.common.model.ui.util.ExtensionPointUtils;
-import org.jboss.tools.jst.web.ui.wizards.project.ImportWebProjectWizard;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.ProjectImportTestSetup;
-
-
-public class AddJSFCapabilitiesTest extends TestCase {
- IProject project = null;
- IProject fake_as = null;
-
- public AddJSFCapabilitiesTest() {
- super("Add JSF Capabilities Test");
- }
-
- public AddJSFCapabilitiesTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- JobUtils.waitForIdle(3000);
- IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("test_add_jsf_capabilities");
- if(project == null) {
- ProjectImportTestSetup setup = new ProjectImportTestSetup(
- this,
- "org.jboss.tools.jst.web.ui.test",
- "projects/test_add_jsf_capabilities",
- "test_add_jsf_capabilities");
- project = setup.importProject();
- }
- this.project = project.getProject();
-
- IResource fake_as = ResourcesPlugin.getWorkspace().getRoot().findMember("fake_as");
- if(fake_as == null) {
- ProjectImportTestSetup setup = new ProjectImportTestSetup(
- this,
- "org.jboss.tools.jst.web.ui.test",
- "projects/fake_as",
- "fake_as");
- fake_as = setup.importProject();
- }
- this.fake_as = fake_as.getProject();
- JobUtils.waitForIdle();
- }
-
- public void testAddJSFCapabilities() {
- ImportWebProjectWizard wizard = (ImportWebProjectWizard)new Act().getWizard(project);
- WizardDialog dialog = new WizardDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- wizard);
- dialog.setBlockOnOpen(false);
- dialog.open();
-
- IRuntime r0 = createRuntime();
- ((ImportWebProjectWizard)wizard).setRuntimeName(r0.getName());
-
- assertTrue(wizard.canFinish());
-
- boolean b = wizard.performFinish();
-
- assertTrue(b);
-
- try {
- assertTrue(project.hasNature("org.jboss.tools.jsf.jsfnature"));
- } catch (CoreException e) {
- fail(e.getMessage());
- }
-
- IFile f = project.getFile(new Path(".settings/org.eclipse.wst.common.project.facet.core.xml"));
- assertNotNull(f);
- assertTrue(f.exists());
- }
-
- static String RUNTIME = "org.jboss.ide.eclipse.as.runtime.42";
-
- IRuntime createRuntime() {
- IRuntimeType t = ServerCore.findRuntimeType(RUNTIME);
-
- IPath location = fake_as.getLocation();
- try {
- IRuntimeWorkingCopy r = t.createRuntime(RUNTIME, new NullProgressMonitor());
- r.setName("myRuntime");
- r.setLocation(location);
- return r.save(true, new NullProgressMonitor());
-
- } catch (CoreException e) {
- fail(e.getMessage());
- return null;
- }
- }
-
- private void refreshProject(IProject project){
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- JobUtils.waitForIdle();
- JobUtils.delay(2000);
- } catch (CoreException e) {
- // ignore
- }
- }
-
- class Act extends AddNatureActionDelegate {
-
- protected IWizard getWizard(IProject project) {
- ImportWebProjectWizard wizard = (ImportWebProjectWizard)ExtensionPointUtils.findImportWizardsItem(
- "org.jboss.tools.jsf",
- "org.jboss.tools.jsf.ui.wizard.project.ImportProjectWizard" //$NON-NLS-1$
- );
- if (wizard == null) throw new IllegalArgumentException("Wizard org.jboss.tools.common.model.ui.wizards.ImportProjectWizard is not found."); //$NON-NLS-1$
- wizard.setInitialName(project.getName());
- wizard.setInitialLocation(findWebXML(project.getLocation().toString()));
- wizard.init(ModelUIPlugin.getDefault().getWorkbench(), null);
- wizard.setWindowTitle(WizardKeys.getString("ADD_JSF_NATURE")); //$NON-NLS-1$
- return wizard;
- }
-
- protected String getNatureID() {
- return null;
- }
-
- }
-}
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java 2010-07-21 15:28:37 UTC (rev 23637)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JSPProblemMarkerResolutionTest.java 2010-07-21 17:46:14 UTC (rev 23638)
@@ -1,98 +0,0 @@
-package org.jboss.tools.jst.web.ui.test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-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.ui.IMarkerResolution;
-import org.jboss.tools.jst.web.ui.action.JSPProblemMarkerResolutionGenerator;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.ProjectImportTestSetup;
-import org.jboss.tools.tests.AbstractResourceMarkerTest;
-
-public class JSPProblemMarkerResolutionTest extends AbstractResourceMarkerTest{
- IProject project = null;
-
- public JSPProblemMarkerResolutionTest() {
- super("JSP Problem Marker Resolution Tests");
- }
-
- public JSPProblemMarkerResolutionTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- JobUtils.waitForIdle();
- IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("test_jsf_project");
- if(project == null) {
- ProjectImportTestSetup setup = new ProjectImportTestSetup(
- this,
- "org.jboss.tools.jst.web.ui.test",
- "projects/test_jsf_project",
- "test_jsf_project");
- project = setup.importProject();
- }
- this.project = project.getProject();
- JobUtils.waitForIdle();
- }
-
- public void testProblemMarkerResolutionInJSP() throws CoreException {
- IFile jspFile = project.getFile("WebContent/pages/test_page1.jsp");
-
- assertMarkerIsCreated(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag.*");
-
- IMarker[] markers = findMarkers(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag.*");
-
- assertEquals(1, markers.length);
-
- JSPProblemMarkerResolutionGenerator generator = new JSPProblemMarkerResolutionGenerator();
-
- for(IMarker marker : markers){
- generator.hasResolutions(marker);
- IMarkerResolution[] resolutions = generator.getResolutions(marker);
- for(IMarkerResolution resolution : resolutions){
- resolution.run(marker);
- }
- }
-
- refreshProject(project);
-
- assertMarkerIsNotCreated(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag.*");
- }
-
- public void testProblemMarkerResolutionInXHTML() throws CoreException {
- IFile jspFile = project.getFile("WebContent/pages/test_page2.xhtml");
-
- assertMarkerIsCreated(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag.*");
-
- IMarker[] markers = findMarkers(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag.*");
-
- assertEquals(3, markers.length);
-
- JSPProblemMarkerResolutionGenerator generator = new JSPProblemMarkerResolutionGenerator();
-
- for(IMarker marker : markers){
- generator.hasResolutions(marker);
- IMarkerResolution[] resolutions = generator.getResolutions(marker);
- for(IMarkerResolution resolution : resolutions){
- resolution.run(marker);
- }
- }
-
- refreshProject(project);
-
- assertMarkerIsNotCreated(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag.*");
- }
-
- private void refreshProject(IProject project){
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- JobUtils.waitForIdle();
- JobUtils.delay(2000);
- } catch (CoreException e) {
- // ignore
- }
- }
-}
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java 2010-07-21 15:28:37 UTC (rev 23637)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java 2010-07-21 17:46:14 UTC (rev 23638)
@@ -10,12 +10,12 @@
******************************************************************************/
package org.jboss.tools.jst.web.ui.test;
-import org.jboss.tools.test.util.ProjectImportTestSetup;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
/**
* @author eskimo
*
@@ -27,15 +27,7 @@
suite.addTestSuite(WebViewsTest.class);
suite.addTestSuite(WebWizardsTest.class);
suite.addTestSuite(JstWebUiPreferencesPagesTest.class);
- suite.addTest(new ProjectImportTestSetup(new TestSuite(JSPProblemMarkerResolutionTest.class),
- "org.jboss.tools.jst.web.ui.test",
- new String[]{"projects/test_jsf_project"},
- new String[]{"test_jsf_project"}));
- suite.addTest(new ProjectImportTestSetup(new TestSuite(AddJSFCapabilitiesTest.class),
- "org.jboss.tools.jst.web.ui.test",
- new String[]{"projects/test_add_jsf_capabilities"},
- new String[]{"test_add_jsf_capabilities"}));
-
+
return suite;
}
}
More information about the jbosstools-commits
mailing list