Skip to content

report assertion errors as 'failures' and other runtime exceptions as 'errors', consistent with Junit terminology #371

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 1 commit into
base: main
Choose a base branch
from
Open

report assertion errors as 'failures' and other runtime exceptions as 'errors', consistent with Junit terminology #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ public boolean isError() {
return false;
}

return result.getThrowable().map(thr -> thr instanceof AssertionError).orElse(false);
if (result.getStatus() == TestExecutionResult.Status.ABORTED) {
return true;
}

return result.getThrowable().map(thr -> (!(thr instanceof AssertionError))).orElse(false);
}

public boolean isFailure() {
Expand All @@ -90,11 +94,8 @@ public boolean isFailure() {
|| isSkipped()) {
return false;
}
if (result.getStatus() == TestExecutionResult.Status.ABORTED) {
return true;
}

return result.getThrowable().map(thr -> (!(thr instanceof AssertionError))).orElse(false);
return result.getThrowable().map(thr -> thr instanceof AssertionError).orElse(false);
}

public boolean isDisabled() {
Expand Down
36 changes: 18 additions & 18 deletions .../test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@ public class BazelJUnitOutputListenerTest {
private TestDescriptor testDescriptor = new StubbedTestDescriptor(createId("descriptors"));
private TestIdentifier identifier = TestIdentifier.from(testDescriptor);

/** This latch is used in TestAfterAllFails for testAfterAllFailuresAreReported */
private static final AtomicBoolean causeFailure = new AtomicBoolean(false);
/** This latch is used in TestAfterAllErrors for testAfterAllFailuresAreReported */
private static final AtomicBoolean causeError = new AtomicBoolean(false);

static final class TestAfterAllFails {
static final class TestAfterAllErrors {

@SuppressFBWarnings(value = "THROWS_METHOD_THROWS_RUNTIMEEXCEPTION")
@AfterAll
static void afterAll() {
if (causeFailure.get()) {
throw new RuntimeException("I always fail.");
if (causeError.get()) {
throw new RuntimeException("I always error.");
}
}

Expand All @@ -79,11 +79,11 @@ void test() {}

@Test
public void testAfterAllFailuresAreReported() throws IOException {
causeFailure.set(true);
causeError.set(true);

// First let's do a sanity test that we have the expected failures for the @AfterAll
EngineTestKit.engine("junit-jupiter")
.selectors(selectClass(TestAfterAllFails.class))
.selectors(selectClass(TestAfterAllErrors.class))
.execute()
.containerEvents()
.assertStatistics(stats -> stats.skipped(0).started(2).succeeded(1).aborted(0).failed(1));
Expand All @@ -97,7 +97,7 @@ public void testAfterAllFailuresAreReported() throws IOException {
Launcher launcher = LauncherFactory.create(config);

LauncherDiscoveryRequestBuilder request =
LauncherDiscoveryRequestBuilder.request().selectors(selectClass(TestAfterAllFails.class));
LauncherDiscoveryRequestBuilder.request().selectors(selectClass(TestAfterAllErrors.class));

launcher.discover(request.build());

Expand All @@ -106,7 +106,7 @@ public void testAfterAllFailuresAreReported() throws IOException {

// now write an assertion to validate the XML file has an error
String[] expectedStrings = {
"<failure message=\"I always fail.\" type=\"java.lang.RuntimeException\">", "failures=\"1\"",
"<error message=\"I always error.\" type=\"java.lang.RuntimeException\">", "errors=\"1\"",
};

// Useful for debugging the expected output
Expand All @@ -118,7 +118,7 @@ public void testAfterAllFailuresAreReported() throws IOException {
"Expected to find " + expected + " in " + xmlFile);
}

causeFailure.set(false);
causeError.set(false);
}

@Test
Expand Down Expand Up @@ -338,14 +338,14 @@ void testSuiteError(@TempDir Path tempDir)
assertEquals(1, testsuiteList.getLength());
Element testsuite = (Element) testsuiteList.item(0);
assertEquals("4", testsuite.getAttribute("tests"));
assertEquals("4", testsuite.getAttribute("failures"));
assertEquals("4", testsuite.getAttribute("errors"));

NodeList testcaseList = testsuite.getElementsByTagName("testcase");
assertEquals(4, testcaseList.getLength());

for (int i = 0; i < testcaseList.getLength(); i++) {
Element testcase = (Element) testcaseList.item(i);
assertNotNull(getChild("failure", testcase));
assertNotNull(getChild("error", testcase));
}
}

Expand All @@ -357,10 +357,10 @@ void throwablesWithNullMessageAreSerialized() {
assertNotNull(root);
assertEquals("testcase", root.getTagName());

var failures = root.getElementsByTagName("failure");
assertEquals(1, failures.getLength());
var errors = root.getElementsByTagName("error");
assertEquals(1, errors.getLength());

var message = failures.item(0).getAttributes().getNamedItem("message");
var message = errors.item(0).getAttributes().getNamedItem("message");
assertNotNull(message);
assertEquals("null", message.getTextContent());
}
Expand All @@ -387,10 +387,10 @@ void throwablesWithIllegalXmlCharactersInMessageAreSerialized() {
assertNotNull(root);
assertEquals("testcase", root.getTagName());

var failures = root.getElementsByTagName("failure");
assertEquals(1, failures.getLength());
var errors = root.getElementsByTagName("error");
assertEquals(1, errors.getLength());

var message = failures.item(0).getAttributes().getNamedItem("message");
var message = errors.item(0).getAttributes().getNamedItem("message");
assertNotNull(message);
assertEquals(
"legal: | | | [ -\uD7FF] | [\uE000-�]"
Expand Down
Loading