Author: jjankovi Date: 2012-10-15 10:10:00 -0400 (Mon, 15 Oct 2012) New Revision: 44514 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/JenkinsTestSuite.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml Log: jenkins test suite created + supported by maven Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-10-15 13:29:09 UTC (rev 44513) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-10-15 14:10:00 UTC (rev 44514) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools.cdi</groupId> @@ -8,17 +9,49 @@ </parent> <groupId>org.jboss.tools.cdi.tests</groupId> <artifactId>org.jboss.tools.cdi.bot.test</artifactId> - + <packaging>eclipse-test-plugin</packaging> <properties> <additionalSystemProperties></additionalSystemProperties> - <systemProperties>${additionalSystemProperties} -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties> + <systemProperties>${additionalSystemProperties} + -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties> <surefire.timeout>10800</surefire.timeout> </properties> + <profiles> + <profile> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <id>all-bot-tests</id> + <properties> + <suiteClass>org.jboss.tools.cdi.bot.test.CDIAllBotTests</suiteClass> + </properties> + </profile> + <profile> + <id>smoke-bot-tests</id> + <properties> + <suiteClass>org.jboss.tools.cdi.bot.test.CDISmokeBotTests</suiteClass> + </properties> + </profile> + <profile> + <id>debug</id> + <properties> + <additionalSystemProperties>-Xdebug + -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</additionalSystemProperties> + </properties> + </profile> + <profile> + <id>jenkins</id> + <properties> + <suiteClass>org.jboss.tools.cdi.bot.test.JenkinsTestSuite</suiteClass> + </properties> + </profile> + </profiles> + <build> <plugins> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.4</version> @@ -48,10 +81,11 @@ <artifactId>tycho-surefire-plugin</artifactId> <configuration> <testSuite>org.jboss.tools.cdi.bot.test</testSuite> - <testClass>${test.suite.class}</testClass> + <testClass>${suiteClass}</testClass> <useUIThread>false</useUIThread> <skip>${swtbot.test.skip}</skip> - <!-- Kill swt bot test take more than 3 hours minutes (10800 seconds) to finish --> + <!-- Kill swt bot test take more than 3 hours minutes (10800 seconds) + to finish --> <dependencies combine.children="append"> <dependency> <type>p2-installable-unit</type> @@ -68,34 +102,16 @@ <artifactId>org.jboss.tools.jsf.feature.feature.group</artifactId> <version>0.0.0</version> </dependency> + <!-- This entry should enable creating of default JDK on Mac --> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.jdt.feature.group</artifactId> + <version>0.0.0</version> + </dependency> </dependencies> </configuration> </plugin> </plugins> </build> - - <profiles> - <profile> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <id>all-bot-tests</id> - <properties> - <test.suite.class>org.jboss.tools.cdi.bot.test.CDIAllBotTests</test.suite.class> - </properties> - </profile> - <profile> - <id>smoke-bot-tests</id> - <properties> - <test.suite.class>org.jboss.tools.cdi.bot.test.CDISmokeBotTests</test.suite.class> - </properties> - </profile> - <profile> - <id>debug</id> - <properties> - <additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</additionalSystemProperties> - </properties> - </profile> - </profiles> </project> Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/JenkinsTestSuite.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/JenkinsTestSuite.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/JenkinsTestSuite.java 2012-10-15 14:10:00 UTC (rev 44514) @@ -0,0 +1,61 @@ +/******************************************************************************* + * 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.cdi.bot.test; + +import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest; +import org.jboss.tools.cdi.bot.test.wizard.CDIWebProjectWizardTest; +import org.jboss.tools.cdi.bot.test.wizard.ConfigurationPresetTest; +import org.jboss.tools.cdi.bot.test.wizard.FacetTest; +import org.jboss.tools.cdi.bot.test.wizard.WizardTest; +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({ + ConfigurationPresetTest.class, + FacetTest.class, + CDIWebProjectWizardTest.class, + WizardTest.class, + BeansEditorTest.class, + + /** Not stable yet + + NamedRefactoringTest.class, + NamedComponentsSearchingTest.class, + BeansXMLValidationTest.class, + BeansXMLCompletionTest.class, + BeansXMLValidationQuickFixTest.class, +// AsYouTypeValidationTest.class, // not implemented yet + DecoratorFromWebBeanTest.class, + ProblemEligibleInjectionTest.class, + AllAssignableDialogTest.class, + AssignableDialogFilterTest.class, + QuickFixProposalsDescriptionTest.class, + StereotypeValidationQuickFixTest.class, + QualifierValidationQuickFixTest.class, + ScopeValidationQuickFixTest.class, + BeanValidationQuickFixTest.class, + InterceptorValidationQuickFixTest.class, + DecoratorValidationQuickFixTest.class, + IBindingValidationQuickFixTest.class, + OpenOnTest.class, + FindObserverForEventTest.class + + **/ +}) +public class JenkinsTestSuite { + +}