selenium-driver/src/com/yahoo/platform/yui/selenium/TestConfig.java selenium-driver/src/com/yahoo/platform/yui/selenium/TestConfigHandler.java selenium-driver/src/com/yahoo/platform/yui/selenium/TestPage.java selenium-driver/src/com/yahoo/platform/yui/selenium/TestPageGroup.java selenium-driver/src/com/yahoo/platform/yui/selenium/TestResult.java @@ -1,6 +1,9 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * YUI Test Selenium Driver + * Author: Nicholas C. Zakas <nzakas@yahoo-inc.com> + * Copyright (c) 2009, Yahoo! Inc. All rights reserved. + * Code licensed under the BSD License: + * http://developer.yahoo.net/yui/license.txt */ package com.yahoo.platform.yui.selenium; @@ -11,24 +14,51 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.Properties; /** - * - * @author nzakas + * Handles generating results files for a SeleniumDriver with the same set of + * properties. + * @author Nicholas C. Zakas */ public class FileGenerator { private boolean verbose = false; private Properties properties = null; - public FileGenerator(Properties properties, boolean verbose){ this.properties = properties; this.verbose = verbose; } - public void generate(String name, String results, String type, String browser) throws Exception { + public void generateAll(List<TestResult> results, Date timestamp) throws Exception { + for (int i=0; i < results.size(); i++){ + generateAll(results.get(i), timestamp); + } + } + + public void generateAll(TestResult[] results, Date timestamp) throws Exception { + for (int i=0; i < results.length; i++){ + generateAll(results[i], timestamp); + } + } + + public void generateAll(TestResult result, Date timestamp) throws Exception { + + //generate test results file + if (result.hasReport("results")){ + generate(result, "results", timestamp); + } + + //generate test coverage file + if (result.hasReport("coverage")){ + generate(result, "coverage", timestamp); + } + + } + + private void generate(TestResult result, String type, Date timestamp) throws Exception { String dirname = properties.getProperty(type + ".outputdir"); String filenameFormat = properties.getProperty(type + ".filename"); @@ -41,7 +71,7 @@ public class FileGenerator { } //format filename - String filename = filenameFormat.replace("{browser}", browser.replace("*", "")).replace("{name}", name).trim(); + String filename = filenameFormat.replace("{browser}", result.getBrowser().replace("*", "")).replace("{name}", result.getName()).trim(); int pos = filename.indexOf("{date:"); @@ -51,11 +81,10 @@ public class FileGenerator { 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.replace("{date:" + format + "}", formatter.format(timestamp)); } filename = filename.replaceAll("[^a-zA-Z0-9\\.\\-]", "_").replaceAll("_+", "_"); @@ -66,7 +95,7 @@ public class FileGenerator { //output to file Writer out = new OutputStreamWriter(new FileOutputStream(dirname + File.separator + filename), "UTF-8"); - out.write(results); + out.write(result.getReport(type)); out.close(); } selenium-driver/src/com/yahoo/platform/yui/selenium/FileGenerator.java @@ -11,7 +11,10 @@ package com.yahoo.platform.yui.selenium; import com.thoughtworks.selenium.DefaultSelenium; import com.thoughtworks.selenium.Selenium; import com.thoughtworks.selenium.SeleniumException; +import java.util.Date; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Properties; @@ -99,13 +102,19 @@ public class SeleniumDriver { public void start() throws Exception{ getURLsAndBrowsers(); - + + List<TestResult> results = new LinkedList<TestResult>(); + + //do the tests for(int i=0; i < urls.length; i++){ for (int j=0; j < browsers.length; j++){ - runTest(browsers[j], urls[i]); + results.add(runTest(browsers[j], urls[i])); } } - + + //output the results + FileGenerator generator = new FileGenerator(properties, verbose); + generator.generateAll(results, new Date()); } /** @@ -114,48 +123,67 @@ public class SeleniumDriver { * @param url The URL of the YUI Tests to run. * @throws java.lang.Exception */ - private void runTest(String browser, String url) throws Exception { - + private TestResult runTest(String browser, String url) throws Exception { + + Selenium selenium = null; + + try { + selenium = new DefaultSelenium(properties.getProperty(SELENIUM_HOST), + Integer.parseInt(properties.getProperty(SELENIUM_PORT)), browser, url); + + selenium.start(); + + return runTest(selenium, browser, url); + + } catch (Exception ex){ + //TODO: What should happen here? Default file generation? + throw ex; + } finally { + if (selenium != null){ + selenium.stop(); + } + } + } + + /** + * Runs a YUI Test url against a given browser. + * @param browser The Selenium browser to run against. + * @param url The URL of the YUI Tests to run. + * @throws java.lang.Exception + */ + private TestResult runTest(Selenium selenium, String browser, String url) throws Exception { + //basic YUI Test info String yuitestVersion = properties.getProperty("yuitest.version", "2"); String testRunner = jsWindow + "." + testRunners.get(yuitestVersion); String testFormat = jsWindow + "." + testFormats.get(yuitestVersion); String coverageFormat = jsWindow + "." + coverageFormats.get(yuitestVersion); - + //JS strings to use String testRunnerIsNotRunning = "!" + testRunner + ".isRunning()"; - String testResults = testRunner + ".getResults(" + testFormat + "." + + String testResults = testRunner + ".getResults(" + testFormat + "." + properties.getProperty("results.format", "JUnitXML") + - ");"; - String testCoverage = testRunner + ".getCoverage(" + coverageFormat + "." + + ");"; + String testCoverage = testRunner + ".getCoverage(" + coverageFormat + "." + properties.getProperty("coverage.format", "JSON") + ");"; String testName = testRunner + ".getName();"; - - if (verbose){ - System.err.println("[INFO] Starting browser '" + browser + "'"); - } - - Selenium selenium = null; + + //extracted from page String results = ""; String coverage = ""; String name = ""; - + //run the tests try { - //start up selenium - selenium = new DefaultSelenium(properties.getProperty(SELENIUM_HOST), - Integer.parseInt(properties.getProperty(SELENIUM_PORT)), browser, url); - - selenium.start(); selenium.open(url); - + if (verbose){ System.err.println("[INFO] Navigating to '" + url + "'"); - } + } selenium.waitForPageToLoad(properties.getProperty("selenium.waitforload", "10000")); - + if (verbose){ System.err.println("[INFO] Page is loaded."); } @@ -163,43 +191,35 @@ public class SeleniumDriver { selenium.waitForCondition(testRunnerIsNotRunning, properties.getProperty("selenium.waitfordone", "1000000")); if (verbose){ - System.err.println("[INFO] Tests are complete."); - } - + System.err.println("[INFO] Test complete."); + } + //get results - results = selenium.getEval(testResults); + results = selenium.getEval(testResults); + if (results.equals("null")){ + results = null; + } + coverage = selenium.getEval(testCoverage); + if (coverage.equals("null")){ + coverage = null; + } + name = selenium.getEval(testName); + return new TestResult(name, browser, url, results, coverage); + } 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; - } finally { - if (selenium != null){ - selenium.stop(); - } - } + } + } + - //save the results - try { - FileGenerator generator = new FileGenerator(properties, verbose); - //output the reports - generator.generate(name, results, "results", browser); - if (!coverage.equals("null")){ - generator.generate(name, coverage, "coverage", browser); - } - - } catch (Exception ex){ - //what to do? - throw ex; - } - } - private void getURLsAndBrowsers() throws Exception { //try to get list of URLs to hit @@ -214,6 +234,10 @@ public class SeleniumDriver { throw new Exception("The configuration property 'selenium.browsers' is missing."); } } + + private void outputResultsToConsole(){ + + } } selenium-driver/src/com/yahoo/platform/yui/selenium/SeleniumDriver.java @@ -114,6 +114,10 @@ public class YUITestSeleniumDriver { SeleniumDriver driver = new SeleniumDriver(properties, verbose); driver.start(); + //TestConfig config = new TestConfig(); + //config.load(new FileInputStream("../example/tests.xml")); + + } catch (CmdLineParser.OptionException e) { usage(); @@ -122,7 +126,7 @@ public class YUITestSeleniumDriver { } catch (Exception e) { System.err.println("[ERROR] " + e.getMessage()); - //e.printStackTrace(); + e.printStackTrace(); System.exit(1); // } catch (Exception e) { selenium-driver/src/com/yahoo/platform/yui/selenium/YUITestSeleniumDriver.java 789d542c85849c80df4fd42f0812edc8dc25da56 Nicholas nzakas@yahoo-inc.com http://github.com/nzakas/yuitest/commit/abf556c36917d183773a80d6450c5365c223216a abf556c36917d183773a80d6450c5365c223216a 2009-11-06T16:17:16-08:00 2009-11-06T16:17:16-08:00 Added XML configuration file reading 6b6ef7618c16f4fa0b4d37167413569ebad91c6e Nicholas nzakas@yahoo-inc.com