[jbosstools-commits] JBoss Tools SVN: r23038 - in trunk/jst/tests/org.jboss.tools.jst.web.ui.test: projects/test_add_jsf_capabilities and 6 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Fri Jun 25 09:59:41 EDT 2010


Author: scabanovich
Date: 2010-06-25 09:59:41 -0400 (Fri, 25 Jun 2010)
New Revision: 23038

Added:
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/classes/
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/common-annotations.jar
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-beanutils.jar
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-collections.jar
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-digester.jar
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-logging.jar
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jsf-tlds.jar
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jstl.jar
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/standard.jar
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/bin/
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/src/
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
Modified:
   trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6540

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath	                        (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath	2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.classpath
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project	                        (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project	2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>test_add_jsf_capabilities</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.project
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs	                        (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs	2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,12 @@
+#Fri Jun 25 15:56:21 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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF	                        (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF	2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml	                        (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml	2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <application>
+  <locale-config/>
+ </application>
+ <factory/>
+ <lifecycle/>
+</faces-config>
\ No newline at end of file


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/common-annotations.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/common-annotations.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-beanutils.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-beanutils.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-collections.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-digester.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-digester.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jsf-tlds.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jsf-tlds.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jstl.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/jstl.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/standard.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/lib/standard.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml	                        (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml	2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>p20</display-name>
+ <context-param>
+  <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+  <param-value>server</param-value>
+ </context-param>
+ <listener>
+  <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
+ <!-- Faces Servlet -->
+ <servlet>
+  <servlet-name>Faces Servlet</servlet-name>
+  <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+  <load-on-startup>1</load-on-startup>
+ </servlet>
+ <!-- Faces Servlet Mapping -->
+ <servlet-mapping>
+  <servlet-name>Faces Servlet</servlet-name>
+  <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+</web-app>


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/projects/test_add_jsf_capabilities/WebContent/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: 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	                        (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java	2010-06-25 13:59:41 UTC (rev 23038)
@@ -0,0 +1,94 @@
+package org.jboss.tools.jst.web.ui.test;
+
+import junit.framework.TestCase;
+
+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.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbenchWizard;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.wizards.IWizardDescriptor;
+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.JUnitUtils;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+
+public class AddJSFCapabilitiesTest extends TestCase {
+	IProject project = 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();
+		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();
+
+		//TODO implement finish of wizard and check of results.
+		//TODO it is necessary to provide server runtime; without it, wizard cannot finish
+		System.out.println(wizard.canFinish());
+	}
+
+	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;
+		}
+		
+	}
+}


Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

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-06-25 13:28:31 UTC (rev 23037)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/JstWebUiAllTests.java	2010-06-25 13:59:41 UTC (rev 23038)
@@ -31,6 +31,10 @@
 				"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