Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

WIP

  • Loading branch information...
commit b07b5f50e0050056a6819d0dd6e677751ecb91ea 2 parents 6aa3bc0 + 9b4dc1d
@wakaleo wakaleo authored
Showing with 3,143 additions and 830 deletions.
  1. +9 −0 build-all.sh
  2. +3 −10 maven-thucydides-plugin/pom.xml
  3. +1 −1  pom.xml
  4. +41 −0 thucydides-core/demo/progress.html
  5. +2 −0  thucydides-core/demo/scripts/dygraph-combined.js
  6. +924 −0 thucydides-core/demo/scripts/excanvas.js
  7. +2 −2 thucydides-core/pom.xml
  8. +22 −2 thucydides-core/src/main/java/net/thucydides/core/ThucydidesSystemProperty.java
  9. +361 −0 thucydides-core/src/main/java/net/thucydides/core/ThucydidesSystemProperty.java.orig
  10. +15 −0 thucydides-core/src/main/java/net/thucydides/core/annotations/Screenshots.java
  11. +1 −3 thucydides-core/src/main/java/net/thucydides/core/annotations/TestAnnotations.java
  12. +1 −3 thucydides-core/src/main/java/net/thucydides/core/bootstrap/ThucydidesAgent.java
  13. +32 −5 thucydides-core/src/main/java/net/thucydides/core/bootstrap/ThucydidesContext.java
  14. +1 −1  thucydides-core/src/main/java/net/thucydides/core/csv/InstanceBuilder.java
  15. +1 −1  thucydides-core/src/main/java/net/thucydides/core/csv/converters/BigDecimalTypeConverter.java
  16. +9 −0 thucydides-core/src/main/java/net/thucydides/core/digest/Digest.java
  17. +6 −5 thucydides-core/src/main/java/net/thucydides/core/model/ReportNamer.java
  18. +2 −2 thucydides-core/src/main/java/net/thucydides/core/model/Screenshot.java
  19. +104 −0 thucydides-core/src/main/java/net/thucydides/core/model/ScreenshotPermission.java
  20. +8 −0 thucydides-core/src/main/java/net/thucydides/core/model/TakeScreenshots.java
  21. +13 −8 thucydides-core/src/main/java/net/thucydides/core/pages/HtmlTag.java
  22. +23 −10 thucydides-core/src/main/java/net/thucydides/core/pages/PageObject.java
  23. +11 −5 thucydides-core/src/main/java/net/thucydides/core/pages/RenderedPageObjectView.java
  24. +1 −4 thucydides-core/src/main/java/net/thucydides/core/pages/WebElementFacade.java
  25. +1 −1  thucydides-core/src/main/java/net/thucydides/core/reports/TestOutcomes.java
  26. +0 −1  thucydides-core/src/main/java/net/thucydides/core/reports/html/HtmlAcceptanceTestReporter.java
  27. +1 −1  thucydides-core/src/main/java/net/thucydides/core/requirements/FileSystemRequirementsTagProvider.java
  28. +1 −1  thucydides-core/src/main/java/net/thucydides/core/requirements/model/NarrativeReader.java
  29. +2 −22 thucydides-core/src/main/java/net/thucydides/core/screenshots/Photographer.java
  30. +0 −6 thucydides-core/src/main/java/net/thucydides/core/screenshots/SingleThreadScreenshotProcessor.java
  31. +4 −4 thucydides-core/src/main/java/net/thucydides/core/steps/BaseStepListener.java
  32. +695 −0 thucydides-core/src/main/java/net/thucydides/core/steps/BaseStepListener.java.orig
  33. +14 −8 thucydides-core/src/main/java/net/thucydides/core/steps/StepInterceptor.java
  34. +126 −21 thucydides-core/src/main/java/net/thucydides/core/util/ExtendedTemporaryFolder.java
  35. +1 −1  thucydides-core/src/main/java/net/thucydides/core/util/SystemEnvironmentVariables.java
  36. +11 −0 thucydides-core/src/main/java/net/thucydides/core/webdriver/Configuration.java
  37. +9 −2 thucydides-core/src/main/java/net/thucydides/core/webdriver/DisplayedElementLocator.java
  38. +13 −1 thucydides-core/src/main/java/net/thucydides/core/webdriver/SystemPropertiesConfiguration.java
  39. +1 −1  thucydides-core/src/main/java/net/thucydides/core/webdriver/ThucydidesWebDriverSupport.java
  40. +2 −2 thucydides-core/src/main/java/net/thucydides/core/webdriver/ThucydidesWebdriverManager.java
  41. +2 −1  thucydides-core/src/main/java/net/thucydides/core/webdriver/WebDriverFactory.java
  42. +1 −1  thucydides-core/src/main/java/net/thucydides/core/webdriver/WebdriverInstances.java
  43. +6 −1 thucydides-core/src/main/java/net/thucydides/core/webdriver/firefox/FirefoxProfileEnhancer.java
  44. +4 −17 thucydides-core/src/main/java/net/thucydides/core/webdriver/stubs/OptionsStub.java
  45. +168 −0 thucydides-core/src/test/groovy/net/thucydides/core/model/WhenDecidingWhetherToTakeScreenshots.groovy
  46. +0 −105 ...ides-core/src/test/groovy/net/thucydides/core/reports/integration/WhenGeneratingAggregateHtmlReports.groovy
  47. +1 −1  thucydides-core/src/test/java/net/thucydides/core/csv/WhenLoadingTestDataFromACSVFile.java
  48. +1 −2  thucydides-core/src/test/java/net/thucydides/core/images/WhenResizingAScreenshot.java
  49. +0 −10 thucydides-core/src/test/java/net/thucydides/core/model/WhenFormattingScreenshotDetailsForHtml.java
  50. +2 −2 thucydides-core/src/test/java/net/thucydides/core/model/WhenRecordingNewTestOutcomes.java
  51. +1 −2  thucydides-core/src/test/java/net/thucydides/core/model/WhenWeCreateATestStep.java
  52. +1 −2  thucydides-core/src/test/java/net/thucydides/core/output/WhenRecordingTestOutputInASpreadsheet.java
  53. +4 −16 thucydides-core/src/test/java/net/thucydides/core/pages/WhenManagingAPageObject.java
  54. +16 −6 thucydides-core/src/test/java/net/thucydides/core/pages/WhenNamingHtmlTags.java
  55. +49 −0 ...des-core/src/test/java/net/thucydides/core/pages/integration/WaitingForElementsWithTheFluentElementAPI.java
  56. +1 −1  .../java/net/thucydides/core/pages/integration/{WhenResizingTheBrower.java → WhenResizingTheBrowser.java}
  57. +12 −11 thucydides-core/src/test/java/net/thucydides/core/reports/WhenNamingTheReports.java
  58. +1 −2  ...des-core/src/test/java/net/thucydides/core/reports/history/integration/WhenTrackingTestResultsOverTime.java
  59. +1 −4 thucydides-core/src/test/java/net/thucydides/core/reports/html/screenshots/WhenReformattingScreenshots.java
  60. +1 −2  thucydides-core/src/test/java/net/thucydides/core/reports/integration/AbstractReportGenerationTest.java
  61. +20 −25 ...ides-core/src/test/java/net/thucydides/core/reports/integration/WhenGeneratingAnAggregateHtmlReportSet.java
  62. +16 −16 thucydides-core/src/test/java/net/thucydides/core/reports/integration/WhenGeneratingAnHtmlReport.java
  63. +4 −3 thucydides-core/src/test/java/net/thucydides/core/reports/integration/WhenGeneratingAnXMLReport.java
  64. +6 −5 thucydides-core/src/test/java/net/thucydides/core/reports/integration/WhenIncludingJIRALinksInReports.java
  65. +1 −2  thucydides-core/src/test/java/net/thucydides/core/reports/integration/WhenReadingAnXMLReport.java
  66. +1 −1  thucydides-core/src/test/java/net/thucydides/core/resources/WhenReadingResourcesFromTheClasspath.java
  67. +2 −3 thucydides-core/src/test/java/net/thucydides/core/screenshots/WhenScreenshotsAreTaken.java
  68. +1 −1  thucydides-core/src/test/java/net/thucydides/core/statistics/WhenConfiguringTheStatisticsDatabase.java
  69. +14 −48 thucydides-core/src/test/java/net/thucydides/core/steps/WhenRecordingStepExecutionResults.java
  70. +3 −5 thucydides-core/src/test/java/net/thucydides/core/steps/WhenRecordingStepExecutionResultsForNonWebTests.java
  71. +1 −1  thucydides-core/src/test/java/net/thucydides/core/steps/WhenRunningStepsThroughAScenarioProxy.java
  72. +1 −1  thucydides-core/src/test/java/net/thucydides/core/steps/WhenUsingTheStepEventBus.java
  73. +2 −4 thucydides-core/src/test/java/net/thucydides/core/util/ExtendedTemporaryFolderTest.java
  74. +1 −1  thucydides-core/src/test/java/net/thucydides/core/util/WhenChangingFileSeparator.java
  75. +1 −3 thucydides-core/src/test/java/net/thucydides/core/util/WhenLoadingPreferencesFromALocalPropertiesFile.java
  76. +10 −0 thucydides-core/src/test/java/net/thucydides/core/webdriver/WhenLocatingWebElements.java
  77. +0 −4 ...c/test/java/net/thucydides/core/webdriver/integration/WhenCheckingVisibilityOnAWebSiteUsingPageObjects.java
  78. +1 −5 thucydides-core/src/test/java/net/thucydides/core/webdriver/integration/WhenTakingLargeScreenshots.java
  79. +1 −0  thucydides-core/src/test/resources/static-site/index.html
  80. +1 −1  thucydides-easyb-integration-tests/pom.xml
  81. +9 −0 thucydides-easyb-integration-tests/release.properties
  82. +1 −6 thucydides-easyb-plugin/pom.xml
  83. +2 −2 thucydides-extensions/pom.xml
  84. +0 −1  thucydides-extensions/src/main/java/net/thucydides/junit/pipeline/TestPipeline.java
  85. +18 −0 thucydides-gradle-plugin/build.gradle
  86. +1 −1  thucydides-junit/pom.xml
  87. +18 −18 thucydides-junit/src/main/java/net/thucydides/junit/listeners/TestCountListener.java
  88. +1 −1  thucydides-junit/src/main/java/net/thucydides/junit/runners/ThucydidesParameterizedRunner.java
  89. +195 −298 thucydides-junit/src/test/groovy/net/thucydides/junit/runners/WhenRunningTestScenarios.groovy
  90. +2 −22 thucydides-junit/src/test/java/net/thucydides/junit/runners/WhenLoggingTestScenarioResults.java
  91. +9 −13 thucydides-junit/src/test/java/net/thucydides/junit/runners/WhenRunningADataDrivenTestScenario.java
  92. +7 −7 thucydides-junit/src/test/java/net/thucydides/junit/runners/WhenRunningANonWebTestScenario.java
  93. +3 −2 thucydides-junit/src/test/java/net/thucydides/junit/util/FileFormating.java
  94. +6 −1 thucydides-junit/src/test/java/net/thucydides/samples/SamplePassingScenarioUsingHtmlUnitForOneTest.java
  95. +1 −1  thucydides-maven-integration-tests/pom.xml
  96. +1 −1  thucydides-report-resources/pom.xml
  97. +1 −1  thucydides-sample-alternative-resources/pom.xml
  98. +24 −0 thucydides-spock/pom.xml
  99. +1 −4 thucydides-spock/src/main/java/net/thucydides/spock/ThucydidesEnabledExtension.java
  100. +1 −0  thucydides-spock/src/test/resources/log4j.properties
  101. +7 −0 thucydides-spock/src/test/resources/logback.groovy
  102. +2 −2 thucydides-test-utils/pom.xml
View
9 build-all.sh
@@ -0,0 +1,9 @@
+#############################################
+### Launch a virtual framebuffer X server ###
+#############################################
+export DISPLAY=":98"
+Xvfb $DISPLAY >& Xvfb.log &
+trap "kill $! || true" EXIT
+sleep 10
+
+mvn clean install
View
13 maven-thucydides-plugin/pom.xml
@@ -4,12 +4,12 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9.76-SNAPSHOT</version>
</parent>
<groupId>net.thucydides.maven.plugins</groupId>
<artifactId>maven-thucydides-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9.76-SNAPSHOT</version>
<name>Thucydides Maven Plugin</name>
<dependencies>
<dependency>
@@ -23,18 +23,11 @@
<artifactId>maven-reporting-api</artifactId>
<version>2.2.1</version>
</dependency>
-
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>2.2</version>
</dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>2.1</version>
- </dependency>
<dependency>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-core</artifactId>
@@ -44,7 +37,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
</dependencies>
</project>
View
2  pom.xml
@@ -9,7 +9,7 @@
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9.76-SNAPSHOT</version>
<packaging>pom</packaging>
<name>thucydides</name>
<description>An Acceptance Testing framework for web applications
View
41 thucydides-core/demo/progress.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
+ <!--[if IE]><script src="scripts/excanvas.js"></script><![endif]-->
+ <script type="text/javascript" src="scripts/dygraph-combined.js"></script>
+</head>
+<body>
+<div id="graphdiv"></div>
+<script type="text/javascript">
+ g = new Dygraph(
+ document.getElementById("graphdiv"),
+ "Build,Requirements,Passed,Failed,Estimated,Total\n" +
+ // the data series
+ "2008-05-07,80,0, 0,10,80\n" +
+ "2008-05-08,85,10,0,10,85\n" +
+ "2008-05-09,87,20,2,20,87\n"+
+ "2008-05-10,87,20,2,20,87\n"+
+ "2008-05-12,87,24,1,24,87\n"+
+ "2008-05-15,89,28,0,28,89\n"+
+ "2008-05-16,90,28,0,28,90\n"+
+ "2008-05-16,0,0,0, 28,90\n"+
+ "2008-06-12,0,0,0, 94,94\n",
+ { fillGraph: true,
+ width: 640,
+ height: 480,
+ title: 'Project Progress',
+ titleHeight: 32,
+ colors: ['#ffda4b', 'green', '#EE1111','#bccb8e', '#00aeff'],
+ legend: 'always',
+ 'Estimated': {
+ fillGraph: false
+ },
+ 'Total': {
+ fillGraph: false
+ }
+ }
+ );
+</script>
+</body>
+</html>
View
2  thucydides-core/demo/scripts/dygraph-combined.js
2 additions, 0 deletions not shown
View
924 thucydides-core/demo/scripts/excanvas.js
@@ -0,0 +1,924 @@
+// Copyright 2006 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions to
+// limitations under the License.
+
+
+// Known Issues:
+//
+// * Patterns are not implemented.
+// * Radial gradient are not implemented. The VML version of these look very
+// different from the canvas one.
+// * Clipping paths are not implemented.
+// * Coordsize. The width to height attribute have higher priority than the
+// width to height style values which isn't correct.
+// * Painting mode isn't implemented.
+// * Canvas width/height should is using content-box by default. IE in
+// Quirks mode will draw the canvas using border-box. Either change your
+// doctype to HTML5
+// (http://www.whatwg.org/specs/web-apps/current-work/#the-doctype)
+// or use Box Sizing Behavior from WebFX
+// (http://webfx.eae.net/dhtml/boxsizing/boxsizing.html)
+// * Non uniform scaling does not correctly scale strokes.
+// * Optimize. There is always room for speed improvements.
+
+// Only add this code if we do not already have a canvas implementation
+if (!document.createElement('canvas').getContext) {
+
+(function() {
+
+ // alias some functions to make (compiled) code shorter
+ var m = Math;
+ var mr = m.round;
+ var ms = m.sin;
+ var mc = m.cos;
+ var abs = m.abs;
+ var sqrt = m.sqrt;
+
+ // this is used for sub pixel precision
+ var Z = 10;
+ var Z2 = Z / 2;
+
+ /**
+ * This funtion is assigned to the <canvas> elements as element.getContext().
+ * @this {HTMLElement}
+ * @return {CanvasRenderingContext2D_}
+ */
+ function getContext() {
+ return this.context_ ||
+ (this.context_ = new CanvasRenderingContext2D_(this));
+ }
+
+ var slice = Array.prototype.slice;
+
+ /**
+ * Binds a function to an object. The returned function will always use the
+ * passed in {@code obj} as {@code this}.
+ *
+ * Example:
+ *
+ * g = bind(f, obj, a, b)
+ * g(c, d) // will do f.call(obj, a, b, c, d)
+ *
+ * @param {Function} f The function to bind the object to
+ * @param {Object} obj The object that should act as this when the function
+ * is called
+ * @param {*} var_args Rest arguments that will be used as the initial
+ * arguments when the function is called
+ * @return {Function} A new function that has bound this
+ */
+ function bind(f, obj, var_args) {
+ var a = slice.call(arguments, 2);
+ return function() {
+ return f.apply(obj, a.concat(slice.call(arguments)));
+ };
+ }
+
+ var G_vmlCanvasManager_ = {
+ init: function(opt_doc) {
+ if (/MSIE/.test(navigator.userAgent) && !window.opera) {
+ var doc = opt_doc || document;
+ // Create a dummy element so that IE will allow canvas elements to be
+ // recognized.
+ doc.createElement('canvas');
+ doc.attachEvent('onreadystatechange', bind(this.init_, this, doc));
+ }
+ },
+
+ init_: function(doc) {
+ // create xmlns
+ if (!doc.namespaces['g_vml_']) {
+ doc.namespaces.add('g_vml_', 'urn:schemas-microsoft-com:vml',
+ '#default#VML');
+
+ }
+ if (!doc.namespaces['g_o_']) {
+ doc.namespaces.add('g_o_', 'urn:schemas-microsoft-com:office:office',
+ '#default#VML');
+ }
+
+ // Setup default CSS. Only add one style sheet per document
+ if (!doc.styleSheets['ex_canvas_']) {
+ var ss = doc.createStyleSheet();
+ ss.owningElement.id = 'ex_canvas_';
+ ss.cssText = 'canvas{display:inline-block;overflow:hidden;' +
+ // default size is 300x150 in Gecko to Opera
+ 'text-align:left;width:300px;height:150px}' +
+ 'g_vml_\\:*{behavior:url(#default#VML)}' +
+ 'g_o_\\:*{behavior:url(#default#VML)}';
+
+ }
+
+ // find all canvas elements
+ var els = doc.getElementsByTagName('canvas');
+ for (var i = 0; i < els.length; i++) {
+ this.initElement(els[i]);
+ }
+ },
+
+ /**
+ * Public initializes a canvas element so that it can be used as canvas
+ * element from now on. This is called automatically before the page is
+ * loaded but if you are creating elements using createElement you need to
+ * make sure this is called on the element.
+ * @param {HTMLElement} el The canvas element to initialize.
+ * @return {HTMLElement} the element that was created.
+ */
+ initElement: function(el) {
+ if (!el.getContext) {
+
+ el.getContext = getContext;
+
+ // Remove fallback content. There is no way to hide text nodes so we
+ // just remove all childNodes. We could hide all elements to remove
+ // text nodes but who really cares about the fallback content.
+ el.innerHTML = '';
+
+ // do not use inline function because that will leak memory
+ el.attachEvent('onpropertychange', onPropertyChange);
+ el.attachEvent('onresize', onResize);
+
+ var attrs = el.attributes;
+ if (attrs.width && attrs.width.specified) {
+ // TODO: use runtimeStyle to coordsize
+ // el.getContext().setWidth_(attrs.width.nodeValue);
+ el.style.width = attrs.width.nodeValue + 'px';
+ } else {
+ el.width = el.clientWidth;
+ }
+ if (attrs.height && attrs.height.specified) {
+ // TODO: use runtimeStyle to coordsize
+ // el.getContext().setHeight_(attrs.height.nodeValue);
+ el.style.height = attrs.height.nodeValue + 'px';
+ } else {
+ el.height = el.clientHeight;
+ }
+ //el.getContext().setCoordsize_()
+ }
+ return el;
+ }
+ };
+
+ function onPropertyChange(e) {
+ var el = e.srcElement;
+
+ switch (e.propertyName) {
+ case 'width':
+ el.style.width = el.attributes.width.nodeValue + 'px';
+ el.getContext().clearRect();
+ break;
+ case 'height':
+ el.style.height = el.attributes.height.nodeValue + 'px';
+ el.getContext().clearRect();
+ break;
+ }
+ }
+
+ function onResize(e) {
+ var el = e.srcElement;
+ if (el.firstChild) {
+ el.firstChild.style.width = el.clientWidth + 'px';
+ el.firstChild.style.height = el.clientHeight + 'px';
+ }
+ }
+
+ G_vmlCanvasManager_.init();
+
+ // precompute "00" to "FF"
+ var dec2hex = [];
+ for (var i = 0; i < 16; i++) {
+ for (var j = 0; j < 16; j++) {
+ dec2hex[i * 16 + j] = i.toString(16) + j.toString(16);
+ }
+ }
+
+ function createMatrixIdentity() {
+ return [
+ [1, 0, 0],
+ [0, 1, 0],
+ [0, 0, 1]
+ ];
+ }
+
+ function matrixMultiply(m1, m2) {
+ var result = createMatrixIdentity();
+
+ for (var x = 0; x < 3; x++) {
+ for (var y = 0; y < 3; y++) {
+ var sum = 0;
+
+ for (var z = 0; z < 3; z++) {
+ sum += m1[x][z] * m2[z][y];
+ }
+
+ result[x][y] = sum;
+ }
+ }
+ return result;
+ }
+
+ function copyState(o1, o2) {
+ o2.fillStyle = o1.fillStyle;
+ o2.lineCap = o1.lineCap;
+ o2.lineJoin = o1.lineJoin;
+ o2.lineWidth = o1.lineWidth;
+ o2.miterLimit = o1.miterLimit;
+ o2.shadowBlur = o1.shadowBlur;
+ o2.shadowColor = o1.shadowColor;
+ o2.shadowOffsetX = o1.shadowOffsetX;
+ o2.shadowOffsetY = o1.shadowOffsetY;
+ o2.strokeStyle = o1.strokeStyle;
+ o2.globalAlpha = o1.globalAlpha;
+ o2.arcScaleX_ = o1.arcScaleX_;
+ o2.arcScaleY_ = o1.arcScaleY_;
+ o2.lineScale_ = o1.lineScale_;
+ }
+
+ function processStyle(styleString) {
+ var str, alpha = 1;
+
+ styleString = String(styleString);
+ if (styleString.substring(0, 3) == 'rgb') {
+ var start = styleString.indexOf('(', 3);
+ var end = styleString.indexOf(')', start + 1);
+ var guts = styleString.substring(start + 1, end).split(',');
+
+ str = '#';
+ for (var i = 0; i < 3; i++) {
+ str += dec2hex[Number(guts[i])];
+ }
+
+ if (guts.length == 4 && styleString.substr(3, 1) == 'a') {
+ alpha = guts[3];
+ }
+ } else {
+ str = styleString;
+ }
+
+ return {color: str, alpha: alpha};
+ }
+
+ function processLineCap(lineCap) {
+ switch (lineCap) {
+ case 'butt':
+ return 'flat';
+ case 'round':
+ return 'round';
+ case 'square':
+ default:
+ return 'square';
+ }
+ }
+
+ /**
+ * This class implements CanvasRenderingContext2D interface as described by
+ * the WHATWG.
+ * @param {HTMLElement} surfaceElement The element that the 2D context should
+ * be associated with
+ */
+ function CanvasRenderingContext2D_(surfaceElement) {
+ this.m_ = createMatrixIdentity();
+
+ this.mStack_ = [];
+ this.aStack_ = [];
+ this.currentPath_ = [];
+
+ // Canvas context properties
+ this.strokeStyle = '#000';
+ this.fillStyle = '#000';
+
+ this.lineWidth = 1;
+ this.lineJoin = 'miter';
+ this.lineCap = 'butt';
+ this.miterLimit = Z * 1;
+ this.globalAlpha = 1;
+ this.canvas = surfaceElement;
+
+ var el = surfaceElement.ownerDocument.createElement('div');
+ el.style.width = surfaceElement.clientWidth + 'px';
+ el.style.height = surfaceElement.clientHeight + 'px';
+ el.style.overflow = 'hidden';
+ el.style.position = 'absolute';
+ surfaceElement.appendChild(el);
+
+ this.element_ = el;
+ this.arcScaleX_ = 1;
+ this.arcScaleY_ = 1;
+ this.lineScale_ = 1;
+ }
+
+ var contextPrototype = CanvasRenderingContext2D_.prototype;
+ contextPrototype.clearRect = function() {
+ this.element_.innerHTML = '';
+ };
+
+ contextPrototype.beginPath = function() {
+ // TODO: Branch current matrix so that save/restore has no effect
+ // as per safari docs.
+ this.currentPath_ = [];
+ };
+
+ contextPrototype.moveTo = function(aX, aY) {
+ var p = this.getCoords_(aX, aY);
+ this.currentPath_.push({type: 'moveTo', x: p.x, y: p.y});
+ this.currentX_ = p.x;
+ this.currentY_ = p.y;
+ };
+
+ contextPrototype.lineTo = function(aX, aY) {
+ var p = this.getCoords_(aX, aY);
+ this.currentPath_.push({type: 'lineTo', x: p.x, y: p.y});
+
+ this.currentX_ = p.x;
+ this.currentY_ = p.y;
+ };
+
+ contextPrototype.bezierCurveTo = function(aCP1x, aCP1y,
+ aCP2x, aCP2y,
+ aX, aY) {
+ var p = this.getCoords_(aX, aY);
+ var cp1 = this.getCoords_(aCP1x, aCP1y);
+ var cp2 = this.getCoords_(aCP2x, aCP2y);
+ bezierCurveTo(this, cp1, cp2, p);
+ };
+
+ // Helper function that takes the already fixed cordinates.
+ function bezierCurveTo(self, cp1, cp2, p) {
+ self.currentPath_.push({
+ type: 'bezierCurveTo',
+ cp1x: cp1.x,
+ cp1y: cp1.y,
+ cp2x: cp2.x,
+ cp2y: cp2.y,
+ x: p.x,
+ y: p.y
+ });
+ self.currentX_ = p.x;
+ self.currentY_ = p.y;
+ }
+
+ contextPrototype.quadraticCurveTo = function(aCPx, aCPy, aX, aY) {
+ // the following is lifted almost directly from
+ // http://developer.mozilla.org/en/docs/Canvas_tutorial:Drawing_shapes
+
+ var cp = this.getCoords_(aCPx, aCPy);
+ var p = this.getCoords_(aX, aY);
+
+ var cp1 = {
+ x: this.currentX_ + 2.0 / 3.0 * (cp.x - this.currentX_),
+ y: this.currentY_ + 2.0 / 3.0 * (cp.y - this.currentY_)
+ };
+ var cp2 = {
+ x: cp1.x + (p.x - this.currentX_) / 3.0,
+ y: cp1.y + (p.y - this.currentY_) / 3.0
+ };
+
+ bezierCurveTo(this, cp1, cp2, p);
+ };
+
+ contextPrototype.arc = function(aX, aY, aRadius,
+ aStartAngle, aEndAngle, aClockwise) {
+ aRadius *= Z;
+ var arcType = aClockwise ? 'at' : 'wa';
+
+ var xStart = aX + mc(aStartAngle) * aRadius - Z2;
+ var yStart = aY + ms(aStartAngle) * aRadius - Z2;
+
+ var xEnd = aX + mc(aEndAngle) * aRadius - Z2;
+ var yEnd = aY + ms(aEndAngle) * aRadius - Z2;
+
+ // IE won't render arches drawn counter clockwise if xStart == xEnd.
+ if (xStart == xEnd && !aClockwise) {
+ xStart += 0.125; // Offset xStart by 1/80 of a pixel. Use something
+ // that can be represented in binary
+ }
+
+ var p = this.getCoords_(aX, aY);
+ var pStart = this.getCoords_(xStart, yStart);
+ var pEnd = this.getCoords_(xEnd, yEnd);
+
+ this.currentPath_.push({type: arcType,
+ x: p.x,
+ y: p.y,
+ radius: aRadius,
+ xStart: pStart.x,
+ yStart: pStart.y,
+ xEnd: pEnd.x,
+ yEnd: pEnd.y});
+
+ };
+
+ contextPrototype.rect = function(aX, aY, aWidth, aHeight) {
+ this.moveTo(aX, aY);
+ this.lineTo(aX + aWidth, aY);
+ this.lineTo(aX + aWidth, aY + aHeight);
+ this.lineTo(aX, aY + aHeight);
+ this.closePath();
+ };
+
+ contextPrototype.strokeRect = function(aX, aY, aWidth, aHeight) {
+ var oldPath = this.currentPath_;
+ this.beginPath();
+
+ this.moveTo(aX, aY);
+ this.lineTo(aX + aWidth, aY);
+ this.lineTo(aX + aWidth, aY + aHeight);
+ this.lineTo(aX, aY + aHeight);
+ this.closePath();
+ this.stroke();
+
+ this.currentPath_ = oldPath;
+ };
+
+ contextPrototype.fillRect = function(aX, aY, aWidth, aHeight) {
+ var oldPath = this.currentPath_;
+ this.beginPath();
+
+ this.moveTo(aX, aY);
+ this.lineTo(aX + aWidth, aY);
+ this.lineTo(aX + aWidth, aY + aHeight);
+ this.lineTo(aX, aY + aHeight);
+ this.closePath();
+ this.fill();
+
+ this.currentPath_ = oldPath;
+ };
+
+ contextPrototype.createLinearGradient = function(aX0, aY0, aX1, aY1) {
+ var gradient = new CanvasGradient_('gradient');
+ gradient.x0_ = aX0;
+ gradient.y0_ = aY0;
+ gradient.x1_ = aX1;
+ gradient.y1_ = aY1;
+ return gradient;
+ };
+
+ contextPrototype.createRadialGradient = function(aX0, aY0, aR0,
+ aX1, aY1, aR1) {
+ var gradient = new CanvasGradient_('gradientradial');
+ gradient.x0_ = aX0;
+ gradient.y0_ = aY0;
+ gradient.r0_ = aR0;
+ gradient.x1_ = aX1;
+ gradient.y1_ = aY1;
+ gradient.r1_ = aR1;
+ return gradient;
+ };
+
+ contextPrototype.drawImage = function(image, var_args) {
+ var dx, dy, dw, dh, sx, sy, sw, sh;
+
+ // to find the original width we overide the width to height
+ var oldRuntimeWidth = image.runtimeStyle.width;
+ var oldRuntimeHeight = image.runtimeStyle.height;
+ image.runtimeStyle.width = 'auto';
+ image.runtimeStyle.height = 'auto';
+
+ // get the original size
+ var w = image.width;
+ var h = image.height;
+
+ // to remove overides
+ image.runtimeStyle.width = oldRuntimeWidth;
+ image.runtimeStyle.height = oldRuntimeHeight;
+
+ if (arguments.length == 3) {
+ dx = arguments[1];
+ dy = arguments[2];
+ sx = sy = 0;
+ sw = dw = w;
+ sh = dh = h;
+ } else if (arguments.length == 5) {
+ dx = arguments[1];
+ dy = arguments[2];
+ dw = arguments[3];
+ dh = arguments[4];
+ sx = sy = 0;
+ sw = w;
+ sh = h;
+ } else if (arguments.length == 9) {
+ sx = arguments[1];
+ sy = arguments[2];
+ sw = arguments[3];
+ sh = arguments[4];
+ dx = arguments[5];
+ dy = arguments[6];
+ dw = arguments[7];
+ dh = arguments[8];
+ } else {
+ throw Error('Invalid number of arguments');
+ }
+
+ var d = this.getCoords_(dx, dy);
+
+ var w2 = sw / 2;
+ var h2 = sh / 2;
+
+ var vmlStr = [];
+
+ var W = 10;
+ var H = 10;
+
+ // For some reason that I've now forgotten, using divs didn't work
+ vmlStr.push(' <g_vml_:group',
+ ' coordsize="', Z * W, ',', Z * H, '"',
+ ' coordorigin="0,0"' ,
+ ' style="width:', W, 'px;height:', H, 'px;position:absolute;');
+
+ // If filters are necessary (rotation exists), create them
+ // filters are bog-slow, so only create them if abbsolutely necessary
+ // The following check doesn't account for skews (which don't exist
+ // in the canvas spec (yet) anyway.
+
+ if (this.m_[0][0] != 1 || this.m_[0][1]) {
+ var filter = [];
+
+ // Note the 12/21 reversal
+ filter.push('M11=', this.m_[0][0], ',',
+ 'M12=', this.m_[1][0], ',',
+ 'M21=', this.m_[0][1], ',',
+ 'M22=', this.m_[1][1], ',',
+ 'Dx=', mr(d.x / Z), ',',
+ 'Dy=', mr(d.y / Z), '');
+
+ // Bounding box calculation (need to minimize displayed area so that
+ // filters don't waste time on unused pixels.
+ var max = d;
+ var c2 = this.getCoords_(dx + dw, dy);
+ var c3 = this.getCoords_(dx, dy + dh);
+ var c4 = this.getCoords_(dx + dw, dy + dh);
+
+ max.x = m.max(max.x, c2.x, c3.x, c4.x);
+ max.y = m.max(max.y, c2.y, c3.y, c4.y);
+
+ vmlStr.push('padding:0 ', mr(max.x / Z), 'px ', mr(max.y / Z),
+ 'px 0;filter:progid:DXImageTransform.Microsoft.Matrix(',
+ filter.join(''), ", sizingmethod='clip');")
+ } else {
+ vmlStr.push('top:', mr(d.y / Z), 'px;left:', mr(d.x / Z), 'px;');
+ }
+
+ vmlStr.push(' ">' ,
+ '<g_vml_:image src="', image.src, '"',
+ ' style="width:', Z * dw, 'px;',
+ ' height:', Z * dh, 'px;"',
+ ' cropleft="', sx / w, '"',
+ ' croptop="', sy / h, '"',
+ ' cropright="', (w - sx - sw) / w, '"',
+ ' cropbottom="', (h - sy - sh) / h, '"',
+ ' />',
+ '</g_vml_:group>');
+
+ this.element_.insertAdjacentHTML('BeforeEnd',
+ vmlStr.join(''));
+ };
+
+ contextPrototype.stroke = function(aFill) {
+ var lineStr = [];
+ var lineOpen = false;
+ var a = processStyle(aFill ? this.fillStyle : this.strokeStyle);
+ var color = a.color;
+ var opacity = a.alpha * this.globalAlpha;
+
+ var W = 10;
+ var H = 10;
+
+ lineStr.push('<g_vml_:shape',
+ ' filled="', !!aFill, '"',
+ ' style="position:absolute;width:', W, 'px;height:', H, 'px;"',
+ ' coordorigin="0 0" coordsize="', Z * W, ' ', Z * H, '"',
+ ' stroked="', !aFill, '"',
+ ' path="');
+
+ var newSeq = false;
+ var min = {x: null, y: null};
+ var max = {x: null, y: null};
+
+ for (var i = 0; i < this.currentPath_.length; i++) {
+ var p = this.currentPath_[i];
+ var c;
+
+ switch (p.type) {
+ case 'moveTo':
+ c = p;
+ lineStr.push(' m ', mr(p.x), ',', mr(p.y));
+ break;
+ case 'lineTo':
+ lineStr.push(' l ', mr(p.x), ',', mr(p.y));
+ break;
+ case 'close':
+ lineStr.push(' x ');
+ p = null;
+ break;
+ case 'bezierCurveTo':
+ lineStr.push(' c ',
+ mr(p.cp1x), ',', mr(p.cp1y), ',',
+ mr(p.cp2x), ',', mr(p.cp2y), ',',
+ mr(p.x), ',', mr(p.y));
+ break;
+ case 'at':
+ case 'wa':
+ lineStr.push(' ', p.type, ' ',
+ mr(p.x - this.arcScaleX_ * p.radius), ',',
+ mr(p.y - this.arcScaleY_ * p.radius), ' ',
+ mr(p.x + this.arcScaleX_ * p.radius), ',',
+ mr(p.y + this.arcScaleY_ * p.radius), ' ',
+ mr(p.xStart), ',', mr(p.yStart), ' ',
+ mr(p.xEnd), ',', mr(p.yEnd));
+ break;
+ }
+
+
+ // TODO: Following is broken for curves due to
+ // move to proper paths.
+
+ // Figure out dimensions so we can do gradient fills
+ // properly
+ if (p) {
+ if (min.x == null || p.x < min.x) {
+ min.x = p.x;
+ }
+ if (max.x == null || p.x > max.x) {
+ max.x = p.x;
+ }
+ if (min.y == null || p.y < min.y) {
+ min.y = p.y;
+ }
+ if (max.y == null || p.y > max.y) {
+ max.y = p.y;
+ }
+ }
+ }
+ lineStr.push(' ">');
+
+ if (!aFill) {
+ var lineWidth = this.lineScale_ * this.lineWidth;
+
+ // VML cannot correctly render a line if the width is less than 1px.
+ // In that case, we dilute the color to make the line look thinner.
+ if (lineWidth < 1) {
+ opacity *= lineWidth;
+ }
+
+ lineStr.push(
+ '<g_vml_:stroke',
+ ' opacity="', opacity, '"',
+ ' joinstyle="', this.lineJoin, '"',
+ ' miterlimit="', this.miterLimit, '"',
+ ' endcap="', processLineCap(this.lineCap), '"',
+ ' weight="', lineWidth, 'px"',
+ ' color="', color, '" />'
+ );
+ } else if (typeof this.fillStyle == 'object') {
+ var fillStyle = this.fillStyle;
+ var angle = 0;
+ var focus = {x: 0, y: 0};
+
+ // additional offset
+ var shift = 0;
+ // scale factor for offset
+ var expansion = 1;
+
+ if (fillStyle.type_ == 'gradient') {
+ var x0 = fillStyle.x0_ / this.arcScaleX_;
+ var y0 = fillStyle.y0_ / this.arcScaleY_;
+ var x1 = fillStyle.x1_ / this.arcScaleX_;
+ var y1 = fillStyle.y1_ / this.arcScaleY_;
+ var p0 = this.getCoords_(x0, y0);
+ var p1 = this.getCoords_(x1, y1);
+ var dx = p1.x - p0.x;
+ var dy = p1.y - p0.y;
+ angle = Math.atan2(dx, dy) * 180 / Math.PI;
+
+ // The angle should be a non-negative number.
+ if (angle < 0) {
+ angle += 360;
+ }
+
+ // Very small angles produce an unexpected result because they are
+ // converted to a scientific notation string.
+ if (angle < 1e-6) {
+ angle = 0;
+ }
+ } else {
+ var p0 = this.getCoords_(fillStyle.x0_, fillStyle.y0_);
+ var width = max.x - min.x;
+ var height = max.y - min.y;
+ focus = {
+ x: (p0.x - min.x) / width,
+ y: (p0.y - min.y) / height
+ };
+
+ width /= this.arcScaleX_ * Z;
+ height /= this.arcScaleY_ * Z;
+ var dimension = m.max(width, height);
+ shift = 2 * fillStyle.r0_ / dimension;
+ expansion = 2 * fillStyle.r1_ / dimension - shift;
+ }
+
+ // We need to sort the color stops in ascending order by offset,
+ // otherwise IE won't interpret it correctly.
+ var stops = fillStyle.colors_;
+ stops.sort(function(cs1, cs2) {
+ return cs1.offset - cs2.offset;
+ });
+
+ var length = stops.length;
+ var color1 = stops[0].color;
+ var color2 = stops[length - 1].color;
+ var opacity1 = stops[0].alpha * this.globalAlpha;
+ var opacity2 = stops[length - 1].alpha * this.globalAlpha;
+
+ var colors = [];
+ for (var i = 0; i < length; i++) {
+ var stop = stops[i];
+ colors.push(stop.offset * expansion + shift + ' ' + stop.color);
+ }
+
+ // When colors attribute is used, the meanings of opacity to o:opacity2
+ // are reversed.
+ lineStr.push('<g_vml_:fill type="', fillStyle.type_, '"',
+ ' method="none" focus="100%"',
+ ' color="', color1, '"',
+ ' color2="', color2, '"',
+ ' colors="', colors.join(','), '"',
+ ' opacity="', opacity2, '"',
+ ' g_o_:opacity2="', opacity1, '"',
+ ' angle="', angle, '"',
+ ' focusposition="', focus.x, ',', focus.y, '" />');
+ } else {
+ lineStr.push('<g_vml_:fill color="', color, '" opacity="', opacity,
+ '" />');
+ }
+
+ lineStr.push('</g_vml_:shape>');
+
+ this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
+ };
+
+ contextPrototype.fill = function() {
+ this.stroke(true);
+ }
+
+ contextPrototype.closePath = function() {
+ this.currentPath_.push({type: 'close'});
+ };
+
+ /**
+ * @private
+ */
+ contextPrototype.getCoords_ = function(aX, aY) {
+ var m = this.m_;
+ return {
+ x: Z * (aX * m[0][0] + aY * m[1][0] + m[2][0]) - Z2,
+ y: Z * (aX * m[0][1] + aY * m[1][1] + m[2][1]) - Z2
+ }
+ };
+
+ contextPrototype.save = function() {
+ var o = {};
+ copyState(this, o);
+ this.aStack_.push(o);
+ this.mStack_.push(this.m_);
+ this.m_ = matrixMultiply(createMatrixIdentity(), this.m_);
+ };
+
+ contextPrototype.restore = function() {
+ copyState(this.aStack_.pop(), this);
+ this.m_ = this.mStack_.pop();
+ };
+
+ function matrixIsFinite(m) {
+ for (var j = 0; j < 3; j++) {
+ for (var k = 0; k < 2; k++) {
+ if (!isFinite(m[j][k]) || isNaN(m[j][k])) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ function setM(ctx, m, updateLineScale) {
+ if (!matrixIsFinite(m)) {
+ return;
+ }
+ ctx.m_ = m;
+
+ if (updateLineScale) {
+ // Get the line scale.
+ // Determinant of this.m_ means how much the area is enlarged by the
+ // transformation. So its square root can be used as a scale factor
+ // for width.
+ var det = m[0][0] * m[1][1] - m[0][1] * m[1][0];
+ ctx.lineScale_ = sqrt(abs(det));
+ }
+ }
+
+ contextPrototype.translate = function(aX, aY) {
+ var m1 = [
+ [1, 0, 0],
+ [0, 1, 0],
+ [aX, aY, 1]
+ ];
+
+ setM(this, matrixMultiply(m1, this.m_), false);
+ };
+
+ contextPrototype.rotate = function(aRot) {
+ var c = mc(aRot);
+ var s = ms(aRot);
+
+ var m1 = [
+ [c, s, 0],
+ [-s, c, 0],
+ [0, 0, 1]
+ ];
+
+ setM(this, matrixMultiply(m1, this.m_), false);
+ };
+
+ contextPrototype.scale = function(aX, aY) {
+ this.arcScaleX_ *= aX;
+ this.arcScaleY_ *= aY;
+ var m1 = [
+ [aX, 0, 0],
+ [0, aY, 0],
+ [0, 0, 1]
+ ];
+
+ setM(this, matrixMultiply(m1, this.m_), true);
+ };
+
+ contextPrototype.transform = function(m11, m12, m21, m22, dx, dy) {
+ var m1 = [
+ [m11, m12, 0],
+ [m21, m22, 0],
+ [dx, dy, 1]
+ ];
+
+ setM(this, matrixMultiply(m1, this.m_), true);
+ };
+
+ contextPrototype.setTransform = function(m11, m12, m21, m22, dx, dy) {
+ var m = [
+ [m11, m12, 0],
+ [m21, m22, 0],
+ [dx, dy, 1]
+ ];
+
+ setM(this, m, true);
+ };
+
+ /******** STUBS ********/
+ contextPrototype.clip = function() {
+ // TODO: Implement
+ };
+
+ contextPrototype.arcTo = function() {
+ // TODO: Implement
+ };
+
+ contextPrototype.createPattern = function() {
+ return new CanvasPattern_;
+ };
+
+ // Gradient / Pattern Stubs
+ function CanvasGradient_(aType) {
+ this.type_ = aType;
+ this.x0_ = 0;
+ this.y0_ = 0;
+ this.r0_ = 0;
+ this.x1_ = 0;
+ this.y1_ = 0;
+ this.r1_ = 0;
+ this.colors_ = [];
+ }
+
+ CanvasGradient_.prototype.addColorStop = function(aOffset, aColor) {
+ aColor = processStyle(aColor);
+ this.colors_.push({offset: aOffset,
+ color: aColor.color,
+ alpha: aColor.alpha});
+ };
+
+ function CanvasPattern_() {}
+
+ // set up externs
+ G_vmlCanvasManager = G_vmlCanvasManager_;
+ CanvasRenderingContext2D = CanvasRenderingContext2D_;
+ CanvasGradient = CanvasGradient_;
+ CanvasPattern = CanvasPattern_;
+
+})();
+
+} // if
View
4 thucydides-core/pom.xml
@@ -5,11 +5,11 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9.76-SNAPSHOT</version>
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-core</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.9.76-SNAPSHOT</version>
<name>thucydides-core</name>
<properties>
<root.package>net.thucydides.core</root.package>
View
24 thucydides-core/src/main/java/net/thucydides/core/ThucydidesSystemProperty.java
@@ -13,7 +13,7 @@
public enum ThucydidesSystemProperty {
/**
- * The WebDriver driver - firefox or chrome.
+ * The WebDriver driver - firefox, chrome, iexplorer, htmlunit, safari.
*/
DRIVER("webdriver.driver"),
@@ -67,6 +67,7 @@
/**
* Should Thucydides only store screenshots for failing steps?
* This can save disk space and speed up the tests somewhat. Useful for data-driven testing.
+ * @Deprecated This property is still supported, but thucydides.take.screenshots provides more fine-grained control.
*/
ONLY_SAVE_FAILING_SCREENSHOTS("thucydides.only.save.failing.screenshots"),
@@ -77,10 +78,23 @@
* on a WebElementFacade, i.e. any time you use an expression like element(...).click(),
* findBy(...).click() and so on.
* This will be overridden if the ONLY_SAVE_FAILING_SCREENSHOTS option is set to true.
+ * @Deprecated This property is still supported, but thucydides.take.screenshots provides more fine-grained control.
*/
VERBOSE_SCREENSHOTS("thucydides.verbose.screenshots"),
/**
+ * Fine-grained control over when screenshots are to be taken.
+ * This property accepts the following values:
+ * <ul>
+ * <li>FOR_EACH_ACTION</li>
+ * <li>BEFORE_AND_AFTER_EACH_STEP</li>
+ * <li>AFTER_EACH_STEP</li>
+ * <li>FOR_FAILURES</li>
+ * </ul>
+ */
+ THUCYDIDES_TAKE_SCREENSHOTS("thucydides.take.screenshots"),
+
+ /**
* Should Thucydides display detailed information in the test result tables.
* If this is set to true, test result tables will display a breakdown of the steps by result.
* This is false by default.
@@ -185,6 +199,12 @@
*/
ACTIVATE_FIREBUGS("thucydides.activate.firebugs"),
+ /**
+ * Enable applets in Firefox.
+ * Applets slow down webdriver, so are disabled by default.
+ */
+ SECURITY_ENABLE_JAVA("security.enable_java"),
+
ACTIVTE_HIGHLIGHTING("thucydides.activate.highlighting"),
/**
@@ -216,7 +236,7 @@
/**
* How long webdriver waits for elements to appear by default, in milliseconds.
*/
- TIMEOUTS_IMPLICIT_WAIT("webdriver.timeouts.implicitly.wait"),
+ TIMEOUTS_IMPLICIT_WAIT("webdriver.timeouts.implicitlywait"),
/**
* Extension packages. This is a list of packages that will be scanned for custom TagProvider implementations.
View
361 thucydides-core/src/main/java/net/thucydides/core/ThucydidesSystemProperty.java.orig
@@ -0,0 +1,361 @@
+package net.thucydides.core;
+
+import net.thucydides.core.util.EnvironmentVariables;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Properties that can be passed to a web driver test to customize its behaviour.
+ * This class is mainly for internal use.
+ *
+ * @author johnsmart
+ *
+ */
+public enum ThucydidesSystemProperty {
+
+ /**
+ * The WebDriver driver - firefox, chrome, iexplorer, htmlunit, safari.
+ */
+ DRIVER("webdriver.driver"),
+
+ /**
+ * The default starting URL for the application, and base URL for relative paths.
+ */
+ BASE_URL("webdriver.base.url"),
+
+ /**
+ * The URL to be used for remote drivers
+ */
+ REMOTE_URL("webdriver.remote.url"),
+
+
+ /**
+ * The driver to be used for remote drivers
+ */
+ REMOTE_BROWSER("webdriver.remote."),
+
+ /**
+ * A unique identifier for the project under test, used to record test statistics.
+ */
+ PROJECT_KEY("thucydides.project.key"),
+
+ /**
+ * The home directory for Thucydides output and data files - by default, $USER_HOME/.thucydides
+ */
+ THUCYDIDES_HOME("thucydides.home"),
+
+ /**
+ * Additional options to be added to the JDBC connection for the default file-based database.
+ */
+ THUCYDIDES_DATABASE_JDBC_OPTIONS("thucydides.database.jdbc.options"),
+
+ /**
+ * Record test result statistics in a database for reporting purposes.
+ */
+ RECORD_STATISTICS("thucydides.record.statistics"),
+
+ /**
+ * Indicates a directory from which the resources for the HTML reports should be copied.
+ * This directory currently needs to be provided in a JAR file.
+ */
+ REPORT_RESOURCE_PATH("thucydides.report.resources"),
+
+ /**
+ * Where should reports be generated.
+ */
+ OUTPUT_DIRECTORY("thucydides.outputDirectory"),
+
+ /**
+ * Should Thucydides only store screenshots for failing steps?
+ * This can save disk space and speed up the tests somewhat. Useful for data-driven testing.
+ * @Deprecated This property is still supported, but thucydides.take.screenshots provides more fine-grained control.
+ */
+ ONLY_SAVE_FAILING_SCREENSHOTS("thucydides.only.save.failing.screenshots"),
+
+ /**
+ * Should Thucydides take screenshots for every clicked button and every selected link?
+ * By default, a screenshot will be stored at the start and end of each step.
+ * If this option is set to true, Thucydides will record screenshots for any action performed
+ * on a WebElementFacade, i.e. any time you use an expression like element(...).click(),
+ * findBy(...).click() and so on.
+ * This will be overridden if the ONLY_SAVE_FAILING_SCREENSHOTS option is set to true.
+ * @Deprecated This property is still supported, but thucydides.take.screenshots provides more fine-grained control.
+ */
+ VERBOSE_SCREENSHOTS("thucydides.verbose.screenshots"),
+
+ /**
+ * Fine-grained control over when screenshots are to be taken.
+ * This property accepts the following values:
+ * <ul>
+ * <li>FOR_EACH_ACTION</li>
+ * <li>BEFORE_AND_AFTER_EACH_STEP</li>
+ * <li>AFTER_EACH_STEP</li>
+ * <li>FOR_FAILURES</li>
+ * </ul>
+ */
+ THUCYDIDES_TAKE_SCREENSHOTS("thucydides.take.screenshots"),
+
+ /**
+ * Should Thucydides display detailed information in the test result tables.
+ * If this is set to true, test result tables will display a breakdown of the steps by result.
+ * This is false by default.
+ */
+ SHOW_STEP_DETAILS("thucydides.reports.show.step.details"),
+
+ /**
+ * Restart the browser every so often during data-driven tests.
+ */
+ RESTART_BROWSER_FREQUENCY("thucydides.restart.browser.frequency"),
+
+ /**
+ * Pause (in ms) between each test step.
+ */
+ STEP_DELAY("thucycides.step.delay"),
+
+ /**
+ * How long should the driver wait for elements not immediately visible, in seconds.
+ */
+ ELEMENT_TIMEOUT("thucydides.timeout"),
+
+ /**
+ * Don't accept sites using untrusted certificates.
+ * By default, Thucydides accepts untrusted certificates - use this to change this behaviour.
+ */
+ ASSUME_UNTRUSTED_CERTIFICATE_ISSUER("refuse.untrusted.certificates"),
+
+ /**
+ * Use the same browser for all tests (the "Highlander" rule)
+ */
+ UNIQUE_BROWSER("thucydides.use.unique.browser"),
+
+ /**
+ * The estimated number of steps in a pending scenario.
+ * The estimated number of steps in a pending sceario.
+ * This is used for stories where no scenarios have been defined.
+ */
+ ESTIMATED_AVERAGE_STEP_COUNT("thucydides.estimated.average.step.count"),
+
+ /**
+ * Base URL for the issue tracking system to be referred to in the reports.
+ * If defined, any issues quoted in the form #1234 will be linked to the relevant
+ * issue in the issue tracking system. Works with JIRA, Trac etc.
+ */
+ ISSUE_TRACKER_URL("thucydides.issue.tracker.url"),
+
+ /**
+ * Activate native events in Firefox.
+ * This is true by default, but can cause issues with some versions of linux.
+ */
+ NATIVE_EVENTS("thucydides.native.events"),
+
+ /**
+ * If the base JIRA URL is defined, Thucydides will build the issue tracker url using the standard JIRA form.
+ */
+ JIRA_URL("jira.url"),
+
+ /**
+ * If defined, the JIRA project id will be prepended to issue numbers.
+ */
+ JIRA_PROJECT("jira.project"),
+
+ /**
+ * If defined, the JIRA username required to connect to JIRA.
+ */
+ JIRA_USERNAME("jira.username"),
+
+ /**
+ * If defined, the JIRA password required to connect to JIRA.
+ */
+ JIRA_PASSWORD("jira.password"),
+
+ /**
+ * Base directory in which history files are stored.
+ */
+ HISTORY_BASE_DIRECTORY("thucydides.history"),
+
+ /**
+ * Redimension the browser to enable larger screenshots.
+ */
+ SNAPSHOT_HEIGHT("thucydides.browser.height"),
+ /**
+ * Redimension the browser to enable larger screenshots.
+ */
+ SNAPSHOT_WIDTH("thucydides.browser.width"),
+
+ /**
+ * If set, resize screenshots to this size to save space.
+ */
+ RESIZED_WIDTH("thucydides.resized.image.width"),
+
+ /**
+ * Public URL where the Thucydides reports will be displayed.
+ * This is mainly for use by plugins.
+ */
+ PUBLIC_URL("thucydides.public.url"),
+
+ /**
+ * Activate the Firebugs plugin for firefox.
+ * Useful for debugging, but not very when running the tests on a build server.
+ * It is not activated by default.
+ */
+ ACTIVATE_FIREBUGS("thucydides.activate.firebugs"),
+
+ ACTIVTE_HIGHLIGHTING("thucydides.activate.highlighting"),
+
+ /**
+ * A deprecated property that is synonymous with thucydides.batch.size
+ */
+ BATCH_COUNT("thucydides.batch.count"),
+
+ /**
+ * If batch testing is being used, this is the size of the batches being executed.
+ */
+ BATCH_SIZE("thucydides.batch.size"),
+
+ /**
+ * If batch testing is being used, this is the number of the batch being run on this machine.
+ */
+ BATCH_NUMBER("thucydides.batch.number"),
+
+ /**
+ * HTTP Proxy URL configuration for Firefox
+ */
+ PROXY_URL("thucydides.proxy.http"),
+
+ /**
+ * HTTP Proxy port configuration for Firefox
+ */
+ PROXY_PORT("thucydides.proxy.http_port"),
+
+
+ /**
+ * How long webdriver waits for elements to appear by default, in milliseconds.
+ */
+<<<<<<< HEAD
+ TIMEOUTS_IMPLICIT_WAIT("webdriver.timeouts.implicitly.wait"),
+=======
+ TIMEOUTS_IMPLICIT_WAIT("webdriver.timeouts.implicitlywait"),
+>>>>>>> master
+
+ /**
+ * Extension packages. This is a list of packages that will be scanned for custom TagProvider implementations.
+ * To add a custom tag provider, just implement the TagProvider interface and specify the root package for this
+ * provider in this parameter.
+ */
+ EXTENSION_PACKAGES("thucydides.ext.packages"),
+
+ /**
+ * Arguments to be passed to the Chrome driver, separated by commas.
+ */
+ CHROME_SWITCHES("chrome.switches"),
+ /**
+ * Enable JQuery integration.
+ * If set to true (the default), JQuery will be injected into any page that does not already have it.
+ * You can turn this option off for performance reasons if you are not using JQuery selectors.
+ */
+ JQUERY_INTEGRATION("thucydides.jquery.integration"),
+
+ SAUCELABS_TARGET_PLATFORM("saucelabs.target.platform"),
+
+ SAUCELABS_DRIVER_VERSION("saucelabs.driver.version"),
+
+ SAUCELABS_TEST_NAME("saucelabs.test.name"),
+ /**
+ * SauceLabs URL if running the web tests on SauceLabs
+ */
+ SAUCELABS_URL("saucelabs.url"),
+
+ /**
+ * SauceLabs access key - if provided, Thucydides can generate links to the SauceLabs reports that don't require a login.
+ */
+ SAUCELABS_ACCESS_KEY("saucelabs.access.key"),
+
+ /**
+ * SauceLabs user id - if provided with the access key,
+ * Thucydides can generate links to the SauceLabs reports that don't require a login.
+ */
+ SAUCELABS_USER_ID("saucelabs.user.id"),
+
+ /**
+ * Override the default implicit timeout value for the Saucelabs driver.
+ */
+ SAUCELABS_IMPLICIT_TIMEOUT("saucelabs.implicit.timeout"),
+
+ /**
+ * Timeout (in seconds) for retrying file I/O.
+ * Used in net.thucydides.core.resources.FileResources.copyResourceTo().
+ * Sometimes, file I/O fails on Windows machine due to the way Windows handles memory-mapped
+ * files (http://stackoverflow.com/questions/3602783/file-access-synchronized-on-java-object).
+ * This property, if set, will retry copying the resource till timeout. A default value is used
+ * if the property is not set.
+ */
+ FILE_IO_RETRY_TIMEOUT("thucydides.file.io.retry.timeout"),
+
+ /**
+ * Three levels are supported: QUIET, NORMAL and VERBOSE
+ */
+ LOGGING("thucydides.logging"),
+
+ /**
+ * The root package for the tests in a given project.
+ * If provided, Thucydides will log information about the total number of tests to be executed,
+ * and keep a tally of the executed tests. It will also use this as the root package when determining the
+ * capabilities associated with a test.
+ */
+ THUCYDIDES_TEST_ROOT("thucydides.test.root"),
+
+ /**
+ * The hierarchy of capability types.
+ * This is the list of capability types to be used when reading capabilities from the file system
+ * and when organizing the reports. It is a comma-separated list of tags.The default value is: capability, feature
+ */
+ CAPABILITY_TYPES("thucydides.capability.types"),
+
+ /**
+ * The hierarchy of capability types.
+ * This is the list of capability types to be used when reading capabilities from the file system
+ * and when organizing the reports. It is a comma-separated list of tags.The default value is: capability, feature
+ */
+ DATA_DIRECTORY("thucydides.data.dir"),
+
+ STATISTICS_DRIVER("thucydides.statistics.driver_class"),
+ STATISTICS_URL("thucydides.statistics.url"),
+ STATISTICS_USERNAME("thucydides.statistics.username"),
+ STATISTICS_PASSWORD("thucydides.statistics.password"),
+ STATISTICS_DIALECT("thucydides.statistics.dialect");
+
+
+ private String propertyName;
+ public static final int DEFAULT_HEIGHT = 700;
+ public static final int DEFAULT_WIDTH = 960;
+
+ private ThucydidesSystemProperty(final String propertyName) {
+ this.propertyName = propertyName;
+ }
+
+ public String getPropertyName() {
+ return propertyName;
+ }
+
+
+ @Override
+ public String toString() {
+ return propertyName;
+ }
+
+ public String from(EnvironmentVariables environmentVariables) {
+ return environmentVariables.getProperty(getPropertyName());
+ }
+
+ public String from(EnvironmentVariables environmentVariables, String defaultValue) {
+ String value = environmentVariables.getProperty(getPropertyName());
+ if (StringUtils.isEmpty(value)) {
+ return defaultValue;
+ } else {
+ return value;
+ }
+ }
+
+ public boolean isDefinedIn(EnvironmentVariables environmentVariables) {
+ return StringUtils.isNotEmpty(from(environmentVariables));
+ }
+}
View
15 thucydides-core/src/main/java/net/thucydides/core/annotations/Screenshots.java
@@ -0,0 +1,15 @@
+package net.thucydides.core.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Screenshots {
+ boolean onlyOnFailures() default false;
+ boolean beforeAndAfterEachStep() default true;
+ boolean afterEachStep() default false;
+ boolean forEachAction() default false;
+}
View
4 thucydides-core/src/main/java/net/thucydides/core/annotations/TestAnnotations.java
@@ -5,7 +5,7 @@
import com.google.common.collect.ImmutableList;
import net.thucydides.core.model.TestTag;
import net.thucydides.core.reports.html.Formatter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -249,7 +249,6 @@ public TestTag convertToTestTag(WithTag withTag) {
private Converter<Object, TestTag> toTestTags() {
return new Converter<Object, TestTag>() {
- @Override
public TestTag convert(Object tag) {
return convertToTestTag((WithTag) tag);
}
@@ -259,7 +258,6 @@ public TestTag convert(Object tag) {
private Converter<Object, TestTag> fromStringValuesToTestTags() {
return new Converter<Object, TestTag>() {
- @Override
public TestTag convert(Object tagValue) {
return TestTag.withValue((String) tagValue);
}
View
4 thucydides-core/src/main/java/net/thucydides/core/bootstrap/ThucydidesAgent.java
@@ -14,7 +14,6 @@
public final class ThucydidesAgent {
private final ThucydidesContext context;
- private final Optional<String> driver;
/**
* Create a new Thucydides agent instance.
@@ -24,8 +23,7 @@
* @param additionalListeners
*/
public ThucydidesAgent(Optional<String> driver, StepListener... additionalListeners) {
- context = ThucydidesContext.newContext(additionalListeners);
- this.driver = driver;
+ context = ThucydidesContext.newContext(driver, additionalListeners);
}
/**
View
37 thucydides-core/src/main/java/net/thucydides/core/bootstrap/ThucydidesContext.java
@@ -1,7 +1,9 @@
package net.thucydides.core.bootstrap;
+import com.google.common.base.Optional;
import net.thucydides.core.guice.Injectors;
import net.thucydides.core.model.TestOutcome;
+import net.thucydides.core.pages.Pages;
import net.thucydides.core.reports.ReportService;
import net.thucydides.core.steps.BaseStepListener;
import net.thucydides.core.steps.Listeners;
@@ -11,6 +13,8 @@
import net.thucydides.core.steps.StepListener;
import net.thucydides.core.webdriver.Configuration;
import net.thucydides.core.webdriver.WebDriverFactory;
+import net.thucydides.core.webdriver.WebdriverManager;
+import org.openqa.selenium.WebDriver;
import java.io.File;
import java.util.List;
@@ -45,20 +49,42 @@
*/
private File outputDirectory;
+ private String defaultDriver;
+
private WebDriverFactory webDriverFactory;
+ private Pages pages;
+
/**
* Thucydides configuration data
*/
- Configuration configuration;
+ private Configuration configuration;
+
+ private WebdriverManager webdriverManager;
private ThucydidesContext(StepListener... additionalListeners) {
+ this(null, additionalListeners);
+ }
+
+ private ThucydidesContext(String defaultDriver, StepListener... additionalListeners) {
configuration = Injectors.getInjector().getInstance(Configuration.class);
+ webdriverManager = Injectors.getInjector().getInstance(WebdriverManager.class);
outputDirectory = configuration.getOutputDirectory();
- stepFactory = new StepFactory();
+ this.defaultDriver = defaultDriver;
+ if (defaultDriver != null) {
+ webDriverFactory = new WebDriverFactory();
+ pages = new Pages(getDriver());
+ stepFactory = new StepFactory(pages);
+ } else {
+ stepFactory = new StepFactory();
+ }
registerStepListeners(additionalListeners);
reportService = new ReportService(outputDirectory,
- ReportService.getDefaultReporters());
+ ReportService.getDefaultReporters());
+ }
+
+ protected WebDriver getDriver() {
+ return webdriverManager.getWebdriver(defaultDriver);
}
public void setOutputDirectory(File outputDirectory) {
@@ -73,8 +99,9 @@ private void registerStepListeners(StepListener... additionalListeners) {
}
}
- public static ThucydidesContext newContext(StepListener... listeners) {
- ThucydidesContext context = new ThucydidesContext(listeners);
+ public static ThucydidesContext newContext(Optional<String> driver, StepListener... listeners) {
+ ThucydidesContext context = null;
+ context = (driver.isPresent()) ? new ThucydidesContext(listeners) : new ThucydidesContext(driver.get(), listeners);
contextThreadLocal.set(context);
return context;
}
View
2  thucydides-core/src/main/java/net/thucydides/core/csv/InstanceBuilder.java
@@ -2,7 +2,7 @@
import net.thucydides.core.csv.converters.TypeConverter;
import net.thucydides.core.csv.converters.TypeConverters;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import java.lang.reflect.Constructor;
View
2  thucydides-core/src/main/java/net/thucydides/core/csv/converters/BigDecimalTypeConverter.java
@@ -1,6 +1,6 @@
package net.thucydides.core.csv.converters;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
View
9 thucydides-core/src/main/java/net/thucydides/core/digest/Digest.java
@@ -0,0 +1,9 @@
+package net.thucydides.core.digest;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+public class Digest {
+ public static String ofTextValue(final String text) {
+ return DigestUtils.sha256Hex(text);
+ }
+}
View
11 thucydides-core/src/main/java/net/thucydides/core/model/ReportNamer.java
@@ -1,5 +1,6 @@
package net.thucydides.core.model;
+import net.thucydides.core.digest.Digest;
import net.thucydides.core.model.features.ApplicationFeature;
import net.thucydides.core.util.NameConverter;
import org.apache.commons.codec.digest.DigestUtils;
@@ -34,13 +35,13 @@ private ReportNamer(final ReportType type) {
*/
public String getNormalizedTestNameFor(final TestOutcome testOutcome) {
String testName = getBaseTestNameFor(testOutcome);
- return appendSuffixTo(DigestUtils.md5Hex(testName));
+ return appendSuffixTo(Digest.ofTextValue(testName));
}
private String getBaseTestNameFor(TestOutcome testOutcome) {
String testName = "";
if (testOutcome.getUserStory() != null) {
- testName = NameConverter.underscore(testOutcome.getUserStory().getName());
+ testName = NameConverter.underscore(testOutcome.getUserStory().getName());
}
String scenarioName = NameConverter.underscore(testOutcome.getQualifiedMethodName());
return withNoIssueNumbers(appendToIfNotNull(testName, scenarioName));
@@ -58,7 +59,7 @@ public String getSimpleTestNameFor(final TestOutcome testOutcome) {
}
String scenarioName = NameConverter.underscore(testOutcome.getMethodName());
testName = withNoIssueNumbers(withNoArguments(appendToIfNotNull(testName, scenarioName)));
- return appendSuffixTo(DigestUtils.md5Hex(testName));
+ return appendSuffixTo(Digest.ofTextValue(testName));
}
private String appendToIfNotNull(final String baseString, final String nextElement) {
@@ -78,8 +79,8 @@ public String getNormalizedTestNameFor(final ApplicationFeature feature) {
}
public String getNormalizedTestNameFor(String name) {
- String testNameWithUnderscores = NameConverter.underscore(name);
- return appendSuffixTo(DigestUtils.md5Hex(testNameWithUnderscores));
+ String testNameWithUnderscores = NameConverter.underscore(name.toLowerCase());
+ return appendSuffixTo(Digest.ofTextValue(testNameWithUnderscores));
}
private String appendSuffixTo(final String testNameWithUnderscores) {
View
4 thucydides-core/src/main/java/net/thucydides/core/model/Screenshot.java
@@ -1,6 +1,6 @@
package net.thucydides.core.model;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
/**
* Represents a screenshot stored during a test execution.
@@ -72,7 +72,7 @@ public HtmlFormattedInfo(String description) {
}
public String getDescription() {
- return StringEscapeUtils.escapeHtml(description);
+ return StringEscapeUtils.escapeHtml4(description);
}
}
}
View
104 thucydides-core/src/main/java/net/thucydides/core/model/ScreenshotPermission.java
@@ -0,0 +1,104 @@
+package net.thucydides.core.model;
+
+import com.google.common.base.Optional;
+import net.thucydides.core.annotations.Screenshots;
+import net.thucydides.core.webdriver.Configuration;
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.lang.reflect.Method;
+
+public class ScreenshotPermission {
+
+ private final Configuration configuration;
+
+ public ScreenshotPermission(Configuration configuration) {
+ this.configuration = configuration;
+ }
+
+
+ public boolean areAllowed(TakeScreenshots takeScreenshots) {
+ Optional<TakeScreenshots> overrideLevel = methodOverride();
+ if (overrideLevel.isPresent()) {
+ return takeScreenshotLevel(takeScreenshots).isAtLeast(overrideLevel.get());
+ }
+
+ Optional<TakeScreenshots> configuredLevel = configuration.getScreenshotLevel();
+ if (configuredLevel.isPresent()) {
+ return takeScreenshotLevel(takeScreenshots).isAtLeast(configuredLevel.get());
+ } else {
+ return legacyScreenshotConfiguration(takeScreenshots);
+ }
+ }
+
+ private boolean legacyScreenshotConfiguration(TakeScreenshots takeScreenshots) {
+ if (configuration.onlySaveFailingScreenshots()) {
+ return takeScreenshotLevel(takeScreenshots).isAtLeast(TakeScreenshots.FOR_FAILURES);
+ }
+ if (configuration.takeVerboseScreenshots()) {
+ return takeScreenshotLevel(takeScreenshots).isAtLeast(TakeScreenshots.FOR_EACH_ACTION);
+ }
+ return takeScreenshotLevel(takeScreenshots).isAtLeast(TakeScreenshots.BEFORE_AND_AFTER_EACH_STEP);
+ }
+
+ private Optional<TakeScreenshots> methodOverride() {
+ StackTraceElement[] stackTrace = new Throwable().getStackTrace();
+ for (StackTraceElement stackTraceElement : stackTrace) {
+ Method callingMethod = null;
+ try {
+ callingMethod = findMethodIn(stackTraceElement);
+ } catch (ClassNotFoundException ignored) {}
+ if (callingMethod != null && callingMethod.getAnnotation(Screenshots.class) != null) {
+ return Optional.of(screenshotLevelFrom(callingMethod.getAnnotation(Screenshots.class)));
+ }
+ }
+ return Optional.absent();
+ }
+
+ private TakeScreenshots screenshotLevelFrom(Screenshots screenshots) {
+ if (screenshots.onlyOnFailures()) {
+ return TakeScreenshots.FOR_FAILURES;
+ } else if (screenshots.forEachAction()) {
+ return TakeScreenshots.FOR_EACH_ACTION;
+ } else if (screenshots.afterEachStep()) {
+ return TakeScreenshots.AFTER_EACH_STEP;
+ } else if (screenshots.beforeAndAfterEachStep()) {
+ return TakeScreenshots.BEFORE_AND_AFTER_EACH_STEP;
+ } else {
+ return TakeScreenshots.BEFORE_AND_AFTER_EACH_STEP;
+ }
+ }
+
+
+ private Method findMethodIn(StackTraceElement stackTraceElement) throws ClassNotFoundException {
+ if (allowedClassName(stackTraceElement.getClassName())) {
+ Class callingClass = Class.forName(stackTraceElement.getClassName());
+ Method[] methods = ArrayUtils.addAll(callingClass.getDeclaredMethods(), callingClass.getMethods());
+ for (Method method : methods) {
+ if (stackTraceElement.getMethodName().equals(method.getName())) {
+ return method;
+ }
+ }
+ }
+ return null;
+ }
+
+ private boolean allowedClassName(String className) {
+ return !((className.startsWith("sun.")) || (className.startsWith("java.")));
+ }
+
+ private TakeScreenshotsComparer takeScreenshotLevel(TakeScreenshots takeScreenshots) {
+ return new TakeScreenshotsComparer(takeScreenshots);
+ }
+
+ private static class TakeScreenshotsComparer {
+ private final TakeScreenshots takeScreenshots;
+
+ private TakeScreenshotsComparer(TakeScreenshots takeScreenshots) {
+ this.takeScreenshots = takeScreenshots;
+ }
+
+ public boolean isAtLeast(TakeScreenshots requiredLevel) {
+ return takeScreenshots.compareTo(requiredLevel) >= 0;
+ }
+ }
+}
View
8 thucydides-core/src/main/java/net/thucydides/core/model/TakeScreenshots.java
@@ -0,0 +1,8 @@
+package net.thucydides.core.model;
+
+public enum TakeScreenshots {
+ FOR_EACH_ACTION,
+ BEFORE_AND_AFTER_EACH_STEP,
+ AFTER_EACH_STEP,
+ FOR_FAILURES
+}
View
21 thucydides-core/src/main/java/net/thucydides/core/pages/HtmlTag.java
@@ -3,8 +3,6 @@
import org.apache.commons.lang3.StringUtils;
import org.openqa.selenium.WebElement;
-import static org.apache.commons.lang3.StringUtils.equals;
-
public class HtmlTag {
protected final WebElement webElement;
@@ -33,12 +31,19 @@ protected static StringMatcher typeFrom(WebElement webElement) {
return new StringMatcher(webElement.getAttribute("type"));
}
- protected static StringMatcher textFrom(WebElement webElement) {
- return new StringMatcher(webElement.getText());
- }
-
public String inHumanReadableForm() {
- return webElement.getTagName() + " (" + webElement.getText() + ")";
+ String tagName = webElement.getTagName();
+ String value = webElement.getAttribute("value");
+ String text = webElement.getText();
+
+ StringBuilder elementDescription = new StringBuilder(tagName);
+ if (StringUtils.isNotEmpty(value)) {
+ elementDescription.append(" - ").append(value);
+ }
+ if (StringUtils.isNotEmpty(text)) {
+ elementDescription.append(" '").append(text).append("'");
+ }
+ return elementDescription.toString();
}
//
@@ -52,7 +57,7 @@ private ButtonTag(WebElement webElement) {
@Override
public String inHumanReadableForm() {
- return "button '" + webElement.getText() + "'";
+ return "button: " + super.inHumanReadableForm();
}
public static boolean canHandleThis(WebElement webElement) {
View
33 thucydides-core/src/main/java/net/thucydides/core/pages/PageObject.java
@@ -16,6 +16,7 @@
import net.thucydides.core.webdriver.WebDriverFactory;
import net.thucydides.core.webdriver.javascript.JavascriptExecutorFacade;
import net.thucydides.core.webelements.Checkbox;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.openqa.selenium.Alert;
import org.openqa.selenium.By;
@@ -27,8 +28,10 @@
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.support.ui.Clock;
import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.Sleeper;
import org.openqa.selenium.support.ui.SystemClock;
+import org.openqa.selenium.support.ui.WebDriverWait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -202,6 +205,7 @@ public PageObject waitFor(ExpectedCondition expectedCondition) {
}
public PageObject waitForRenderedElementsToBePresent(final By byElementCriteria) {
+// waitOnPage().until(ExpectedConditions.visibilityOfElementLocated(byElementCriteria));
getRenderedView().waitForPresenceOf(byElementCriteria);
return this;
}
@@ -211,8 +215,7 @@ public PageObject waitForPresenceOf(String xpathOrCssSelector) {
}
- public PageObject waitForRenderedElementsToDisappear(
- final By byElementCriteria) {
+ public PageObject waitForRenderedElementsToDisappear(final By byElementCriteria) {
getRenderedView().waitForElementsToDisappear(byElementCriteria);
return this;
}
@@ -226,14 +229,20 @@ public PageObject waitForAbsenceOf(String xpathOrCssSelector) {
*/
public PageObject waitForTextToAppear(final String expectedText) {
getRenderedView().waitForText(expectedText);
+// waitOnPage().until(ExpectedConditions.visibilityOfElementLocated(By.xpath("//*[contains(.,'" + StringEscapeUtils.escapeXml(expectedText) +"')]")));
return this;
}
public PageObject waitForTitleToAppear(final String expectedTitle) {
- getRenderedView().waitForTitle(expectedTitle);
+ waitOnPage().until(ExpectedConditions.titleIs(expectedTitle));
+ //getRenderedView().waitForTitle(expectedTitle);
return this;
}
+ private WebDriverWait waitOnPage() {
+ return new WebDriverWait(driver, waitForTimeoutInSeconds());
+ }
+
public PageObject waitForTitleToDisappear(final String expectedTitle) {
getRenderedView().waitForTitleToDisappear(expectedTitle);
return this;
@@ -275,6 +284,7 @@ public PageObject waitForTextToDisappear(final String expectedText) {
*/
public PageObject waitForTextToDisappear(final String expectedText,
final long timeout) {
+
getRenderedView().waitForTextToDisappear(expectedText, timeout);
return this;
}
@@ -444,8 +454,9 @@ public void shouldBeVisible(final WebElement field) {
}
public void shouldBeVisible(final By byCriteria) {
- WebElement element = getDriver().findElement(byCriteria);
- shouldBeVisible(element);
+ waitOnPage().until(ExpectedConditions.visibilityOfElementLocated(byCriteria));
+// WebElement element = getDriver().findElement(byCriteria);
+// shouldBeVisible(element);
}
public void shouldNotBeVisible(final WebElement field) {
@@ -457,14 +468,16 @@ public void shouldNotBeVisible(final WebElement field) {
}
public void shouldNotBeVisible(final By byCriteria) {
- try {
- WebElement element = getDriver().findElement(byCriteria);
- shouldNotBeVisible(element);
- } catch (NoSuchElementException e) {
- // A non-existant element is not visible
+ List<WebElement> matchingElements = getDriver().findElements(byCriteria);
+ if (!matchingElements.isEmpty()) {
+ waitOnPage().until(ExpectedConditions.invisibilityOfElementLocated(byCriteria));
}
}
+ private long waitForTimeoutInSeconds() {
+ return (waitForTimeoutInMilliseconds < 1000) ? 1 : (waitForTimeoutInMilliseconds/1000);
+ }
+
public String updateUrlWithBaseUrlIfDefined(final String startingUrl) {
String baseUrl = pageUrls.getBaseUrl();
View
16 thucydides-core/src/main/java/net/thucydides/core/pages/RenderedPageObjectView.java
@@ -2,6 +2,7 @@
import net.thucydides.core.scheduling.NormalFluentWait;
import net.thucydides.core.scheduling.ThucydidesFluentWait;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.openqa.selenium.By;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.NoSuchFrameException;
@@ -10,15 +11,19 @@
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.Clock;
import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.FluentWait;
import org.openqa.selenium.support.ui.Sleeper;
import org.openqa.selenium.support.ui.SystemClock;
+import org.openqa.selenium.support.ui.WebDriverWait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import static com.google.common.collect.Lists.reverse;
+
/**
* A page view that handles checking and waiting for element visibility.
*/
@@ -85,7 +90,9 @@ public void waitFor(final ExpectedCondition expectedCondition) {
* This method will wait until an element is present on the screen, though not necessarily visible.
*/
public void waitForPresenceOf(final By byElementCriteria) {
- waitForCondition().until(elementPresent(byElementCriteria));
+ WebDriverWait wait = new WebDriverWait(driver, 5);
+ wait.until(ExpectedConditions.presenceOfElementLocated(byElementCriteria));
+// waitForCondition().until(elementPresent(byElementCriteria));
}
public boolean elementIsPresent(final By byElementCriteria) {
@@ -166,13 +173,12 @@ private boolean titleIs(final String expectedTitle) {
}
public boolean containsText(final String textValue) {
- String textInBody = String.format("//body[contains(.,\"%s\")]",
- textValue);
- List<WebElement> elements = driver.findElements(By.xpath(textInBody));
+ String textInBody = ".//*[contains(.,'" + StringEscapeUtils.escapeXml(textValue) +"')]";
+ List<WebElement> elements = reverse(driver.findElements(By.xpath(textInBody)));
if (foundNo(elements)) {
return false;
}
- return true;
+ return elements.get(0).isDisplayed();
}
private boolean foundNo(List<WebElement> elements) {
View
5 thucydides-core/src/main/java/net/thucydides/core/pages/WebElementFacade.java
@@ -207,7 +207,7 @@ public void shouldBeCurrentlyVisible() {
* Throws an AssertionError if the element is not rendered.
*/
public void shouldNotBeVisible() {
- if (isVisible()) {
+ if (isCurrentlyVisible()) {
throw new AssertionError("Element should not be visible");
}
}
@@ -538,7 +538,6 @@ public WebElementFacade waitUntilNotVisible() {
} catch (TimeoutException timeout) {
throwErrorWithCauseIfPresent(timeout, "Expected hidden element was displayed");
}
- notifyScreenChange();
return this;
}
@@ -560,7 +559,6 @@ public String getText() {
public WebElementFacade waitUntilEnabled() {
try {
waitForCondition().until(elementIsEnabled());
- notifyScreenChange();
return this;
} catch (TimeoutException timeout) {
throw new ElementNotVisibleException("Expected enabled element " + this + "was not enabled" , timeout);
@@ -570,7 +568,6 @@ public WebElementFacade waitUntilEnabled() {
public WebElementFacade waitUntilDisabled() {
try {
waitForCondition().until(elementIsNotEnabled());
- notifyScreenChange();
return this;
} catch (TimeoutException timeout) {
throw new ElementNotVisibleException("Expected disabled element " + this + " was not disabled", timeout);
View
2  thucydides-core/src/main/java/net/thucydides/core/reports/TestOutcomes.java
@@ -22,7 +22,7 @@