selenium-driver/src/com/yahoo/platform/yui/selenium/FileGenerator.java @@ -10,12 +10,7 @@ package com.yahoo.platform.yui.selenium; import com.thoughtworks.selenium.DefaultSelenium; import com.thoughtworks.selenium.Selenium; -import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.text.SimpleDateFormat; -import java.util.Date; +import com.thoughtworks.selenium.SeleniumException; import java.util.HashMap; import java.util.Properties; @@ -176,6 +171,11 @@ public class SeleniumDriver { coverage = selenium.getEval(testCoverage); name = selenium.getEval(testName); + } catch (SeleniumException ex){ + + //probably not a valid page + throw new Exception("Selenium failed with message: " + ex.getMessage() + ". Check the test URL " + url + " to ensure it is valid.", ex); + } catch (Exception ex){ //TODO: What should happen here? Default file generation? throw ex; @@ -184,63 +184,21 @@ public class SeleniumDriver { selenium.stop(); } } + + //save the results try { + FileGenerator generator = new FileGenerator(properties, verbose); //output the reports - outputToFile(name, results, "results", browser); + generator.generate(name, results, "results", browser); if (!coverage.equals("null")){ - outputToFile(name, coverage, "coverage", browser); + generator.generate(name, coverage, "coverage", browser); } } catch (Exception ex){ //what to do? throw ex; } - } - - private void outputToFile(String name, String results, String type, String browser) throws Exception { - String dirname = properties.getProperty(type + ".outputdir"); - String filenameFormat = properties.getProperty(type + ".filename"); - - if (dirname == null){ - throw new Exception("Missing '" + type + ".outputdir' configuration parameter."); - } - - if (filenameFormat == null){ - throw new Exception("Missing '" + type + ".outputdir' configuration parameter."); - } - - //format filename - String filename = filenameFormat.replace("{browser}", browser.replace("*", "")).replace("{name}", name).trim(); - - int pos = filename.indexOf("{date:"); - - if (pos > -1){ - - int endpos = filename.indexOf("}", pos); - String format = filename.substring(pos + 6, endpos); - - //get the format - Date now = new Date(); - SimpleDateFormat formatter = new SimpleDateFormat(format); - - //insert into filename - filename = filename.replace("{date:" + format + "}", formatter.format(now)); - } - - filename = filename.replaceAll("[^a-zA-Z0-9\\.\\-]", "_").replaceAll("_+", "_"); - - if (verbose){ - System.err.println("[INFO] Outputting " + type + " to " + dirname + File.separator + filename); - } - - //output to file - Writer out = new OutputStreamWriter(new FileOutputStream(dirname + File.separator + filename), "UTF-8"); - out.write(results); - out.close(); - - } - - + } private void getURLsAndBrowsers() throws Exception { selenium-driver/src/com/yahoo/platform/yui/selenium/SeleniumDriver.java @@ -25,6 +25,7 @@ public class YUITestSeleniumDriver { CmdLineParser parser = new CmdLineParser(); CmdLineParser.Option verboseOpt = parser.addBooleanOption('v', "verbose"); CmdLineParser.Option helpOpt = parser.addBooleanOption('h', "help"); + CmdLineParser.Option errorOnFailOpt = parser.addBooleanOption("erroronfail"); CmdLineParser.Option confOpt = parser.addStringOption("conf"); CmdLineParser.Option hostOpt = parser.addStringOption("host"); CmdLineParser.Option portOpt = parser.addStringOption("port"); @@ -118,16 +119,17 @@ public class YUITestSeleniumDriver { usage(); System.exit(1); - } catch (IOException e) { + } catch (Exception e) { - e.printStackTrace(); + System.err.println("[ERROR] " + e.getMessage()); + //e.printStackTrace(); System.exit(1); - } catch (Exception e) { - - e.printStackTrace(); - // Return a special error code used specifically by the web front-end. - System.exit(2); +// } catch (Exception e) { +// +// e.printStackTrace(); +// // Return a special error code used specifically by the web front-end. +// System.exit(2); } finally { @@ -157,6 +159,8 @@ public class YUITestSeleniumDriver { + " -h, --help Displays this information.\n" + " --browsers <browsers> Run tests in these browseres (comma-delimited).\n" + " --conf <file> Load options from <file>.\n" + + " --erroronfail Indicates that a test failure should cause\n" + + " an error to be reported to the console.\n" + " --host <host> Use the Selenium host <host>.\n" + " --port <port> Use <port> port on the Selenium host.\n" + " --yuitest <version> The version of YUI Test to use (2 or 3).\n" selenium-driver/src/com/yahoo/platform/yui/selenium/YUITestSeleniumDriver.java @@ -17,8 +17,9 @@ results.outputdir = . coverage.outputdir = . #Filename format -#There are two variables: -# 1. {browser} to insert the browser name -# 2.{date:<format>}, where <format> is a SimpleDateFormat (http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html) +#There are some variables: +# 1.{browser} to insert the browser name +# 2.{name} to insert the name of the test (specified by TestRunner.setName() in JavaScript) +# 3.{date:<format>}, where <format> is a SimpleDateFormat (http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html) results.filename = test-{browser}-{name}-{date:yyyyMMddHHmmss}.xml coverage.filename = coverage-{browser}-{name}-{date:yyyyMMddHHmmss}.json selenium-driver/src/com/yahoo/platform/yui/selenium/default.properties a955382db28f225a020035ad685dfe96c792fbaa Nicholas nzakas@yahoo-inc.com http://github.com/nzakas/yuitest/commit/789d542c85849c80df4fd42f0812edc8dc25da56 789d542c85849c80df4fd42f0812edc8dc25da56 2009-11-06T12:30:22-08:00 2009-11-06T12:30:22-08:00 Better error handling/reporting 39055e881fde95a8f7db99fa147e005afe86cf92 Nicholas nzakas@yahoo-inc.com