From f6857c1326dc29b0b0b7fdff5604eeb6ed0d26bb Mon Sep 17 00:00:00 2001
From: davidely <davidely@localhost>
Date: Fri, 16 Mar 2007 21:28:27 +0000
Subject: [PATCH] System.err contents were not being output on a test failure due to a copy and paste bug. This is now fixed. I've also backed out revision 1432 since we now get the same info plus a little more.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java | 4 +---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
index 8b45097..c545422 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
@@ -264,7 +264,7 @@
}
String systemErr = TestCaseUtils.getSystemErrContents();
- if (systemOut.length() > 0) {
+ if (systemErr.length() > 0) {
failureInfo.append(EOL + "System.err contents:" + EOL + systemErr);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
index 198b573..3437f32 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
@@ -1442,9 +1442,7 @@
diffFromExpected = diffLdif(params._expectedResultsLdif, searchResults);
// Ignoring whitespace the diff should be empty.
- Assert.assertTrue(diffFromExpected.replaceAll("\\s", "").length() == 0,
- "Difference from expected results:" + EOL +
- diffFromExpected);
+ Assert.assertTrue(diffFromExpected.replaceAll("\\s", "").length() == 0);
} catch (Throwable e) {
System.err.println(
"Started with dit:\n" +
--
Gitblit v1.10.0