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 {
+
+}