Author: jpeterka Date: 2011-12-09 06:06:31 -0500 (Fri, 09 Dec 2011) New Revision: 37158 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/PrepareDB.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/DatabaseHelper.java Log: [bot-ext] DB Helper expects embedded db data in db folder Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/PrepareDB.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/PrepareDB.java 2011-12-09 11:02:13 UTC (rev 37157) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/PrepareDB.java 2011-12-09 11:06:31 UTC (rev 37158) @@ -39,7 +39,7 @@ e.printStackTrace(); Assert.fail("Unable to copy driver" + e); } - DatabaseHelper.startHSQLDBServer("mydb", "xdb"); + DatabaseHelper.startHSQLDBServer("db" + File.separator + "mydb", "xdb"); } // Define Driver Entity and create driver Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/DatabaseHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/DatabaseHelper.java 2011-12-09 11:02:13 UTC (rev 37157) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/DatabaseHelper.java 2011-12-09 11:06:31 UTC (rev 37158) @@ -345,10 +345,10 @@ /** * Run HSQLDB database in server mode - * @param file - * @param dbname + * @param dbFilePath - hsqldb database file path + * @param dbname - database name */ - public static void startHSQLDBServer(final String file, final String dbname) { + public static void startHSQLDBServer(final String dbFilePath, final String dbname) { Thread hsqlThread = null; log.info("Starting HSQLDB..."); try { @@ -360,7 +360,7 @@ Runnable runable = new Runnable() { public void run() { - Server.main(new String[] {"-database.0","file:" + file,"-dbname.0",dbname }); + Server.main(new String[] {"-database.0","file:" + dbFilePath,"-dbname.0",dbname }); } };