commit | 75ee85088a0d2b3002eb8155baab734c7dd758ad | [log] [tgz] |
---|---|---|
author | Aart Bik <ajcbik@google.com> | Mon Feb 26 23:18:41 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Feb 26 23:18:41 2018 +0000 |
tree | 37652ed6cbe043c4602f4fb18161909dbdbece0e | |
parent | 54907dffd3e5ae5664de7ce8cc5ce5446be32275 [diff] | |
parent | ad8549f37a03ca4b758ad8c755c8cedd06abd901 [diff] |
Merge "Wait for the right number of finalizations." am: fa76b40107 am: b0e6a700f2 am: ad8549f37a Change-Id: Ie8cde55b5e6c8008e2ca6b42a655d0de06a13b7e
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionDebuggee.java index 6f5da51..8d33430 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionDebuggee.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionDebuggee.java
@@ -58,9 +58,7 @@ } int numberOfExpectedFinalizations = 2; - if (messageFromTest.equals(JPDADebuggeeSynchronizer.SGNL_CONTINUE + "1")) { - numberOfExpectedFinalizations = 1; - } else if (!messageFromTest.equals(JPDADebuggeeSynchronizer.SGNL_CONTINUE)) { + if (!messageFromTest.equals(JPDADebuggeeSynchronizer.SGNL_CONTINUE)) { logWriter.println("--> Unexpected message: \"" + messageFromTest + "\""); return; }
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java index 16b6eef..0df0c1a 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java
@@ -132,7 +132,7 @@ logWriter.println("=> Send to Debuggee signal to continue and try to unload checked ObjectID..."); finalSyncMessage = null; - synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_CONTINUE + "1"); // flag value + synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_CONTINUE); String messageFromDebuggee = synchronizer.receiveMessage(); logWriter.println ("\n=> Received message from Debuggee = \"" + messageFromDebuggee + "\"" );