From 8ee3ca1f202559576b4c6bc6b806d8ee9e444e64 Mon Sep 17 00:00:00 2001 From: mkulikov Date: Mon, 18 Mar 2019 21:59:31 +0400 Subject: [PATCH 1/4] update JSErrorsCollectorListener and JSErrorsExtension --- .../java/com/github/automatedowl/tools/JSErrorsExtension.java | 2 +- .../github/automatedowl/tools/JSErrorsCollectorListener.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java b/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java index fe277c1..35f0924 100644 --- a/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java +++ b/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java @@ -55,7 +55,7 @@ public void afterTestExecution(ExtensionContext context) { assertThrows(WebDriverException.class, ()->{ throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); }); - } else if (isAssertJSErrorsEnabled(context) && getJSErrorsFromLogEntries(logEntries).anyMatch(e -> true)) { + } else if (isAssertJSErrorsEnabled(context) && getJSErrorsFromLogEntries(logEntries)..count()!=0) { throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); } } diff --git a/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java b/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java index ca616b6..0bfdc1a 100644 --- a/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java +++ b/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java @@ -62,9 +62,9 @@ public void afterInvocation(IInvokedMethod iInvokedMethod, ITestResult iTestResu // Don't throw exception on unit test. } else if (isAssertJSErrorsEnabled( - iInvokedMethod) && getJSErrorsFromLogEntries(logEntries).anyMatch(e -> true)) { + iInvokedMethod) && getJSErrorsFromLogEntries(logEntries).count()!=0) { logger.severe(JS_ERRORS_EXCEPTION_STRING); - iTestResult.setStatus(ITestResult.FAILURE); + throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); } } } From 7f9b3890350561c7ab5ea5951627bc0871027bee Mon Sep 17 00:00:00 2001 From: mkulikov Date: Mon, 18 Mar 2019 23:09:02 +0400 Subject: [PATCH 2/4] update JSErrorsCollectorListener and JSErrorsExtension --- .../java/com/github/automatedowl/tools/JSErrorsExtension.java | 4 ++-- .../github/automatedowl/tools/JSErrorsCollectorListener.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java b/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java index 35f0924..729df18 100644 --- a/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java +++ b/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java @@ -49,13 +49,13 @@ public void afterTestExecution(ExtensionContext context) { // Check for JS errors assertion boolean flag. // Skip error throwing in case of negative unit test. - if (isAssertJSErrorsEnabled(context) && getJSErrorsFromLogEntries(logEntries).anyMatch(e -> true) + if (isAssertJSErrorsEnabled(context) && getJSErrorsFromLogEntries(logEntries).count()!=0 && context.getTestClass().toString().contains("com.github.automatedowl") && context.getRequiredTestMethod().getName().equals("referenceErrorTest")) { assertThrows(WebDriverException.class, ()->{ throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); }); - } else if (isAssertJSErrorsEnabled(context) && getJSErrorsFromLogEntries(logEntries)..count()!=0) { + } else if (isAssertJSErrorsEnabled(context) && getJSErrorsFromLogEntries(logEntries).count()!=0) { throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); } } diff --git a/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java b/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java index 0bfdc1a..2b682f8 100644 --- a/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java +++ b/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java @@ -54,7 +54,7 @@ public void afterInvocation(IInvokedMethod iInvokedMethod, ITestResult iTestResu // Check for JS errors assertion boolean flag. // Skip error throwing in case of negative unit test. if (isAssertJSErrorsEnabled( - iInvokedMethod) && getJSErrorsFromLogEntries(logEntries).anyMatch(e -> true) + iInvokedMethod) && getJSErrorsFromLogEntries(logEntries).count()!=0 && iInvokedMethod .getTestMethod().getTestClass().toString().contains("com.github.automatedowl") && iInvokedMethod From 7830d2b3b12aca8c58068035dc3871520a6c63c2 Mon Sep 17 00:00:00 2001 From: mkulikov Date: Tue, 19 Mar 2019 14:51:56 +0400 Subject: [PATCH 3/4] update JSErrorsCollectorListener and JSErrorsExtension --- .../java/com/github/automatedowl/tools/JSErrorsExtension.java | 2 +- .../github/automatedowl/tools/JSErrorsCollectorListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java b/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java index 729df18..5174bbf 100644 --- a/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java +++ b/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java @@ -56,7 +56,7 @@ public void afterTestExecution(ExtensionContext context) { throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); }); } else if (isAssertJSErrorsEnabled(context) && getJSErrorsFromLogEntries(logEntries).count()!=0) { - throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); + throw new WebDriverException(getJSErrorsFromLogEntries(logEntries).map(LogEntry::getMessage).collect(Collectors.joining("\n"))); } } diff --git a/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java b/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java index 2b682f8..6fd9fde 100644 --- a/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java +++ b/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java @@ -64,7 +64,7 @@ public void afterInvocation(IInvokedMethod iInvokedMethod, ITestResult iTestResu else if (isAssertJSErrorsEnabled( iInvokedMethod) && getJSErrorsFromLogEntries(logEntries).count()!=0) { logger.severe(JS_ERRORS_EXCEPTION_STRING); - throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); + throw new WebDriverException(getJSErrorsFromLogEntries(logEntries).map(LogEntry::getMessage).collect(Collectors.joining("\n"))); } } } From f81e100d77c31532fd76a8dd2a0110bb787c1d5f Mon Sep 17 00:00:00 2001 From: mkulikov Date: Tue, 19 Mar 2019 17:32:52 +0400 Subject: [PATCH 4/4] update JSErrorsCollectorListener and JSErrorsExtension --- .../java/com/github/automatedowl/tools/JSErrorsExtension.java | 2 +- .../github/automatedowl/tools/JSErrorsCollectorListener.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java b/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java index 5174bbf..729df18 100644 --- a/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java +++ b/junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java @@ -56,7 +56,7 @@ public void afterTestExecution(ExtensionContext context) { throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); }); } else if (isAssertJSErrorsEnabled(context) && getJSErrorsFromLogEntries(logEntries).count()!=0) { - throw new WebDriverException(getJSErrorsFromLogEntries(logEntries).map(LogEntry::getMessage).collect(Collectors.joining("\n"))); + throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING); } } diff --git a/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java b/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java index 6fd9fde..95d1aad 100644 --- a/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java +++ b/testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java @@ -1,7 +1,6 @@ package com.github.automatedowl.tools; import com.github.automatedowl.tools.drivers.testngholder.JSErrorsDriverHolder; -import org.openqa.selenium.WebDriverException; import org.openqa.selenium.logging.LogEntry; import org.openqa.selenium.logging.LogType; import org.testng.*; @@ -10,6 +9,7 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import java.util.stream.Stream; /** TestNG listener for JSErrorsCollectorTestNG annotation. @@ -64,7 +64,7 @@ public void afterInvocation(IInvokedMethod iInvokedMethod, ITestResult iTestResu else if (isAssertJSErrorsEnabled( iInvokedMethod) && getJSErrorsFromLogEntries(logEntries).count()!=0) { logger.severe(JS_ERRORS_EXCEPTION_STRING); - throw new WebDriverException(getJSErrorsFromLogEntries(logEntries).map(LogEntry::getMessage).collect(Collectors.joining("\n"))); + Assert.fail(getJSErrorsFromLogEntries(logEntries).map(LogEntry::getMessage).collect(Collectors.joining("\n"))); } } }