JBoss Tools SVN: r43860 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2012-09-20 07:30:04 -0400 (Thu, 20 Sep 2012)
New Revision: 43860
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java
Log:
Added setting of focus before pressing tab key.
Modified: 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 2012-09-20 11:21:52 UTC (rev 43859)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java 2012-09-20 11:30:04 UTC (rev 43860)
@@ -49,6 +49,7 @@
private void loadProjectsFromFolder() {
getBot().text(0).setText(projectPath);
+ getBot().text(0).setFocus();
KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
getBot().waitUntil(new ProjectIsLoaded());
}
@@ -56,6 +57,7 @@
private void loadProjectsFromZIP() {
getBot().radio("Select archive file:").click();
getBot().text(1).setText(zipFilePath);
+ getBot().text(1).setFocus();
KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
getBot().waitUntil(new ProjectIsLoaded());
}
13 years, 6 months
JBoss Tools SVN: r43859 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-09-20 07:21:52 -0400 (Thu, 20 Sep 2012)
New Revision: 43859
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java
Log:
Remove tag tests to make suite more stable.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java 2012-09-20 09:58:29 UTC (rev 43858)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java 2012-09-20 11:21:52 UTC (rev 43859)
@@ -38,42 +38,10 @@
import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowResourceBundlesUsageasELexpressionsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest;
import org.jboss.tools.vpe.ui.bot.test.editor.selectionbar.SelectionBarTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.ActionParamTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.AjaxInvisibleTagsTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.AjaxValidatorTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.BeanValidatorTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.CalendarTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnGroupTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnsTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.ComboBoxTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.CommandButtonTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.CommandLinkTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.CoreHTMLTagsTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataDefinitionTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataGridTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataListTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataOrderedListTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataScrollerTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataTableTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.EditorTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.ExtendedDataTableTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.FileUploadTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.HtmlCommandLinkTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.IncludeTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.InplaceInputTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.InplaceSelectInputTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.JSFTagsTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.ListShuttleTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.LogTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.PanelMenuTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.PanelTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.PickListTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.ProgressTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.SpacerTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.ToolbarAndToolbarGroupTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.TreeTagTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.tags.VirtualEarthTagTest;
import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4556Test;
import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE9445Test_DuplicateSourceMenu;
import org.jboss.tools.vpe.ui.bot.test.palette.CancelTagLibDefenitionTest;
@@ -151,39 +119,7 @@
CoreHTMLTagsTest.class,
JSFTagsTest.class,
ColumnsTagTest.class,
- ComboBoxTagTest.class,
- FileUploadTagTest.class,
- InplaceInputTagTest.class,
- InplaceSelectInputTagTest.class,
- PickListTagTest.class,
- ProgressTagTest.class,
- PanelMenuTagTest.class,
- ListShuttleTagTest.class,
- DataDefinitionTagTest.class,
- EditorTagTest.class,
- TreeTagTest.class,
CalendarTagTest.class,
- PanelTagTest.class,
- DataTableTagTest.class,
- SpacerTagTest.class,
- DataScrollerTagTest.class,
- ColumnTagTest.class,
- ActionParamTagTest.class,
- AjaxValidatorTagTest.class,
- BeanValidatorTagTest.class,
- ColumnGroupTagTest.class,
- DataGridTagTest.class,
- VirtualEarthTagTest.class,
- DataListTagTest.class,
- DataOrderedListTagTest.class,
- ExtendedDataTableTagTest.class,
- ToolbarAndToolbarGroupTagTest.class,
- CommandButtonTagTest.class,
- CommandLinkTagTest.class,
- HtmlCommandLinkTagTest.class,
- IncludeTagTest.class,
- AjaxInvisibleTagsTest.class,
- LogTagTest.class,
OpenOnTest.class,
XhtmlFilePerformanceTest.class,
MarkersTest.class,
13 years, 6 months
JBoss Tools SVN: r43858 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-09-20 05:58:29 -0400 (Thu, 20 Sep 2012)
New Revision: 43858
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.properties
Log:
[JBIDE-11912] added "..." to "Manage SSH Keys"
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.properties 2012-09-20 09:57:30 UTC (rev 43857)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.properties 2012-09-20 09:58:29 UTC (rev 43858)
@@ -7,4 +7,4 @@
openshift.express.description=A server adapter for use with OpenShift Applications
openshift.express.runtime.name = OpenShift Server Runtime
-openshift.command.managekeys=Manage SSH Keys
\ No newline at end of file
+openshift.command.managekeys=Manage SSH Keys...
\ No newline at end of file
13 years, 6 months
JBoss Tools SVN: r43857 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-09-20 05:57:30 -0400 (Thu, 20 Sep 2012)
New Revision: 43857
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
corrected formatting (for better readability)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-09-20 09:15:31 UTC (rev 43856)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-09-20 09:57:30 UTC (rev 43857)
@@ -273,21 +273,23 @@
final String repoPath = (String) repoPathObservable.getValue();
final String applicationName = (String) applicationNameModelObservable.getValue();
final boolean newProject = (Boolean) newProjectModelObservable.getValue();
-
- if(newProject) {
- final IPath repoResourcePath = new Path(repoPath);
- if (repoResourcePath.isEmpty()
- || !repoResourcePath.isAbsolute()
- || !repoResourcePath.toFile().canWrite()) {
- return OpenShiftUIActivator.createErrorStatus("The location '" + repoResourcePath.toOSString() + "' does not exist or is not writeable.");
+
+ if (newProject) {
+ final IPath repoResourcePath = new Path(repoPath);
+ if (repoResourcePath.isEmpty()
+ || !repoResourcePath.isAbsolute()
+ || !repoResourcePath.toFile().canWrite()) {
+ return OpenShiftUIActivator.createErrorStatus("The location '" + repoResourcePath.toOSString()
+ + "' does not exist or is not writeable.");
+ }
+ final IPath applicationPath = applicationName != null ? repoResourcePath.append(new Path(
+ applicationName)) : null;
+ if (applicationPath != null && applicationPath.toFile().exists()) {
+ return OpenShiftUIActivator.createErrorStatus(
+ NLS.bind("The location \"{0}\" already contains a folder named \"{1}\"",
+ repoResourcePath.toOSString(), applicationName));
+ }
}
- final IPath applicationPath = applicationName != null ? repoResourcePath.append(new Path(applicationName)) : null;
- if (applicationPath != null && applicationPath.toFile().exists()) {
- return OpenShiftUIActivator.createErrorStatus(
- NLS.bind("The location \"{0}\" already contains a folder named \"{1}\"",
- repoResourcePath.toOSString(), applicationName));
- }
- }
return ValidationStatus.ok();
}
13 years, 6 months
JBoss Tools SVN: r43855 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2012-09-20 05:14:56 -0400 (Thu, 20 Sep 2012)
New Revision: 43855
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java
Log:
Added wait for projects to load.
Modified: 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 2012-09-20 09:11:22 UTC (rev 43854)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java 2012-09-20 09:14:56 UTC (rev 43855)
@@ -3,6 +3,7 @@
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.waits.ICondition;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
@@ -49,12 +50,14 @@
private void loadProjectsFromFolder() {
getBot().text(0).setText(projectPath);
KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
+ getBot().waitUntil(new ProjectIsLoaded());
}
private void loadProjectsFromZIP() {
getBot().radio("Select archive file:").click();
getBot().text(1).setText(zipFilePath);
KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
+ getBot().waitUntil(new ProjectIsLoaded());
}
private void selectProjects() {
@@ -114,4 +117,24 @@
private SWTBot getBot(){
return SWTBotFactory.getBot();
}
+
+ private class ProjectIsLoaded implements ICondition {
+
+ private SWTBotTree tree;
+
+ @Override
+ public boolean test() {
+ return tree.hasItems();
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return "At least one project is loaded";
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ tree = getBot().treeWithLabel("Projects:");
+ }
+ }
}
13 years, 6 months
JBoss Tools SVN: r43851 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2012-09-20 04:36:48 -0400 (Thu, 20 Sep 2012)
New Revision: 43851
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
Log:
Wait for the web page to appear
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java 2012-09-20 07:33:57 UTC (rev 43850)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java 2012-09-20 08:36:48 UTC (rev 43851)
@@ -6,6 +6,7 @@
import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
import org.jboss.tools.ui.bot.ext.view.ServersView;
import org.junit.Test;
@@ -73,6 +74,6 @@
private void assertWebPageContains(String string) {
serversView.openWebPage(configuredState.getServer().name);
- assertThat(string, new PageSourceMatcher());
+ assertThat(string, new PageSourceMatcher(TaskDuration.NORMAL));
}
}
13 years, 6 months