[jbosstools-commits] JBoss Tools SVN: r41857 - in trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test: dialog and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Jun 11 09:50:37 EDT 2012
Author: jjankovi
Date: 2012-06-11 09:50:36 -0400 (Mon, 11 Jun 2012)
New Revision: 41857
Added:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/FolderCreatingDialog.java
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/ArchiveCreationDialogBase.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/ArchivePublishSettingsDialog.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
Log:
FolderCreatingDialog + tools to create folder for archive in view/explorer implemented
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java 2012-06-11 12:49:50 UTC (rev 41856)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/context/ArchiveContextMenu.java 2012-06-11 13:50:36 UTC (rev 41857)
@@ -15,6 +15,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog;
+import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
@@ -51,6 +52,15 @@
menu.click();
}
+ public FolderCreatingDialog createFolder(SWTBotTree tree,
+ SWTBotTreeItem item) {
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree, item);
+ SWTBotMenu menu = new SWTBotMenu(ContextMenuHelper.
+ getContextMenu(tree, "New Folder", false));
+ menu.click();
+ return new FolderCreatingDialog();
+ }
+
public EditArchiveDialog editArchive(SWTBotTree tree,
SWTBotTreeItem item) {
ContextMenuHelper.prepareTreeItemForContextMenu(tree, item);
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/ArchiveCreationDialogBase.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/ArchiveCreationDialogBase.java 2012-06-11 12:49:50 UTC (rev 41856)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/ArchiveCreationDialogBase.java 2012-06-11 13:50:36 UTC (rev 41857)
@@ -13,6 +13,7 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
/**
*
@@ -63,11 +64,11 @@
}
public void cancel() {
- bot.button("Cancel").click();
+ bot.button(IDELabel.Button.CANCEL).click();
}
public void finish() {
- bot.button("Finish").click();
+ bot.button(IDELabel.Button.FINISH).click();
SWTBotFactory.getUtil().waitForNonIgnoredJobs();
}
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/ArchivePublishSettingsDialog.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/ArchivePublishSettingsDialog.java 2012-06-11 12:49:50 UTC (rev 41856)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/ArchivePublishSettingsDialog.java 2012-06-11 13:50:36 UTC (rev 41857)
@@ -17,6 +17,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
/**
*
@@ -108,11 +109,11 @@
}
public void cancel() {
- bot.button("Cancel").click();
+ bot.button(IDELabel.Button.CANCEL).click();
}
public void finish() {
- bot.button("Finish").click();
+ bot.button(IDELabel.Button.FINISH).click();
SWTBotFactory.getUtil().waitForNonIgnoredJobs();
}
Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/FolderCreatingDialog.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/FolderCreatingDialog.java (rev 0)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/dialog/FolderCreatingDialog.java 2012-06-11 13:50:36 UTC (rev 41857)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012 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.archives.ui.bot.test.dialog;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+
+/**
+ *
+ * @author jjankovi
+ *
+ */
+public class FolderCreatingDialog {
+
+ private SWTBotShell shell = null;
+ private SWTBot bot = null;
+ private final String DIALOG_TITLE = "Create a folder";
+
+ public FolderCreatingDialog() {
+ shell = SWTBotFactory.getBot().shell(getDialogTitle());
+ bot = shell.bot();
+ }
+
+ private String getDialogTitle() {
+ return DIALOG_TITLE;
+ }
+
+ public FolderCreatingDialog setNameOfFolder(String fileName) {
+ bot.text().setText(fileName);
+ return this;
+ }
+
+ public void cancel() {
+ bot.button(IDELabel.Button.CANCEL).click();
+ }
+
+ public void ok() {
+ bot.button(IDELabel.Button.OK).click();
+ SWTBotFactory.getUtil().waitForNonIgnoredJobs();
+ }
+
+}
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-06-11 12:49:50 UTC (rev 41856)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-06-11 13:50:36 UTC (rev 41857)
@@ -17,6 +17,7 @@
import org.jboss.tools.archives.ui.bot.test.context.ArchiveContextMenu;
import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog;
+import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
import org.jboss.tools.ui.bot.ext.helper.TreeHelper;
@@ -55,6 +56,12 @@
contextTool.buildArchiveFull(tree, treeItem);
}
+ public FolderCreatingDialog createFolder(String archive) {
+ SWTBotTree tree = this.bot().tree();
+ SWTBotTreeItem treeItem = explorer.getNode(archive);
+ return contextTool.createFolder(tree, treeItem);
+ }
+
public EditArchiveDialog editArchive(String archive) {
SWTBotTree tree = this.bot().tree();
SWTBotTreeItem treeItem = explorer.getNode(archive);
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-06-11 12:49:50 UTC (rev 41856)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-06-11 13:50:36 UTC (rev 41857)
@@ -16,6 +16,7 @@
import org.jboss.tools.archives.ui.bot.test.context.ArchiveContextMenu;
import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog;
+import org.jboss.tools.archives.ui.bot.test.dialog.FolderCreatingDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.NewJarDialog;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.JBossToolsProjectarchives;
import org.jboss.tools.ui.bot.ext.helper.TreeHelper;
@@ -60,6 +61,12 @@
contextTool.buildArchiveFull(tree, treeItem);
}
+ public FolderCreatingDialog createFolder(String... pathToArchive) {
+ SWTBotTree tree = this.bot().tree();
+ SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
+ return contextTool.createFolder(tree, treeItem);
+ }
+
public EditArchiveDialog editArchive(String... pathToArchive) {
SWTBotTree tree = this.bot().tree();
SWTBotTreeItem treeItem = TreeHelper.expandNode(this.bot(), pathToArchive);
More information about the jbosstools-commits
mailing list