From 83fe885241349f2e479753b0452746874c35cc24 Mon Sep 17 00:00:00 2001
From: faleev <pavel.faleev@gmail.com>
Date: Fri, 31 Oct 2014 14:00:13 +0200
Subject: [PATCH 1/3] Improve Allure reporting. Command [mvn -fae clean test &&
 mvn site --non-recursive] - will create report in the folder
 testing-example-java/target/site/allure-maven-plugin.

---
 pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 88a6dc4..eb38ec8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
     <artifactId>testing-example-java</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
+    <url>https://github.com/faleev/testing-example-java</url>
     <modules>
         <module>unit-tests</module>
         <module>wsdl-tests</module>
@@ -17,6 +18,8 @@
         <reportngTitle>Test Execution Results</reportngTitle>
         <testsuite>testng.xml</testsuite>
         <skipTests>false</skipTests>
+        <aspectj.version>1.7.4</aspectj.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
         <dependency>
@@ -71,7 +74,7 @@
         <dependency>
             <groupId>ru.yandex.qatools.allure</groupId>
             <artifactId>allure-testng-adaptor</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.3</version>
             <exclusions>
                 <exclusion>
                     <artifactId>junit</artifactId>
@@ -108,6 +111,9 @@
                     </properties>
                     <workingDirectory>${project.basedir}</workingDirectory>
                     <reportsDirectory>${project.basedir}/target/reports</reportsDirectory>
+                    <argLine>
+                        -javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar
+                    </argLine>
                 </configuration>
             </plugin>
             <plugin>
@@ -142,6 +148,11 @@
                 <groupId>ru.yandex.qatools.allure</groupId>
                 <artifactId>allure-maven-plugin</artifactId>
                 <version>2.0</version>
+                <configuration>
+                    <reportVersion>1.4.3</reportVersion>
+                    <resultsPattern>**/allure-results</resultsPattern>
+                    <outputDirectory>${project.reporting.outputDirectory}/allure-maven-plugin</outputDirectory>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>

From d09cdc503bf86d23629f4e128fd6b33af3a29ee7 Mon Sep 17 00:00:00 2001
From: faleev <pavel.faleev@gmail.com>
Date: Fri, 31 Oct 2014 14:01:02 +0200
Subject: [PATCH 2/3] Add ability to attach Webdriver screenshots to the Allure
 report.

---
 .../com/example/selenium/common/Page.java     | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/selenium-tests/src/main/java/com/example/selenium/common/Page.java b/selenium-tests/src/main/java/com/example/selenium/common/Page.java
index af8f02a..b1819b1 100644
--- a/selenium-tests/src/main/java/com/example/selenium/common/Page.java
+++ b/selenium-tests/src/main/java/com/example/selenium/common/Page.java
@@ -1,19 +1,11 @@
 package com.example.selenium.common;
 
-import com.example.utils.ProjectConfiguration;
-import org.apache.commons.io.FileUtils;
 import org.openqa.selenium.*;
 import org.openqa.selenium.support.PageFactory;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
-import org.testng.Reporter;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import ru.yandex.qatools.allure.annotations.Attachment;
 
 public abstract class Page {
 
@@ -73,19 +65,24 @@ public Boolean apply(WebDriver driver){
         wait.until(ajaxCompletion);
     }
 
-    public static void takeScreenshot(WebDriver driver) {
-        // Known issue: ChromeDriver2 take screenshot is not full page
-        // (https://code.google.com/p/chromedriver/issues/detail?id=294)
-        File screenshot = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
-        String screenshotsDirictory = ProjectConfiguration.getProperty("screenshots.directory.location") + "/screenshots";
-        new File(screenshotsDirictory).mkdirs();
-        String screenshotFilename = dateFormat.format(new Date()) + ".png";
-        try {
-            FileUtils.copyFile(screenshot, new File(screenshotsDirictory + "/" + screenshotFilename));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        Reporter.log("<a href=\"./screenshots/" + screenshotFilename + "\"><img src=\"./screenshots/" + screenshotFilename + "\" alt=\"Screenshot\" width=\"25%\" height=\"25%\">");
+//    public static void takeScreenshot(WebDriver driver) {
+//        // Known issue: ChromeDriver2 take screenshot is not full page
+//        // (https://code.google.com/p/chromedriver/issues/detail?id=294)
+//        File screenshot = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
+//        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
+//        String screenshotsDirictory = ProjectConfiguration.getProperty("screenshots.directory.location") + "/screenshots";
+//        new File(screenshotsDirictory).mkdirs();
+//        String screenshotFilename = dateFormat.format(new Date()) + ".png";
+//        try {
+//            FileUtils.copyFile(screenshot, new File(screenshotsDirictory + "/" + screenshotFilename));
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//        Reporter.log("<a href=\"./screenshots/" + screenshotFilename + "\"><img src=\"./screenshots/" + screenshotFilename + "\" alt=\"Screenshot\" width=\"25%\" height=\"25%\">");
+//    }
+
+    @Attachment(value = "Page screenshot", type = "image/png")
+    public static byte[] takeScreenshot(WebDriver driver) {
+        return ((TakesScreenshot) driver).getScreenshotAs(OutputType.BYTES);
     }
 }

From 1408db06dff752d1e86d5240196162b157b9b96f Mon Sep 17 00:00:00 2001
From: faleev <pavel.faleev@gmail.com>
Date: Fri, 31 Oct 2014 15:00:24 +0200
Subject: [PATCH 3/3] Adding aspectj as a dependency.

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index eb38ec8..adb8375 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.7.4</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>