[jbosstools-commits] JBoss Tools SVN: r41967 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: projects and 24 other directories.

Author: ljelinko Date: 2012-06-14 07:48:13 -0400 (Thu, 14 Jun 2012) New Revision: 41967 Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.classpath trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.project trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/.jsdtscope trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.jdt.core.prefs trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.component trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/META-INF/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/WEB-INF/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/WEB-INF/lib/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/index.jsp trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/classes/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/classes/org/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/classes/org/jboss/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/classes/org/jboss/tools/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/classes/org/jboss/tools/tests/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/classes/org/jboss/tools/tests/as/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/classes/org/jboss/tools/tests/as/HelloWorld.class trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/org/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/org/jboss/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/org/jboss/tools/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/org/jboss/tools/tests/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/org/jboss/tools/tests/as/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/org/jboss/tools/tests/as/HelloWorld.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java Removed: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java Log: Added new tests Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test ___________________________________________________________________ Modified: svn:ignore - bin + bin screenshots Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties 2012-06-14 11:44:51 UTC (rev 41966) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties 2012-06-14 11:48:13 UTC (rev 41967) @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + resources/ output.. = bin/ bin.includes = META-INF/,\ . Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.classpath =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.classpath (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.classpath 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="build/classes"/> +</classpath> Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.project =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.project (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.project 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jsp-as7</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/.jsdtscope =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/.jsdtscope (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/.jsdtscope 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.jdt.core.prefs 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.component 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="jsp-as7"> + <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <property name="context-root" value="jsp-as7"/> + <property name="java-output-path" value="/jsp-as7/build/classes"/> + </wb-module> +</project-modules> Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="jst.web"/> + <fixed facet="java"/> + <fixed facet="wst.jsdt.web"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="3.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/META-INF/MANIFEST.MF 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/index.jsp =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/index.jsp (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/WebContent/index.jsp 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,6 @@ +<%@ page language="java" import="org.jboss.tools.tests.as.*" errorPage="" %> +<html> +<body> + <%=HelloWorld.sayHello()%> +</body> +</html> \ No newline at end of file Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/classes/org/jboss/tools/tests/as/HelloWorld.class =================================================================== (Binary files differ) Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/build/classes/org/jboss/tools/tests/as/HelloWorld.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/org/jboss/tools/tests/as/HelloWorld.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/org/jboss/tools/tests/as/HelloWorld.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/src/org/jboss/tools/tests/as/HelloWorld.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,8 @@ +package org.jboss.tools.tests.as; + +public class HelloWorld { + + public static String sayHello(){ + return "Hello tests!"; + } +} Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java 2012-06-14 11:44:51 UTC (rev 41966) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -5,6 +5,8 @@ public class Activator implements BundleActivator { + public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.ui.bot.test"; + private static BundleContext context; static BundleContext getContext() { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-06-14 11:44:51 UTC (rev 41966) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -2,6 +2,7 @@ import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Test; import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeleteAS7Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProject; import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; @@ -10,7 +11,8 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ CreateAS7Test.class, - OperateAS7Server.class, + OperateAS7Server.class, + DeployJSPProject.class, DeleteAS7Server.class }) public class AllTestsSuite { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java 2012-06-14 11:44:51 UTC (rev 41966) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -7,12 +7,13 @@ import java.util.List; import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor; -import org.jboss.ide.eclipse.as.ui.bot.test.entity.XMLConfiguration; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; +import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration; +import org.jboss.tools.ui.bot.ext.view.ServersView; import org.junit.Test; /** @@ -32,7 +33,8 @@ assertThat("8080", is(editor.getWebPort())); assertThat("9999", is(editor.getManagementPort())); - List<XMLConfiguration> configurations = editor.getXMLConfiguration("Ports"); + ServersView view = new ServersView(); + List<XMLConfiguration> configurations = view.getXMLConfiguration(configuredState.getServer().name, "Ports"); assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "${jboss.management.native.port:9999}"))); assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080"))); } Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,51 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as7; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; + +import org.jboss.ide.eclipse.as.ui.bot.test.Activator; +import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher; +import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.condition.TaskDuration; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; +import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher; +import org.jboss.tools.ui.bot.ext.view.ServersView; +import org.junit.Before; +import org.junit.Test; + +@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running)) +public class DeployJSPProject extends SWTTestExt { + + private static final String PROJECT_NAME = "jsp-as7"; + + @Before + public void importProject(){ + ImportProjectWizard wizard = new ImportProjectWizard(); + wizard.setCopyProjectsIntoWorkspace(true); + wizard.setProjectPath(SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, "projects")); + wizard.setProjectNames(PROJECT_NAME); + wizard.execute(); + } + + @Test + public void deployJSPProject(){ + ServersView serversView = new ServersView(); + serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name); + + // console + assertThat("Exception:", not(new ConsoleOutputMatcher(TaskDuration.NORMAL))); + assertThat("Registering web context: /" + PROJECT_NAME, new ConsoleOutputMatcher(TaskDuration.NORMAL)); + // view + assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME)); + assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name)); + assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name)); + // web + serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME); + assertThat("Hello tests!", new PageSourceMatcher()); + } +} Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-06-14 11:44:51 UTC (rev 41966) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -5,10 +5,14 @@ import static org.hamcrest.Matchers.not; import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher; import org.jboss.tools.ui.bot.ext.view.ServersView; import org.junit.Test; - +@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.NotRunning)) public class OperateAS7Server extends SWTTestExt { private ServersView serversView = new ServersView(); @@ -26,22 +30,26 @@ public void startServer(){ serversView.startServer(getServerName()); + serversView.openWebPage(configuredState.getServer().name); assertNoException("Starting server"); assertServerState("Starting server", "Started"); - + assertWebPageContains("Welcome to EAP 6"); } public void restartServer(){ serversView.restartServer(getServerName()); - + serversView.openWebPage(configuredState.getServer().name); + assertNoException("Restarting server"); assertServerState("Restarting server", "Started"); + assertWebPageContains("Welcome to EAP 6"); } public void stopServer(){ serversView.stopServer(getServerName()); - + serversView.openWebPage(configuredState.getServer().name); + assertNoException("Stopping server"); assertServerState("Stopping server", "Stopped"); } @@ -53,4 +61,8 @@ protected void assertServerState(String message, String state) { assertThat(message, serversView.getServerStatus(getServerName()), is(state)); } + + private void assertWebPageContains(String string) { + serversView.openWebPage(configuredState.getServer().name); + } } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-06-14 11:44:51 UTC (rev 41966) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -1,12 +1,5 @@ package org.jboss.ide.eclipse.as.ui.bot.test.editor; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.waits.ICondition; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; -import org.jboss.ide.eclipse.as.ui.bot.test.entity.XMLConfiguration; import org.jboss.tools.ui.bot.ext.SWTBotFactory; import org.jboss.tools.ui.bot.ext.view.ServersView; @@ -38,46 +31,4 @@ public String getManagementPort(){ return SWTBotFactory.getBot().textWithLabel("Management").getText(); } - - public List<XMLConfiguration> getXMLConfiguration(String categoryName){ - SWTBotTreeItem server = serversView.findServerByName(name); - server.expand(); - final SWTBotTreeItem category = server.expandNode("XML Configuration", categoryName); - - SWTBotFactory.getBot().waitUntil(new TreeItemLabelChangedCondition(category.getNode(0))); - - List<XMLConfiguration> configurations = new ArrayList<XMLConfiguration>(); - for (SWTBotTreeItem item : category.getItems()){ - String[] columns = item.getText().split(" "); - configurations.add(new XMLConfiguration(columns[0].trim(), columns[1].trim())); - } - return configurations; - } - - private static class TreeItemLabelChangedCondition implements ICondition { - - private String firstTimeText; - - private SWTBotTreeItem item; - - public TreeItemLabelChangedCondition(SWTBotTreeItem item) { - super(); - this.item = item; - } - - @Override - public void init(SWTBot bot) { - firstTimeText = item.getText(); - } - - @Override - public boolean test() throws Exception { - return !firstTimeText.equals(item.getText()); - } - - @Override - public String getFailureMessage() { - return "Expected the tree item's text to change"; - } - } } Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java 2012-06-14 11:44:51 UTC (rev 41966) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -1,70 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.entity; - -public class XMLConfiguration { - - private String key; - - private String value; - - public XMLConfiguration() { - // default - } - - public XMLConfiguration(String key, String value) { - super(); - this.key = key; - this.value = value; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - @Override - public String toString() { - return getKey() + "=" + getValue(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((key == null) ? 0 : key.hashCode()); - result = prime * result + ((value == null) ? 0 : value.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - XMLConfiguration other = (XMLConfiguration) obj; - if (key == null) { - if (other.key != null) - return false; - } else if (!key.equals(other.key)) - return false; - if (value == null) { - if (other.value != null) - return false; - } else if (!value.equals(other.value)) - return false; - return true; - } -} Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,26 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.web; + +import org.hamcrest.Description; +import org.hamcrest.TypeSafeMatcher; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; + +public class PageSourceMatcher extends TypeSafeMatcher<String> { + + private String pageText; + + public PageSourceMatcher() { + super(); + } + + @Override + public boolean matchesSafely(String item) { + pageText = SWTBotFactory.getBot().browser().getText(); + return pageText.contains(item); + } + + @Override + public void describeTo(Description description) { + description.appendText("is on the page, but there was instead: "); + description.appendValue(pageText); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java 2012-06-14 11:48:13 UTC (rev 41967) @@ -0,0 +1,111 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.wizard; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.keyboard.KeyboardFactory; +import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; +import org.jboss.tools.ui.bot.ext.wizards.SWTBotImportWizard; + +public class ImportProjectWizard { + + private SWTBotImportWizard wizard = new SWTBotImportWizard(); + + private String[] projectNames; + + private String projectPath; + + private String zipFilePath; + + private boolean copyProjectsIntoWorkspace; + + public void execute(){ + wizard.open(ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getName(), ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getGroupPath().get(0)); + loadProjects(); + selectProjects(); + wizard.finishWithWait(); + } + + private void loadProjects() { + if (projectPath != null && zipFilePath != null){ + throw new IllegalArgumentException("You have to choose between folder and ZIP path"); + } + + if (projectPath != null){ + loadProjectsFromFolder(); + return; + } + + if (zipFilePath != null){ + loadProjectsFromZIP(); + return; + } + + throw new IllegalArgumentException("You have to provide either folder or ZIP path"); + } + + private void loadProjectsFromFolder() { + getBot().text(0).setText(projectPath); + KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB); + } + + private void loadProjectsFromZIP() { + getBot().radio("Select archive file:").click(); + getBot().text(1).setText(zipFilePath); + KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB); + } + + private void selectProjects() { + selectCopyProjectsIntoWorkspace(); + getBot().button("Deselect All").click(); + SWTBotTree projectsTree = getBot().treeWithLabel("Projects:"); + for (String projectName : projectNames){ + SWTBotTreeItem projectItem = projectsTree.getTreeItem(getProjectLabel(projectName)); + projectItem.check(); + } + } + + private void selectCopyProjectsIntoWorkspace() { + if (isFileSystem()){ + if (copyProjectsIntoWorkspace){ + getBot().checkBox("Copy projects into workspace").select(); + } else { + getBot().checkBox("Copy projects into workspace").deselect(); + } + } + } + + private String getProjectLabel(String project){ + if (isFileSystem()){ + return project + " (" + projectPath + "/" + project + ")"; + } else { + return project + " (" + project + ")"; + } + } + + private boolean isFileSystem(){ + return projectPath != null; + } + + public void setProjectNames(String... projectNames) { + this.projectNames = projectNames; + } + + public void setProjectPath(String projectPath) { + this.projectPath = projectPath; + } + + public void setZipFilePath(String zipFilePath) { + this.zipFilePath = zipFilePath; + } + + public void setCopyProjectsIntoWorkspace(boolean copyProjectsIntoWorkspace) { + this.copyProjectsIntoWorkspace = copyProjectsIntoWorkspace; + } + + private SWTBot getBot(){ + return SWTBotFactory.getBot(); + } +}