Author: jpeterka Date: 2012-04-24 05:41:46 -0400 (Tue, 24 Apr 2012) New Revision: 40444 Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAEntityTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAProjectTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/validation/AnnotationValidationTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/view/PackageInfoTest.java Log: Tests @require section fixed in hb ui bot test Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java 2012-04-24 09:39:33 UTC (rev 40443) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java 2012-04-24 09:41:46 UTC (rev 40444) @@ -11,7 +11,7 @@ * @author jpeterka * */ -@Require +@Require(clearProjects = true) public class CreateConfigurationFileTest extends HibernateBaseTest { @Test Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java 2012-04-24 09:39:33 UTC (rev 40443) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java 2012-04-24 09:41:46 UTC (rev 40444) @@ -35,6 +35,7 @@ importTestProject("/resources/prj/" + prjName); createConfigurationFile(); createHibernateConsole(); + expandDatabaseInConsole(); checkErrorLog(); } @@ -57,9 +58,7 @@ bot.button(IDELabel.Button.FINISH).click(); bot.waitUntil(shellCloses(shell)); - util.waitForNonIgnoredJobs(); - - expandDatabaseInConsole(); + util.waitForNonIgnoredJobs(); } private void createMainTab(SWTBotShell shell) { Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java 2012-04-24 09:39:33 UTC (rev 40443) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java 2012-04-24 09:41:46 UTC (rev 40444) @@ -8,12 +8,15 @@ import org.jboss.tools.hb.ui.bot.common.ConfigurationFile; import org.jboss.tools.hb.ui.bot.common.ConsoleConfiguration; import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest; +import org.jboss.tools.ui.bot.ext.config.Annotations.DB; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.junit.Test; /* * Criteria editor hb ui bot test */ +@Require(db = @DB, clearProjects = true) public class CriteriaEditorTest extends HibernateBaseTest { final String console = "pre-hibernate40"; final String clazz = "Customers"; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java 2012-04-24 09:39:33 UTC (rev 40443) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java 2012-04-24 09:41:46 UTC (rev 40444) @@ -14,7 +14,7 @@ * @author jpeterka * */ -@Require(clearProjects = false, perspective = "Hibernate") +@Require(clearProjects = true, perspective = "Hibernate") public class MappingDiagramTest extends HibernateBaseTest { final String hc = "hibernate35"; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java 2012-04-24 09:39:33 UTC (rev 40443) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java 2012-04-24 09:41:46 UTC (rev 40444) @@ -8,9 +8,12 @@ import org.jboss.tools.hb.ui.bot.common.ConfigurationFile; import org.jboss.tools.hb.ui.bot.common.ConsoleConfiguration; import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest; +import org.jboss.tools.ui.bot.ext.config.Annotations.DB; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.junit.Test; +@Require(db = @DB, clearProjects = true) public class HQLEditorTest extends HibernateBaseTest { final String console = "pre-hibernate40"; final String clazz = "Customer"; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAEntityTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAEntityTest.java 2012-04-24 09:39:33 UTC (rev 40443) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAEntityTest.java 2012-04-24 09:41:46 UTC (rev 40444) @@ -6,6 +6,8 @@ import org.jboss.tools.hb.ui.bot.common.JPAEntity; import org.jboss.tools.hb.ui.bot.common.Tree; import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest; +import org.jboss.tools.ui.bot.ext.config.Annotations.DB; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.helper.StringHelper; import org.junit.Test; @@ -13,6 +15,7 @@ /** * Create JPA Entity ui bot test */ +@Require(db = @DB, clearProjects = true) public class CreateJPAEntityTest extends HibernateBaseTest { final String prj = "jpatest35"; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAProjectTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAProjectTest.java 2012-04-24 09:39:33 UTC (rev 40443) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAProjectTest.java 2012-04-24 09:41:46 UTC (rev 40444) @@ -13,7 +13,7 @@ * @author jpeterka * */ -@Require(clearProjects = false, perspective="JPA") +@Require(clearProjects = true, perspective="JPA") public class CreateJPAProjectTest extends HibernateBaseTest { final String prj = "jpa35test"; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/validation/AnnotationValidationTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/validation/AnnotationValidationTest.java 2012-04-24 09:39:33 UTC (rev 40443) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/validation/AnnotationValidationTest.java 2012-04-24 09:41:46 UTC (rev 40444) @@ -16,7 +16,7 @@ * @author jpeterka * */ -@Require(clearProjects = false, perspective = "JPA") +@Require(clearProjects = true, perspective = "JPA") public class AnnotationValidationTest extends HibernateBaseTest { final String prj = "jpatest40"; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/view/PackageInfoTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/view/PackageInfoTest.java 2012-04-24 09:39:33 UTC (rev 40443) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/view/PackageInfoTest.java 2012-04-24 09:41:46 UTC (rev 40444) @@ -9,11 +9,13 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.jboss.tools.hb.ui.bot.common.ProjectExplorer; import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.helper.StringHelper; import org.jboss.tools.ui.bot.ext.parts.SWTBotTwistie; import org.junit.Test; +@Require(clearProjects = true, perspective = "JPA") public class PackageInfoTest extends HibernateBaseTest { final String prj = "jpatest40"; final String pkg = "org.packageinfo";