From 5b3c5c8a1918ba190bdd20c2711c397ab54ab4eb Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Mon, 9 Jun 2008 17:18:50 +0000 Subject: [PATCH] Complement for bug234289 (JUnit) --- .../org/eclipse/dd/tests/gdb/MIMemoryTest.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIMemoryTest.java b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIMemoryTest.java index efc42ec3cbe..8019f049da2 100644 --- a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIMemoryTest.java +++ b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIMemoryTest.java @@ -483,19 +483,11 @@ public class MIMemoryTest extends BaseTestCase { readMemory(fGdbControlDmc, fBaseAddress, offset, word_size, count); fWait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER); -// // Un-comment this part if GDB returns a bunch of 'N/A's -// // when the address is invalid -// assertTrue(fWait.getMessage(), fWait.isOK()); -// MemoryByte[] buffer = (MemoryByte[]) fWait.getReturnInfo(); -// assertTrue("Wrong value: expected '-1, 0', received '" + buffer[0].getValue() + ", " + buffer[0].getFlags() + "'", -// (buffer[0].getValue() == (byte) -1) && (buffer[0].getFlags() == (byte) 0)); - - // Un-comment this part if GDB returns an error message - // when the address is invalid - String expected = "Unable to read memory"; // Error msg returned by gdb - assertFalse(fWait.getMessage(), fWait.isOK()); - assertTrue("Wrong error message: expected '" + expected + "', received '" + fWait.getMessage() + "'", - fWait.getMessage().contains(expected)); + // Ensure that we receive a block of invalid memory bytes + assertTrue(fWait.getMessage(), fWait.isOK()); + MemoryByte[] buffer = (MemoryByte[]) fWait.getReturnInfo(); + assertTrue("Wrong value: expected '-1, 0', received '" + buffer[0].getValue() + ", " + buffer[0].getFlags() + "'", + (buffer[0].getValue() == (byte) 0) && (buffer[0].getFlags() == (byte) 0)); // Ensure no MemoryChangedEvent event was received assertTrue("MemoryChangedEvent problem: expected " + 0 + ", received " + getEventCount(), getEventCount() == 0);