From 8885a399b53008a1321dc73dd477b01843cd1679 Mon Sep 17 00:00:00 2001
From: mtorres10 <torres.marco@outlook.com>
Date: Wed, 17 Feb 2021 09:30:35 -0600
Subject: [PATCH] Update extentreports-testng-adapter to 1.2.2 and
 extentreports to 5.0.6. Update report from html report to spark. Update
 pom.xml to execute tests usn mvn test. Add TestSuite.xml for configuration
 (added to pom but commented).

---
 extentreports-testng-adapter-example/pom.xml  | 46 ++++++++++++++---
 .../adapter/testng/tests/ScreenshotTests.java |  2 +-
 .../adapter/testng/tests/TestSuite.xml        | 13 +++++
 .../src/test/resources/extent.properties      | 12 +++--
 .../src/test/resources/spark-config.xml       | 50 +++++++++++++++++++
 5 files changed, 113 insertions(+), 10 deletions(-)
 create mode 100644 extentreports-testng-adapter-example/src/test/java/com/aventstack/extentreports/adapter/testng/tests/TestSuite.xml
 create mode 100644 extentreports-testng-adapter-example/src/test/resources/spark-config.xml

diff --git a/extentreports-testng-adapter-example/pom.xml b/extentreports-testng-adapter-example/pom.xml
index 5fcefa0..abfbbc6 100644
--- a/extentreports-testng-adapter-example/pom.xml
+++ b/extentreports-testng-adapter-example/pom.xml
@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.aventstack</groupId>
@@ -36,24 +36,31 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <surefire.version>3.0.0-M5</surefire.version>
     </properties>
 
     <dependencies>
-		<!-- <dependency>
+        <dependency>
             <groupId>com.aventstack</groupId>
             <artifactId>extentreports-testng-adapter</artifactId>
-            <version>1.0.2</version>
-        </dependency>-->
+            <version>1.2.2</version>
+        </dependency>
         <dependency>
             <groupId>com.aventstack</groupId>
             <artifactId>extentreports</artifactId>
-            <version>4.0.1</version>
+            <version>5.0.6</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>6.9.10</version>
         </dependency>
+        <!-- Below dependency is required in order to work correctly with extentreports-testng-adapter 1.2.2 and extentreports 5.0.6  -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.30</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -72,6 +79,33 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.7</version>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <includes>
+                        <include>**/*Tests.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>sample.java</exclude>
+                    </excludes>
+                    <threadCount>5</threadCount>
+                    <parallel>tests</parallel>
+                    <!--Uncomment below to enable suite execution-->
+                    <!--suiteXmlFiles>
+                        <suiteXmlFile>src/test/java/com/aventstack/extentreports/adapter/testng/tests/TestSuite.xml</suiteXmlFile>
+                    </suiteXmlFiles-->
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-testng</artifactId>
+                        <version>${surefire.version}</version>
+                    </dependency>
+                  </dependencies>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/extentreports-testng-adapter-example/src/test/java/com/aventstack/extentreports/adapter/testng/tests/ScreenshotTests.java b/extentreports-testng-adapter-example/src/test/java/com/aventstack/extentreports/adapter/testng/tests/ScreenshotTests.java
index 909d7cd..936f951 100644
--- a/extentreports-testng-adapter-example/src/test/java/com/aventstack/extentreports/adapter/testng/tests/ScreenshotTests.java
+++ b/extentreports-testng-adapter-example/src/test/java/com/aventstack/extentreports/adapter/testng/tests/ScreenshotTests.java
@@ -24,7 +24,7 @@ public class ScreenshotTests {
 
     // Using the same OUTPUT_PATH as set in extent.properties
     // [extent.reporter.html.out]
-    private static final String OUTPUT_PATH = "test-output/HtmlReport/";
+    private static final String OUTPUT_PATH = "test-output/SparkReport/";
 
     @Test
     public void passTest() {
diff --git a/extentreports-testng-adapter-example/src/test/java/com/aventstack/extentreports/adapter/testng/tests/TestSuite.xml b/extentreports-testng-adapter-example/src/test/java/com/aventstack/extentreports/adapter/testng/tests/TestSuite.xml
new file mode 100644
index 0000000..6c50a4e
--- /dev/null
+++ b/extentreports-testng-adapter-example/src/test/java/com/aventstack/extentreports/adapter/testng/tests/TestSuite.xml
@@ -0,0 +1,13 @@
+<suite name="Sample Tests" verbose="10" thread-count="5" parallel="tests">
+    <listeners>
+        <listener class-name="com.aventstack.extentreports.testng.listener.ExtentITestListenerClassAdapter"/>
+    </listeners>
+
+    <test name="Sample Tests" preserve-order="true">
+        <classes>
+            <class name="com.aventstack.extentreports.adapter.testng.tests.DataProviderTests"/>
+            <class name="com.aventstack.extentreports.adapter.testng.tests.ScreenshotTests"/>
+            <class name="com.aventstack.extentreports.adapter.testng.tests.SimpleAssertTests"/>
+        </classes>
+    </test>
+</suite>
\ No newline at end of file
diff --git a/extentreports-testng-adapter-example/src/test/resources/extent.properties b/extentreports-testng-adapter-example/src/test/resources/extent.properties
index 967f32d..c9c1480 100644
--- a/extentreports-testng-adapter-example/src/test/resources/extent.properties
+++ b/extentreports-testng-adapter-example/src/test/resources/extent.properties
@@ -2,7 +2,7 @@ extent.reporter.avent.start=false
 extent.reporter.bdd.start=false
 extent.reporter.cards.start=false
 extent.reporter.email.start=false
-extent.reporter.html.start=true
+#extent.reporter.html.start=false
 extent.reporter.klov.start=false
 extent.reporter.logger.start=false
 extent.reporter.tabular.start=false
@@ -11,7 +11,7 @@ extent.reporter.avent.config=
 extent.reporter.bdd.config=
 extent.reporter.cards.config=
 extent.reporter.email.config=
-extent.reporter.html.config=src/test/resources/html-config.xml
+#extent.reporter.html.config=src/test/resources/html-config.xml
 extent.reporter.klov.config=
 extent.reporter.logger.config=
 extent.reporter.tabular.config=
@@ -20,6 +20,12 @@ extent.reporter.avent.out=test-output/AventReport/
 extent.reporter.bdd.out=test-output/BddReport/
 extent.reporter.cards.out=test-output/CardsReport/
 extent.reporter.email.out=test-output/EmailReport/ExtentEmail.html
-extent.reporter.html.out=test-output/HtmlReport/ExtentHtml.html
+#extent.reporter.html.out=test-output/HtmlReport/ExtentHtml.html
 extent.reporter.logger.out=test-output/LoggerReport/
 extent.reporter.tabular.out=test-output/TabularReport/
+
+
+extent.reporter.spark.start=true
+extent.reporter.spark.config=src/test/resources/spark-config.xml
+extent.reporter.spark.out=test-output/SparkReport/Index.html
+
diff --git a/extentreports-testng-adapter-example/src/test/resources/spark-config.xml b/extentreports-testng-adapter-example/src/test/resources/spark-config.xml
new file mode 100644
index 0000000..1598057
--- /dev/null
+++ b/extentreports-testng-adapter-example/src/test/resources/spark-config.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extentreports>
+    <configuration>
+
+        <!-- report theme -->
+        <!-- STANDARD, DARK -->
+        <theme>STANDARD</theme>
+
+        <!-- document encoding -->
+        <!-- defaults to UTF-8 -->
+        <encoding>UTF-8</encoding>
+
+        <!-- protocol for script and stylesheets -->
+        <!-- defaults to https -->
+        <!-- HTTP, HTTPS -->
+        <protocol>HTTPS</protocol>
+
+        <!-- offline report -->
+        <timelineEnabled>true</timelineEnabled>
+
+        <!-- offline report -->
+        <enableOfflineMode>false</enableOfflineMode>
+
+        <!-- title of the document -->
+        <documentTitle>Extent Framework</documentTitle>
+
+        <!-- report name - displayed at top-nav -->
+        <reportName>Build 1</reportName>
+
+        <!-- timestamp format -->
+        <timeStampFormat>MMM dd, yyyy HH:mm:ss</timeStampFormat>
+
+        <!-- custom javascript -->
+        <scripts>
+            <![CDATA[
+        $(document).ready(function() {
+
+        });
+      ]]>
+        </scripts>
+
+        <!-- custom styles -->
+        <styles>
+            <![CDATA[
+
+      ]]>
+        </styles>
+
+    </configuration>
+</extentreports>
\ No newline at end of file