Author: jpeterka Date: 2012-10-04 07:26:42 -0400 (Thu, 04 Oct 2012) New Revision: 44287 Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/CreateCodeGenerationConfiguration.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPADDLGenerationTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPAEntitiesGenerationTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/RunSchemaExportTest.java Log: Workarounds for JBIDE-12796 in hb ui bot JPA generation tests Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/CreateCodeGenerationConfiguration.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/CreateCodeGenerationConfiguration.java 2012-10-04 11:24:53 UTC (rev 44286) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/CreateCodeGenerationConfiguration.java 2012-10-04 11:26:42 UTC (rev 44287) @@ -14,7 +14,8 @@ /** * Hibernate code generation configuration ui bot test - * + * - Code generation configuration can be created + * - Source code can be generated via hibernate generation configuration * @author jpeterka * */ Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPADDLGenerationTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPADDLGenerationTest.java 2012-10-04 11:24:53 UTC (rev 44286) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPADDLGenerationTest.java 2012-10-04 11:26:42 UTC (rev 44287) @@ -11,6 +11,11 @@ import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; +/** + * JPA Entities can be exported into database + * @author jpeterka + * + */ @Require(db = @DB, clearProjects = true, perspective = "JPA") public class JPADDLGenerationTest extends HibernateBaseTest { @@ -20,6 +25,7 @@ @Test public void jpaDDLGenerationTest() { + importTestProject("/resources/prj/hibernatelib"); importTestProject("/resources/prj/" + prj); createHBConfigurationAndSetPersistence(); generateDDLFromEntities(); @@ -28,24 +34,33 @@ private void createHBConfigurationAndSetPersistence() { ConfigurationFile.create(new String[]{prj,"src"}, hbcfg,false); PersistenceXML.openPersistenceXML(prj); - PersistenceXML.setHibernateConfiguration("/" + hbcfg); + PersistenceXML.setHibernateConfiguration(hbcfg); } private void generateDDLFromEntities() { // Select project SWTBotView viewBot = bot.viewByTitle(IDELabel.View.PROJECT_EXPLORER); SWTBotTree tree = viewBot.bot().tree().select(prj); - + // JPA Tools -> Generate Tables From Entities - ContextMenuHelper.clickContextMenu(tree, "JPA Tools", + // workaround for https://issues.jboss.org/browse/JBIDE-12796 + try { + ContextMenuHelper.clickContextMenu(tree, "JPA Tools", "Generate Tables from Entities..."); + } + catch(Exception e) { + ContextMenuHelper.clickContextMenu(tree, "JPA Tools", + "Generate Tables from Entities..."); + } + // DDL Generation Dialog String outputDir = prj + "/" + out; bot.textWithLabel("Output directory:").setText(outputDir); bot.textWithLabel("File name").setText(out); - bot.button(IDELabel.Button.FINISH).click(); + // temporarily disabled until fixe db harming + // bot.button(IDELabel.Button.FINISH).click(); } } Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPAEntitiesGenerationTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPAEntitiesGenerationTest.java 2012-10-04 11:24:53 UTC (rev 44286) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/JPAEntitiesGenerationTest.java 2012-10-04 11:26:42 UTC (rev 44287) @@ -36,13 +36,20 @@ SWTBotTree tree = viewBot.bot().tree().select(prj); // JPA Tools -> Generate Tables From Entities - ContextMenuHelper.clickContextMenu(tree, "JPA Tools", - "Generate Tables from Entities..."); + // workaround for https://issues.jboss.org/browse/JBIDE-12796 + try { + ContextMenuHelper.clickContextMenu(tree, "JPA Tools", + "Generate Entities from Tables..."); + } + catch(Exception e) { + ContextMenuHelper.clickContextMenu(tree, "JPA Tools", + "Generate Entities from Tables..."); + } // DDL Generation Dialog String outputDir = prj + "/" + out; bot.textWithLabel("Output directory:").setText(outputDir); - bot.textWithLabel("File name").setText(out); + bot.textWithLabel("Package:").setText("org.gen"); bot.button(IDELabel.Button.FINISH).click(); } Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/RunSchemaExportTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/RunSchemaExportTest.java 2012-10-04 11:24:53 UTC (rev 44286) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/generation/RunSchemaExportTest.java 2012-10-04 11:26:42 UTC (rev 44287) @@ -43,9 +43,11 @@ String title = "Run SchemaExport"; bot.waitUntil(shellIsActive(title )); SWTBotShell shell = bot.shell(title); - shell.bot().button(IDELabel.Button.YES).click(); - bot.waitUntil(shellCloses(shell)); + // temporarily disabled until avoid db harm + // shell.bot().button(IDELabel.Button.YES).click(); + // bot.waitUntil(shellCloses(shell)); + //SWTBotTreeItem selectNode = ConsoleConfiguration.selectNode(hc,"Configuration","Database","Public"); //assertTrue(selectNode.getNodes().size() != 0); }