Author: lzoubek(a)redhat.com Date: 2011-08-24 07:52:43 -0400 (Wed, 24 Aug 2011) New Revision: 34220 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java Log: swtbotext: do not load default config twice Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2011-08-24 11:51:53 UTC (rev 34219) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2011-08-24 11:52:43 UTC (rev 34220) @@ -82,8 +82,6 @@ public static Properties multiProperties = new Properties(); public static TestConfiguration currentConfig; static { - boolean loadDefault = true; - try { Pattern configMatch = Pattern.compile(""); try { @@ -121,7 +119,6 @@ log.info("Adding configuration file "+file.getName()); multiProperties.put(file.getName().replace(".properties", ""), file.getAbsolutePath()); } - loadDefault = false; } } else if (propFile != null) { if (new File(propFile).exists()) { @@ -136,33 +133,18 @@ multiProperties.put("Default", propFile); } - loadDefault = false; } else { throw new IOException(SWTBOT_TEST_PROPERTIES_FILE + " " + propFile + " does not exist!"); } } else { log.info("No configuration property passed, using default"); - multiProperties.put(SWTBOT_TEST_PROPERTIES_FILE, ""); + multiProperties.put("default", ""); } } catch (Exception ex) { ex.printStackTrace(); } - - if (loadDefault) { - // load default config by default - try { - log.info(" * Loading default configuration first"); - currentConfig = new TestConfiguration("default", ""); - - } catch (Exception e) { - // log only message, nothing - log.error(e.getMessage()); - } finally { - log.info(" * Defaults loaded"); - } - } log.info("Default Timing mulitiplier is set to "+Timing.multiplier); }