Author: jlukas(a)redhat.com Date: 2010-10-27 03:49:34 -0400 (Wed, 27 Oct 2010) New Revision: 26080 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CdiATWizardTest.launch trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java Log: fixed requirement for tests and some minor cleanup Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CdiATWizardTest.launch =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CdiATWizardTest.launch 2010-10-27 06:31:55 UTC (rev 26079) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/CdiATWizardTest.launch 2010-10-27 07:49:34 UTC (rev 26080) @@ -32,7 +32,7 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.cdi.bot.test"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Djava.library.path=/space/java/sdk/jdk1.6.0_20/jre/lib/i386/client:/space/java/sdk/jdk1.6.0_20/jre/lib/i386:/usr/lib/xulrunner-addons:/usr/lib/xulrunner-addons:/usr/java/packages/lib/i386:/lib:/usr/lib:/usr/lib/jni -Xms512m -Xmx1024m -Dswtbot.test.properties.file=/home/lukas/swtbot.properties -Dusage_reporting_enabled=false"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Djava.library.path=${env_var:JAVA_HOME}/jre/lib/i386/client:${env_var:JAVA_HOME}/jre/lib/i386:/usr/lib/xulrunner-addons:/usr/lib/xulrunner-addons:/usr/java/packages/lib/i386:/lib:/usr/lib:/usr/lib/jni -Xms512m -Xmx1024m -Dswtbot.test.properties.file=${env_var:HOME}/swtbot.properties -Dusage_reporting_enabled=false"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.epp.package.jee.product"/> <booleanAttribute key="show_selected_only" value="false"/> Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java 2010-10-27 06:31:55 UTC (rev 26079) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java 2010-10-27 07:49:34 UTC (rev 26080) @@ -12,18 +12,13 @@ import java.util.Arrays; import java.util.List; -import java.util.logging.Logger; import org.eclipse.swt.widgets.Button; import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; -import org.eclipse.swtbot.swt.finder.results.BoolResult; -import org.eclipse.swtbot.swt.finder.results.VoidResult; import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox; import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo; import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; public class CDIWizard extends Wizard { Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2010-10-27 06:31:55 UTC (rev 26079) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2010-10-27 07:49:34 UTC (rev 26080) @@ -38,7 +38,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; -@SWTBotTestRequires(perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = "<=")) +@SWTBotTestRequires(perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CdiATWizardTest.class }) public class CdiATWizardTest extends SWTTestExt {