From cc0bdfdf157fc1d8022ef52c1ee55e177daf2942 Mon Sep 17 00:00:00 2001 From: anshooarora Date: Fri, 7 Feb 2020 20:11:59 -0800 Subject: [PATCH 1/9] #114 displays hierarchical name in the tags view --- .../aventstack/extentreports/model/service/TestService.java | 4 +++- .../extentreports/view/spark/partials/bdd-content.ftl | 4 ++-- .../com/aventstack/extentreports/view/spark/partials/tag.ftl | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/aventstack/extentreports/model/service/TestService.java b/src/main/java/com/aventstack/extentreports/model/service/TestService.java index 1de5b69..e8b96df 100644 --- a/src/main/java/com/aventstack/extentreports/model/service/TestService.java +++ b/src/main/java/com/aventstack/extentreports/model/service/TestService.java @@ -4,6 +4,7 @@ import java.lang.reflect.Method; import com.aventstack.extentreports.gherkin.model.IGherkinFormatterModel; +import com.aventstack.extentreports.gherkin.model.ScenarioOutline; import com.aventstack.extentreports.model.Test; public class TestService { @@ -76,7 +77,8 @@ public static String getHierarchicalName(Test test) { StringBuilder sb = new StringBuilder(test.getName()); while (test.getParent() != null) { test = test.getParent(); - sb.insert(0, test.getName() + "."); + if (!test.isBehaviorDrivenType() || test.getBddType() != ScenarioOutline.class) + sb.insert(0, test.getName() + "."); } return sb.toString(); } diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl index 4c74b0e..a343ad7 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl @@ -31,12 +31,12 @@ <#list node.nodeContext.all as child>
<#list child.nodeContext.all as step> diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/tag.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/tag.ftl index 3afb465..4bfbf91 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/tag.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/tag.ftl @@ -61,7 +61,7 @@ ${test.name} <#if test.parent??>
- ${test.parent.name} + ${TestService.getHierarchicalName(test)}
From a0ce017e49182fc6910df153a4c9eae605011ec0 Mon Sep 17 00:00:00 2001 From: anshooarora Date: Fri, 20 Mar 2020 13:02:58 -0700 Subject: [PATCH 2/9] closes #119 --- .../extentreports/offline/spark/css/spark-style.css | 3 ++- .../extentreports/view/commons/commons-inject-js.ftl | 2 +- .../extentreports/view/spark/partials/standard-content.ftl | 6 +----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/resources/com/aventstack/extentreports/offline/spark/css/spark-style.css b/src/main/resources/com/aventstack/extentreports/offline/spark/css/spark-style.css index 5ab7ae0..aaf555d 100644 --- a/src/main/resources/com/aventstack/extentreports/offline/spark/css/spark-style.css +++ b/src/main/resources/com/aventstack/extentreports/offline/spark/css/spark-style.css @@ -312,7 +312,8 @@ textarea { width: 110px; } img.r-img { - width: 5%; + width: 120px; + height: 75px; } /* nodes */ diff --git a/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-js.ftl b/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-js.ftl index 0a02f3f..8b4335c 100644 --- a/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-js.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-js.ftl @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl index c03fe81..e50b374 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl @@ -7,11 +7,7 @@
From 6e872a9f89a95c135ac357f207cb8001b1acbcef Mon Sep 17 00:00:00 2001 From: anshooarora Date: Fri, 20 Mar 2020 13:06:59 -0700 Subject: [PATCH 3/9] #119 add cdn uri --- .../com/aventstack/extentreports/view/spark/partials/head.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl index 99ea49a..0a8de70 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl @@ -1,4 +1,4 @@ -<#assign resourceCDN=config.getConfig('resourceCDN') cdnURI="cdn.jsdelivr.net/gh/extent-framework/extent-github-cdn@" csscommit="b00a2d0486596e73dd7326beacf352c639623a0e" jscommit="b00a2d0486596e73dd7326beacf352c639623a0e" iconcommit="b00a2d0486596e73dd7326beacf352c639623a0e"> +<#assign resourceCDN=config.getConfig('resourceCDN') cdnURI="cdn.jsdelivr.net/gh/extent-framework/extent-github-cdn@" csscommit="74cc0d02f0116d1b5665bd07f6aea22c71033efe" jscommit="b00a2d0486596e73dd7326beacf352c639623a0e" iconcommit="b00a2d0486596e73dd7326beacf352c639623a0e"> <#if resourceCDN=="extentreports"> <#assign cdnURI="extentreports.com/resx" csscommit="" jscommit="" iconcommit=""> From 4fea295be4051a7fe2d4197f013484dd76fb643d Mon Sep 17 00:00:00 2001 From: anshooarora Date: Fri, 20 Mar 2020 13:40:21 -0700 Subject: [PATCH 4/9] closes #125 --- .../extentreports/model/service/TestService.java | 12 ++++++++++++ .../view/spark/macros/recurse_nodes.ftl | 7 ++++++- .../view/spark/partials/bdd-content.ftl | 10 ++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/aventstack/extentreports/model/service/TestService.java b/src/main/java/com/aventstack/extentreports/model/service/TestService.java index e8b96df..d967747 100644 --- a/src/main/java/com/aventstack/extentreports/model/service/TestService.java +++ b/src/main/java/com/aventstack/extentreports/model/service/TestService.java @@ -40,6 +40,18 @@ public static Boolean testHasLog(Test test) { public static Boolean testHasScreenCapture(Test test) { return !test.getScreenCaptureContext().isEmpty(); } + + public static Boolean testHasScreenCapture(Test test, Boolean deep) { + if (deep) { + Boolean hasScreenCapture = !test.getScreenCaptureContext().isEmpty() + || test.getLogContext().getAll().stream().anyMatch(LogService::logHasScreenCapture); + if (!hasScreenCapture) { + hasScreenCapture = test.getNodeContext().getAll().stream().anyMatch(x -> testHasScreenCapture(x, deep)); + } + return hasScreenCapture; + } + return testHasScreenCapture(test); + } public static Boolean isTestBehaviorDriven(Test test) { return test.getBddType() != null; diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/macros/recurse_nodes.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/macros/recurse_nodes.ftl index 4e5f2be..edf43a8 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/macros/recurse_nodes.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/macros/recurse_nodes.ftl @@ -7,10 +7,15 @@
diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl index a343ad7..9747f4e 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/bdd-content.ftl @@ -23,6 +23,11 @@
+ <#if TestService.testHasScreenCapture(node, true)> +
+ +
+
<#if TestService.testHasChildren(node)> @@ -36,6 +41,11 @@
+ <#if TestService.testHasScreenCapture(child, true)> +
+ +
+
From 5cd67d0d8284225f300e4481a750b5623ebf9e40 Mon Sep 17 00:00:00 2001 From: anshooarora Date: Thu, 9 Apr 2020 12:50:49 -0700 Subject: [PATCH 5/9] #130 synchronize createNode --- src/main/java/com/aventstack/extentreports/ExtentTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/aventstack/extentreports/ExtentTest.java b/src/main/java/com/aventstack/extentreports/ExtentTest.java index d346436..0eff914 100644 --- a/src/main/java/com/aventstack/extentreports/ExtentTest.java +++ b/src/main/java/com/aventstack/extentreports/ExtentTest.java @@ -136,7 +136,7 @@ public class ExtentTest implements IAddsMedia, RunResult, Serializab * * @return {@link ExtentTest} object */ - public ExtentTest createNode(Class type, String name, String description) { + public synchronized ExtentTest createNode(Class type, String name, String description) { if (name == null || name.isEmpty()) throw new IllegalArgumentException("nodeName cannot be null or empty"); @@ -160,7 +160,7 @@ public ExtentTest createNode(Class type, Strin * * @return {@link ExtentTest} object */ - public ExtentTest createNode(String name, String description) { + public synchronized ExtentTest createNode(String name, String description) { if (name == null || name.isEmpty()) throw new IllegalArgumentException("nodeName cannot be null or empty"); @@ -275,7 +275,7 @@ public ExtentTest createNode(String name) { return createNode(name, null); } - private void applyCommonNodeSettings(ExtentTest extentTest) { + private synchronized void applyCommonNodeSettings(ExtentTest extentTest) { extentTest.getModel().setLevel(test.getLevel() + 1); extentTest.getModel().setParent(getModel()); test.getNodeContext().add(extentTest.getModel()); From 9c915db475123a6f83a96b9749a24d132cf5868f Mon Sep 17 00:00:00 2001 From: anshooarora Date: Thu, 9 Apr 2020 13:00:09 -0700 Subject: [PATCH 6/9] closes #132 --- .../aventstack/extentreports/reporter/ExtentSparkReporter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/aventstack/extentreports/reporter/ExtentSparkReporter.java b/src/main/java/com/aventstack/extentreports/reporter/ExtentSparkReporter.java index 5ff5f7f..0ea22ea 100644 --- a/src/main/java/com/aventstack/extentreports/reporter/ExtentSparkReporter.java +++ b/src/main/java/com/aventstack/extentreports/reporter/ExtentSparkReporter.java @@ -73,8 +73,9 @@ public synchronized void flush(ReportAggregates reportAggregates) { try { if (viewStyle == ViewStyle.SPA) { + String fileName = getFileFile().isDirectory() ? getDestinationPath() + "Index.html" : getFilePath(); Template template = getFreemarkerConfig().getTemplate(SPA_TEMPLATE_NAME); - processTemplate(template, new File(getDestinationPath() + "index.html")); + processTemplate(template, new File(fileName)); return; } Template template = getFreemarkerConfig().getTemplate(TEST_TEMPLATE_NAME); From 8d4953ad7949cf23918d1fd8394b1458d08374bc Mon Sep 17 00:00:00 2001 From: anshooarora Date: Thu, 9 Apr 2020 13:11:34 -0700 Subject: [PATCH 7/9] fixes #135 --- config/logger-config.xml | 60 +++++++++---------- config/spark-config.xml | 24 ++++---- config/v3html-config.xml | 24 ++++---- .../view/commons/commons-inject-js.ftl | 1 + .../view/spark/partials/scripts.ftl | 10 ++-- 5 files changed, 59 insertions(+), 60 deletions(-) diff --git a/config/logger-config.xml b/config/logger-config.xml index f3b5742..a0094a6 100644 --- a/config/logger-config.xml +++ b/config/logger-config.xml @@ -1,44 +1,44 @@ - - - - standard - - - - UTF-8 - - - true - - - - https - - - Extent Framework - - - Build 1 + + + + standard + + + + UTF-8 + + + true + + + + https + + + Extent Framework + + + Build 1 MMM dd, yyyy HH:mm:ss - - - + + + - - - - + + + + - - + + diff --git a/config/spark-config.xml b/config/spark-config.xml index 5da2252..0bb21fe 100644 --- a/config/spark-config.xml +++ b/config/spark-config.xml @@ -1,37 +1,37 @@ - + standard - + UTF-8 - + https - + - false - + false + Extent Framework - + Build 1 - + MMM dd, yyyy HH:mm:ss - + true false true true - + - + - + \ No newline at end of file diff --git a/config/v3html-config.xml b/config/v3html-config.xml index 5da2252..0bb21fe 100644 --- a/config/v3html-config.xml +++ b/config/v3html-config.xml @@ -1,37 +1,37 @@ - + standard - + UTF-8 - + https - + - false - + false + Extent Framework - + Build 1 - + MMM dd, yyyy HH:mm:ss - + true false true true - + - + - + \ No newline at end of file diff --git a/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-js.ftl b/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-js.ftl index 8b4335c..dcf035d 100644 --- a/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-js.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-js.ftl @@ -1,3 +1,4 @@ \ No newline at end of file diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/scripts.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/scripts.ftl index 755f96a..8703fa7 100644 --- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/scripts.ftl +++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/scripts.ftl @@ -1,8 +1,6 @@ <#if offline=="true"> - - <#else> - - -<#if config.containsConfig("js") && config.getConfig("js")?has_content> -<#include "../../commons/commons-inject-js.ftl"> + +<#else> + +<#include "../../commons/commons-inject-js.ftl"> From 1a5cc11bf294e00fd016b23a04fb4b5acd2e318f Mon Sep 17 00:00:00 2001 From: anshooarora Date: Thu, 9 Apr 2020 13:16:40 -0700 Subject: [PATCH 8/9] suppress `deprecation` warnings --- .../configuration/ExtentHtmlReporterConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java b/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java index b44b73b..578b62b 100644 --- a/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java +++ b/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java @@ -6,7 +6,6 @@ import com.aventstack.extentreports.ExtentReports; import com.aventstack.extentreports.offline.OfflineResxDelegate; import com.aventstack.extentreports.reporter.BasicFileReporter; -import com.aventstack.extentreports.reporter.ExtentHtmlReporter; import com.aventstack.extentreports.utils.FileUtil; /** @@ -14,7 +13,8 @@ */ public class ExtentHtmlReporterConfiguration extends RichViewReporterConfiguration { - public ExtentHtmlReporterConfiguration(ExtentHtmlReporter reporter) { + @SuppressWarnings("deprecation") + public ExtentHtmlReporterConfiguration(com.aventstack.extentreports.reporter.ExtentHtmlReporter reporter) { super(reporter); } From 284b80e97234f30bf9ee83579697eb079dfd88a4 Mon Sep 17 00:00:00 2001 From: anshooarora Date: Thu, 9 Apr 2020 13:31:02 -0700 Subject: [PATCH 9/9] prepare release 4.1.4 --- CHANGELOG.md | 10 ++++++++ pom-nexus.xml | 2 +- pom.xml | 66 +-------------------------------------------------- 3 files changed, 12 insertions(+), 66 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca627b6..e7aba3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [4.1.4](https://github.com/extent-framework/extentreports-java/compare/v4.1.3...v4.1.4) +#### Improvements +* [#114] ExtentSparkReporter to display hierarchical name in tags view +* [#119] ExtentSparkReporter to display thumbnail screenshots +* [#125] ExtentSparkReporter displays clip icon for tests with leaf containing screenshots +* [#132] ExtentSparkReporter to accept file-name instead of Index.html default + +#### Fixes +* [#135] ExtentSparkReporter issue with not parsing the `scripts` tag in config.xml + ## [4.1.3](https://github.com/extent-framework/extentreports-java/compare/v4.1.2...v4.1.3) #### Improvements * [#119] `ExtentSparkReporter` now displays thumbnails as default diff --git a/pom-nexus.xml b/pom-nexus.xml index 084aa94..7aa8e5c 100644 --- a/pom-nexus.xml +++ b/pom-nexus.xml @@ -5,7 +5,7 @@ com.aventstack extentreports - 4.1.3 + 4.1.4 extentreports www.extentreports.com diff --git a/pom.xml b/pom.xml index 084aa94..f1d2aeb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.aventstack extentreports - 4.1.3 + 4.1.4 extentreports www.extentreports.com @@ -114,20 +114,6 @@ maven-resources-plugin 2.7 - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - org.jacoco jacoco-maven-plugin @@ -150,56 +136,6 @@ - - - release-sign-artifacts - - - performRelease - true - - - - 41414BBD - - anshooarora - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.3 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.3 - - - attach-javadocs - - jar - - - - - - - - - ossrh