diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-02-25 03:36:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-25 03:36:31 +0000 |
commit | dbbbe2bb18ca5c3d3a6e9b7d3ff82bc88676715b (patch) | |
tree | 6f4f62583372ef5b04865a5667e4bc532993f3b8 | |
parent | 7fbe4ddbf89fa87b4a06663899610bd244a61db2 (diff) | |
parent | c0f5df56ce5ccd059d6c79f62910c66eb06ab69c (diff) | |
download | apache-harmony-android14-dev.tar.gz |
Merge "Add traces to explain test failures" am: 444ea4c79f am: e9d03d4ff9 am: c0f5df56ceandroid14-dev
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2454706
Change-Id: I1079096292854d1e83629141dc85b4c6c6a8b5b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/Packet.java | 4 | ||||
-rw-r--r-- | jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/share/JDWPTestCase.java | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ public class Packet { 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 @@ public abstract class JDWPTestCase extends JDWPRawTestCase { if (reply.isAllDataRead()) { return; // OK } - printErrorAndFail("Not all data has been read"); + printErrorAndFail("Not all data has been read, remaining=" + reply.remainingData()); } /** |