JBoss Tools SVN: r44400 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-10-10 04:33:15 -0400 (Wed, 10 Oct 2012)
New Revision: 44400
Added:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ActiveEditorHasTitleCondition.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
Log:
Fixes for JBT 4.0.0.Alpha2
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java 2012-10-10 08:28:05 UTC (rev 44399)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java 2012-10-10 08:33:15 UTC (rev 44400)
@@ -6,6 +6,7 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotStyledText;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JSF2AttributeRenameTest extends JSF2AbstractRefactorTest {
@@ -82,6 +83,7 @@
delay();
tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.shell(IDELabel.Shell.CONFIRM_DELETE).activate();
bot.button("OK").click(); //$NON-NLS-1$
delay();
super.tearDown();
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-10-10 08:28:05 UTC (rev 44399)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-10-10 08:33:15 UTC (rev 44400)
@@ -194,14 +194,13 @@
0);
String textToInsert = "<ez:";
compositeComponentContainerEditor.insertText(textToInsert);
- SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot,
+ // Check content assist "<ez:"
+ ContentAssistHelper.applyContentAssistAutoProposal(SWTTestExt.bot,
JSF2_TEST_PAGE,
- textToInsert,
- textToInsert.length(),
- 0,
- 0);
- // Check content assist menu content for "<ez:"
- contentAssist.checkContentAssist("ez:input", true);
+ textToInsert,
+ textToInsert.length(),
+ 0,
+ 0);
bot.sleep(Timing.time2S());
compositeComponentContainerEditor.save();
String currentLineText = compositeComponentContainerEditor.getTextOnCurrentLine();
Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2012-10-10 08:28:05 UTC (rev 44399)
+++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2012-10-10 08:33:15 UTC (rev 44400)
@@ -37,6 +37,7 @@
private static int sleepTime = 1000;
private Logger log = Logger.getLogger(JBTSWTBotTestCase.class);
private HashSet<String> ignoredExceptionsFromEclipseLog = new HashSet<String>();
+ private boolean acceptExceptionsFromEclipseLog = false;
/*
* (non-Javadoc) This static block read properties from
* org.jboss.tools.ui.bot.test/resources/SWTBot.properties file and set up
@@ -74,20 +75,22 @@
public void logging(IStatus status, String plugin) {
switch (status.getSeverity()) {
case IStatus.ERROR:
- Throwable throwable = status.getException();
- if (throwable == null){
- if (!ignoredExceptionsFromEclipseLog.contains("null")) {
- throwable = new Throwable(status.getMessage() + " in " //$NON-NLS-1$
- + status.getPlugin());
- }
+ if (acceptExceptionsFromEclipseLog) {
+ Throwable throwable = status.getException();
+ if (throwable == null) {
+ if (!ignoredExceptionsFromEclipseLog.contains("null")) {
+ throwable = new Throwable(status.getMessage() + " in " //$NON-NLS-1$
+ + status.getPlugin());
+ }
+ } else {
+ // Check if exception has to be ignored
+ if (ignoredExceptionsFromEclipseLog.contains(throwable
+ .getClass().getCanonicalName())) {
+ throwable = null;
+ }
+ }
+ setException(throwable);
}
- else {
- // Check if exception has to be ignored
- if (ignoredExceptionsFromEclipseLog.contains(throwable.getClass().getCanonicalName())){
- throwable = null;
- }
- }
- setException(throwable);
break;
default:
break;
@@ -420,4 +423,23 @@
protected void eraseIgnoredExceptionsFromEclipseLog(){
ignoredExceptionsFromEclipseLog.clear();
}
+ /**
+ * Disables catching exceptions from Eclipse log
+ */
+ protected void ignoreAllExceptionsFromEclipseLog(){
+ acceptExceptionsFromEclipseLog = false;
+ }
+ /**
+ * Reenables catching exceptions from Eclipse log
+ */
+ protected void catchExceptionsFromEclipseLog(){
+ acceptExceptionsFromEclipseLog = true;
+ }
+ /**
+ * Returns true when exceptions from Eclipse log are catched
+ * @return
+ */
+ protected boolean isAcceptExceptionsFromEclipseLog(){
+ return acceptExceptionsFromEclipseLog;
+ }
}
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ActiveEditorHasTitleCondition.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ActiveEditorHasTitleCondition.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ActiveEditorHasTitleCondition.java 2012-10-10 08:33:15 UTC (rev 44400)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/package org.jboss.tools.ui.bot.ext.condition;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.waits.ICondition;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+
+/**
+ * Returns true when active editor has required title.
+ *
+ * @author Vlado Pakan
+ *
+ */
+public class ActiveEditorHasTitleCondition implements ICondition {
+
+ private String editorTitle;
+ private SWTBotExt botExt;
+
+ public ActiveEditorHasTitleCondition(SWTBotExt botExt,String shellTitle) {
+ super();
+ this.editorTitle = shellTitle;
+ this.botExt = botExt;
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ // empty
+ }
+
+ @Override
+ public boolean test() throws Exception {
+ return (botExt.activeEditor() != null && editorTitle.equals(botExt.activeEditor().getTitle()));
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return "Active editor doesn't have title:\n" + editorTitle
+ + "\nbut it has title:\n" + (botExt.activeEditor() == null ? "<null>" : botExt.activeEditor().getTitle());
+ }
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ActiveEditorHasTitleCondition.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java 2012-10-10 08:28:05 UTC (rev 44399)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContentAssistHelper.java 2012-10-10 08:33:15 UTC (rev 44400)
@@ -168,4 +168,30 @@
return editor;
}
+ /**
+ * Applies Content Assist auto proposal. It's case when there is only one
+ * content assist item and that item is automatically inserted into editor
+ * @param editorTitle
+ * @param textToSelect
+ * @param selectionOffset
+ * @param selectionLength
+ * @param textToSelectIndex
+ */
+ public static SWTBotEditor applyContentAssistAutoProposal(SWTBotExt bot,
+ String editorTitle, String textToSelect, int selectionOffset,
+ int selectionLength, int textToSelectIndex) {
+
+ SWTJBTExt.selectTextInSourcePane(bot,
+ editorTitle, textToSelect, selectionOffset, selectionLength,
+ textToSelectIndex);
+
+ bot.sleep(Timing.time1S());
+
+ SWTBotEditorExt editor = SWTTestExt.bot.swtBotEditorExtByTitle(editorTitle);
+ ContentAssistBot contentAssist = editor.contentAssist();
+ contentAssist.invokeContentAssist();
+
+ return editor;
+
+ }
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2012-10-10 08:28:05 UTC (rev 44399)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2012-10-10 08:33:15 UTC (rev 44400)
@@ -20,10 +20,12 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.results.VoidResult;
+import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.condition.ActiveEditorHasTitleCondition;
/**
* Helper for Open On functionality testing
@@ -52,7 +54,7 @@
editorTitle, textToSelect, selectionOffset, selectionLength,
textToSelectIndex);
- bot.sleep(Timing.time1S());
+ bot.sleep(Timing.time3S());
sourceEditor.setFocus();
// process UI Events
@@ -61,7 +63,7 @@
public void run() {
}
});
- bot.sleep(Timing.time1S());
+ bot.sleep(Timing.time3S());
new SWTUtilExt(bot).waitForNonIgnoredJobs();
KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_F3);
@@ -73,6 +75,12 @@
});
bot.sleep(Timing.time3S());
new SWTUtilExt(bot).waitForNonIgnoredJobs();
+
+ try{
+ bot.waitUntil(new ActiveEditorHasTitleCondition(bot,expectedOpenedFileName), Timing.time10S());
+ } catch (TimeoutException toe){
+ // do nothing next assert below will check if active editor is the correct one
+ }
openedEditor = bot.activeEditor();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-10-10 08:28:05 UTC (rev 44399)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-10-10 08:33:15 UTC (rev 44400)
@@ -23,7 +23,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
@@ -346,12 +345,7 @@
while (isUnuseDialogOpened()) {
closeUnuseDialogs();
}
- List<? extends SWTBotEditor> editors = bot.editors();
- if (editors != null) {
- for (int i = 0; i < editors.size(); i++) {
- editors.get(i).close();
- }
- }
+ bot.closeAllEditors();
}
/**
12 years, 3 months
JBoss Tools SVN: r44399 - trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences.
by jbosstools-commits＠lists.jboss.org
Author: psuchy
Date: 2012-10-10 04:28:05 -0400 (Wed, 10 Oct 2012)
New Revision: 44399
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java
Log:
Test debugging on jenkins (MacOS)
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-10-10 08:08:50 UTC (rev 44398)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-10-10 08:28:05 UTC (rev 44399)
@@ -1,5 +1,6 @@
package org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.jboss.reddeer.eclipse.jface.preference.PreferencePage;
import org.jboss.reddeer.swt.api.Table;
import org.jboss.reddeer.swt.condition.JobIsRunning;
@@ -29,10 +30,16 @@
public SearchingForRuntimesDialog addPath(final String path){
RuntimeUIActivator.getDefault().getModel().addRuntimePath(new RuntimePath(path));
-
+ new WaitWhile(new JobIsRunning());
cancel();
new WaitWhile(new JobIsRunning());
- open();
+ try{
+ open();
+ }catch(WidgetNotAvailableException ex){
+ new WaitWhile(new JobIsRunning());
+ open();
+ }
+ new WaitWhile(new JobIsRunning());
return new SearchingForRuntimesDialog();
}
12 years, 3 months
JBoss Tools SVN: r44398 - trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences.
by jbosstools-commits＠lists.jboss.org
Author: psuchy
Date: 2012-10-10 04:08:50 -0400 (Wed, 10 Oct 2012)
New Revision: 44398
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java
Log:
Test debugging on jenkins (MacOS)
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-10-10 07:26:58 UTC (rev 44397)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-10-10 08:08:50 UTC (rev 44398)
@@ -31,6 +31,7 @@
RuntimeUIActivator.getDefault().getModel().addRuntimePath(new RuntimePath(path));
cancel();
+ new WaitWhile(new JobIsRunning());
open();
return new SearchingForRuntimesDialog();
}
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-10-10 07:26:58 UTC (rev 44397)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-10-10 08:08:50 UTC (rev 44398)
@@ -56,11 +56,14 @@
try {
Robot robot = new Robot();
robot.setAutoWaitForIdle(true);
+
+ //↓ Windows loses focus on native dialog - using mouse click
Toolkit tools = Toolkit.getDefaultToolkit();
Dimension dim = tools.getScreenSize();
robot.mouseMove(((int)dim.getWidth())/2,((int)dim.getHeight()/2 - 60));
robot.mousePress(MouseEvent.BUTTON1_MASK);
robot.mouseRelease(MouseEvent.BUTTON1_MASK);
+
robot.keyPress(KeyEvent.VK_ENTER);
robot.keyRelease(KeyEvent.VK_ENTER);
} catch (AWTException e) {
12 years, 3 months
JBoss Tools SVN: r44397 - trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-10-10 03:26:58 -0400 (Wed, 10 Oct 2012)
New Revision: 44397
Modified:
trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java
Log:
Split "menu" chain to have better error feedback on which dereference is the error
Modified: trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java 2012-10-10 07:01:51 UTC (rev 44396)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java 2012-10-10 07:26:58 UTC (rev 44397)
@@ -18,6 +18,7 @@
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.eclipse.swtbot.swt.finder.waits.ICondition;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -42,7 +43,8 @@
@Test
public void testInstall() throws Exception {
- this.bot.menu("Help").menu("JBoss Central").click();
+ SWTBotMenu helpMenu = this.bot.menu("Help");
+ helpMenu.menu("JBoss Central").click();
SWTBotMultiPageEditor centralEditor = (SWTBotMultiPageEditor) this.bot.multipageEditorByTitle("JBoss Central");
centralEditor.show();
centralEditor.activatePage("Software/Update");
12 years, 3 months
JBoss Tools SVN: r44396 - in trunk/archives/tests/org.jboss.tools.archives.ui.bot.test: src/org/jboss/tools/archives/ui/bot/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-10-10 03:01:51 -0400 (Wed, 10 Oct 2012)
New Revision: 44396
Added:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/JenkinsTestSuite.java
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java
Log:
adding tests to stable jenkins suite
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml 2012-10-10 06:30:43 UTC (rev 44395)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml 2012-10-10 07:01:51 UTC (rev 44396)
@@ -15,6 +15,7 @@
<emma.instrument.bundles>org.jboss.ide.eclipse.archives.ui</emma.instrument.bundles>
<additionalSystemProperties></additionalSystemProperties>
<systemProperties>${additionalSystemProperties} -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties>
+ <suiteClass>org.jboss.tools.archives.ui.bot.test.ArchivesAllBotTests</suiteClass>
</properties>
<profiles>
<profile>
@@ -23,6 +24,12 @@
<additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</additionalSystemProperties>
</properties>
</profile>
+ <profile>
+ <id>jenkins</id>
+ <properties>
+ <suiteClass>org.jboss.tools.archives.ui.bot.test.JenkinsTestSuite</suiteClass>
+ </properties>
+ </profile>
</profiles>
<build>
<plugins>
@@ -55,7 +62,7 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<testSuite>org.jboss.tools.archives.ui.bot.test</testSuite>
- <testClass>org.jboss.tools.archives.ui.bot.test.ArchivesAllBotTests</testClass>
+ <testClass>${suiteClass}</testClass>
<useUIThread>false</useUIThread>
<skip>${swtbot.test.skip}</skip>
<dependencies combine.children="append">
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java 2012-10-10 06:30:43 UTC (rev 44395)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java 2012-10-10 07:01:51 UTC (rev 44396)
@@ -161,7 +161,7 @@
ArchivePublishSettingsDialog dialog = getDialog(publishContextMenu,
view, explorer, returnDialog, archivePath);
- dialog.selectServers(configuredState.getServer().name + " Server");
+ dialog.selectServers(configuredState.getServer().name);
if (alwaysPublish) dialog.checkAlwaysPublish();
if (autodeploy) dialog.checkAutoDeploy();
dialog.finish();
Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/JenkinsTestSuite.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/JenkinsTestSuite.java (rev 0)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/JenkinsTestSuite.java 2012-10-10 07:01:51 UTC (rev 44396)
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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;
+
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Suite of tests executed on jenkins slave
+ * @author Jaroslav Jankovic
+ */
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({
+ ViewIsPresentTest.class,
+ VariousProjectsArchiving.class,
+ ArchiveViewReSwitchingTest.class,
+ BuildingArchiveNode.class,
+ BuildingProjectTest.class,
+ CreatingArchiveTest.class,
+
+ /** Not stable yet
+
+ FolderTest.class,
+ FilesetTest.class,
+ UserLibrariesFilesetTest.class,
+ ArchivesSupportTest.class,
+
+ DeletingArchiveTest.class,
+ ModifyingArchiveTest.class,
+ DeployingArchiveTest.class,
+
+ **/
+})
+public class JenkinsTestSuite {
+
+}
12 years, 3 months
JBoss Tools SVN: r44395 - in trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test: tutorial and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-10-10 02:30:43 -0400 (Wed, 10 Oct 2012)
New Revision: 44395
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/JenkinsTestSuite.java
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
Log:
adding tests to stable jenkins suite
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/JenkinsTestSuite.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/JenkinsTestSuite.java 2012-10-10 04:27:55 UTC (rev 44394)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/JenkinsTestSuite.java 2012-10-10 06:30:43 UTC (rev 44395)
@@ -1,6 +1,9 @@
package org.jboss.tools.struts.ui.bot.test;
import org.jboss.tools.struts.ui.bot.test.smoke.CreateNewStrutsProjectTest;
+import org.jboss.tools.struts.ui.bot.test.smoke.ImportStrutsProjectTest;
+import org.jboss.tools.struts.ui.bot.test.smoke.RenameStrutsConfigXmlFile;
+import org.jboss.tools.struts.ui.bot.test.smoke.RenameTldFile;
import org.jboss.tools.struts.ui.bot.test.smoke.RunStrutsProjectOnServer;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
@@ -15,6 +18,16 @@
@SuiteClasses({
CreateNewStrutsProjectTest.class,
RunStrutsProjectOnServer.class,
+ ImportStrutsProjectTest.class,
+ RenameStrutsConfigXmlFile.class,
+ RenameTldFile.class,
+
+ /** Not stable yet
+
+ AddRemoveStrutsCapabilities.class,
+ TutorialTest.class,
+
+ **/
})
public class JenkinsTestSuite {
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2012-10-10 04:27:55 UTC (rev 44394)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2012-10-10 06:30:43 UTC (rev 44395)
@@ -342,7 +342,7 @@
Assert.assertTrue(browser.getText().contains("Input name:"));
} catch (WidgetNotFoundException wnfe) {
bot.shell("Warning").bot().button(IDELabel.Button.CLOSE).click();
- fail("Warning dialog shows when deploying app - known issue JBIDE-11306");
+ fail("Warning dialog shows when deploying app");
}
}
12 years, 3 months
JBoss Tools SVN: r44394 - trunk/build/publish.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-10 00:27:55 -0400 (Wed, 10 Oct 2012)
New Revision: 44394
Modified:
trunk/build/publish/publish.sh
Log:
update comments in publish script
Modified: trunk/build/publish/publish.sh
===================================================================
--- trunk/build/publish/publish.sh 2012-10-10 04:27:09 UTC (rev 44393)
+++ trunk/build/publish/publish.sh 2012-10-10 04:27:55 UTC (rev 44394)
@@ -171,16 +171,11 @@
fi
foundSourcesZip=0
-# for now, put the JBDS sources into the /installer/ folder
+# put the JBDS sources into the /installer/ folder
for z in $(find ${WORKSPACE}/sources/product/sources/target -type f -name "jbdevstudio-product-sources-*.zip"); do
for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
mkdir -p ${STAGINGDIR}/installer/
rsync -aq $z ${z}.MD5 ${STAGINGDIR}/installer/
- # [fix for DEPRECATED PDE installer build] provide symlink so that the .product build can find the sources zip using a generic name, where SRCSNAME = ${JOB_NAME}-Sources-${ZIPSUFFIX}.zip
- #mkdir -p ${STAGINGDIR}/all; pushd ${STAGINGDIR}/all >/dev/null
- #ln -s ../installer/${z##*/} ${SRCSNAME}
- #ln -s ../installer/${z##*/}.MD5 ${SRCSNAME}.MD5
- #popd >/dev/null
foundSourcesZip=1
done
if [[ $foundSourcesZip -eq 0 ]]; then
12 years, 3 months
JBoss Tools SVN: r44392 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-10-09 21:16:04 -0400 (Tue, 09 Oct 2012)
New Revision: 44392
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
Log:
Fixed the typo
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-10-10 01:04:48 UTC (rev 44391)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-10-10 01:16:04 UTC (rev 44392)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.esb.ui.bot.tests;
-#import org.jboss.tools.esb.ui.bot.tests.examples.SimpleMylyn;
+//import org.jboss.tools.esb.ui.bot.tests.examples.SimpleMylyn;
import org.jboss.tools.esb.ui.bot.tests.examples.HelloWorld;
import org.jboss.tools.esb.ui.bot.tests.examples.HelloWorldAction;
import org.jboss.tools.esb.ui.bot.tests.examples.HelloWorldFileAction;
12 years, 3 months
JBoss Tools SVN: r44391 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-10-09 21:04:48 -0400 (Tue, 09 Oct 2012)
New Revision: 44391
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
Log:
Removed broken import statement
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-10-10 00:43:45 UTC (rev 44390)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-10-10 01:04:48 UTC (rev 44391)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.esb.ui.bot.tests;
-import org.jboss.tools.esb.ui.bot.tests.examples.SimpleMylyn;
+#import org.jboss.tools.esb.ui.bot.tests.examples.SimpleMylyn;
import org.jboss.tools.esb.ui.bot.tests.examples.HelloWorld;
import org.jboss.tools.esb.ui.bot.tests.examples.HelloWorldAction;
import org.jboss.tools.esb.ui.bot.tests.examples.HelloWorldFileAction;
@@ -32,6 +32,7 @@
CreateRuntimeFromSOA.class,
NewProjectUsingRuntime.class,
NewProjectUsingBundledInEAP.class,
+// SimpleMylyn.class
Editing.class,
HelloWorld.class,
HelloWorldAction.class,
12 years, 3 months