| commit | e9d03d4ff95bc031e1a5a4848dca1fd9f9b8d170 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Feb 25 02:07:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 25 02:07:29 2023 +0000 |
| tree | 6f4f62583372ef5b04865a5667e4bc532993f3b8 | |
| parent | f22f55ebaf6ffa7f400120c33ce36bd9f09b3000 [diff] | |
| parent | 444ea4c79f4ac1ec602edd0e3d0bb1dfc26d8574 [diff] |
Merge "Add traces to explain test failures" am: 444ea4c79f Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2454706 Change-Id: I7208675e1fe2f5a6a7cdf832cf63e65037b5fb0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/Packet.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/Packet.java index ba88706..baa66e9 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/Packet.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/Packet.java
@@ -1252,6 +1252,10 @@ return reading_data_index == data.length; } + public int remainingData() { + return data.length - reading_data_index; + } + /** * Writes value - val to the array of bytes ar[], beginning from index - to, * size of value is - size bytes. If size is less than 8, the appropriate
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/share/JDWPTestCase.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/share/JDWPTestCase.java index e89b49b..28bf275 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/share/JDWPTestCase.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/share/JDWPTestCase.java
@@ -765,7 +765,7 @@ if (reply.isAllDataRead()) { return; // OK } - printErrorAndFail("Not all data has been read"); + printErrorAndFail("Not all data has been read, remaining=" + reply.remainingData()); } /**