You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2016/12/14 12:10:09 UTC
[02/12] flink git commit: [hotfix] [tests] Improve exception message
for file-based result verification in 'TestBaseUtils'
[hotfix] [tests] Improve exception message for file-based result verification in 'TestBaseUtils'
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/47a61051
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/47a61051
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/47a61051
Branch: refs/heads/master
Commit: 47a61051a903be957d7cffc752d7c71990579c56
Parents: 6cfc841
Author: Stephan Ewen <se...@apache.org>
Authored: Tue Dec 13 12:05:06 2016 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Wed Dec 14 12:43:32 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/flink/test/util/TestBaseUtils.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/47a61051/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java
index b8470b3..251c465 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/TestBaseUtils.java
@@ -76,6 +76,7 @@ import java.util.regex.Pattern;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class TestBaseUtils extends TestLogger {
@@ -323,8 +324,15 @@ public class TestBaseUtils extends TestLogger {
String[] expected = expectedResultStr.isEmpty() ? new String[0] : expectedResultStr.split("\n");
Arrays.sort(expected);
- Assert.assertEquals("Different number of lines in expected and obtained result.", expected.length, result.length);
- Assert.assertArrayEquals(expected, result);
+ if (expected.length != result.length || !Arrays.deepEquals(expected, result)) {
+ String msg = String.format(
+ "Different elements in arrays: expected %d elements and received %d\n" +
+ "files: %s\n expected: %s\n received: %s",
+ expected.length, result.length,
+ Arrays.toString(getAllInvolvedFiles(resultPath, excludePrefixes)),
+ Arrays.toString(expected), Arrays.toString(result));
+ fail(msg);
+ }
break;
}