[jbosstools-commits] JBoss Tools SVN: r39642 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test: diagram and 2 other directories.

Author: jpeterka Date: 2012-03-19 16:18:37 -0400 (Mon, 19 Mar 2012) New Revision: 39642 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/EditConsoleConfigurationTest.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/jpa/EditPersistenceXMLTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/mappingfile/EditMappingFileTest.java Log: HB bot tests minor configuration fixes (clear projects, prj settings, etc.) 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-03-19 20:16:58 UTC (rev 39641) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java 2012-03-19 20:18:37 UTC (rev 39642) @@ -10,6 +10,7 @@ import org.jboss.tools.hb.ui.bot.common.ConfigurationFile; 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.config.TestConfigurator; import org.jboss.tools.ui.bot.ext.gen.ActionItem; @@ -23,7 +24,7 @@ * @author jpeterka * */ -@Require(clearProjects = true) +@Require(db = @DB, clearProjects = true) public class CreateConsoleConfigurationTest extends HibernateBaseTest { final String prjName = "configurationtest"; @@ -63,7 +64,7 @@ private void createMainTab(SWTBotShell shell) { bot.cTabItem(IDELabel.HBConsoleWizard.MAIN_TAB).activate(); - bot.textWithLabel("Name:").setText(prjName + "-w"); + bot.textWithLabel("Name:").setText(prjName); bot.textWithLabelInGroup("","Configuration file:").setText(prjName + "/src/hibernate.cfg.xml"); } Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java 2012-03-19 20:16:58 UTC (rev 39641) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java 2012-03-19 20:18:37 UTC (rev 39642) @@ -1,5 +1,9 @@ package org.jboss.tools.hb.ui.bot.test.console; -public class EditConsoleConfigurationTest { +import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +@Require(clearProjects = true) +public class EditConsoleConfigurationTest extends HibernateBaseTest { + } 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-03-19 20:16:58 UTC (rev 39641) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java 2012-03-19 20:18:37 UTC (rev 39642) @@ -21,7 +21,9 @@ @Test public void showMappingDiagram() { - importTestProject("/resources/prj"); + importTestProject("/resources/prj/hibernatelib"); + importTestProject("/resources/prj/hibernate35"); + util.waitForAll(); openDiagram(); } Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java 2012-03-19 20:16:58 UTC (rev 39641) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java 2012-03-19 20:18:37 UTC (rev 39642) @@ -22,7 +22,7 @@ * @author jpeterka * */ -@Require(clearProjects = false, perspective="JPA") +@Require(clearProjects = true, perspective="JPA") public class EditPersistenceXMLTest 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/mappingfile/EditMappingFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/mappingfile/EditMappingFileTest.java 2012-03-19 20:16:58 UTC (rev 39641) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/mappingfile/EditMappingFileTest.java 2012-03-19 20:18:37 UTC (rev 39642) @@ -17,7 +17,7 @@ * @author jpeterka * */ -@Require(clearProjects = false) +@Require(clearProjects = true) public class EditMappingFileTest extends HibernateBaseTest { final String prj = "hibernate35";