Skip to content

update JSErrorsCollectorListener and JSErrorsExtension #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

update JSErrorsCollectorListener and JSErrorsExtension #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ee3ca1
update JSErrorsCollectorListener and JSErrorsExtension
Mar 18, 2019
7f9b389
update JSErrorsCollectorListener and JSErrorsExtension
Mar 18, 2019
7830d2b
update JSErrorsCollectorListener and JSErrorsExtension
Mar 19, 2019
f81e100
update JSErrorsCollectorListener and JSErrorsExtension
Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions junit5/src/main/java/com/github/automatedowl/tools/JSErrorsExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).anyMatch(e -> true)) {
} else if (isAssertJSErrorsEnabled(context) && getJSErrorsFromLogEntries(logEntries).count()!=0) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the purpose of the change from anyMatch to count? @mkulikov

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logic above returns true when there is items in list, which is more confusing than simple check for count != 0

throw new WebDriverException(JS_ERRORS_EXCEPTION_STRING);
}
}
Expand Down
8 changes: 4 additions & 4 deletions testng/src/main/java/com/github/automatedowl/tools/JSErrorsCollectorListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand All @@ -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.
Expand Down Expand Up @@ -54,17 +54,17 @@ 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
.getTestMethod().getConstructorOrMethod().getMethod().getName().equals("referenceErrorTest")) {
// 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);
Assert.fail(getJSErrorsFromLogEntries(logEntries).map(LogEntry::getMessage).collect(Collectors.joining("\n")));
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you made sure that this addition works well with closing the driver in afterMethod call? @mkulikov

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I'm sure

}
}
}
Expand Down