Fix for an issue w/ breakpointResolved events not being sent.

tests/standalone/debugger/debug_lib.dart

Index: tests/standalone/debugger/debug_lib.dart
===================================================================
--- tests/standalone/debugger/debug_lib.dart	(revision 24161)
+++ tests/standalone/debugger/debug_lib.dart	(working copy)
@@ -231,6 +231,74 @@
 }
 
 
+class LocalsMatcher extends Command {
+  Map locals = {};
+  
+  LocalsMatcher(this.locals) {
+    template = {"id": 0, "command": "getStackTrace", "params": {"isolateId": 0}};
+  }
+
+  void matchResponse(Debugger debugger) {
+    super.matchResponse(debugger);
+    
+    List frames = getJsonValue(debugger.currentMessage, "result:callFrames");
+    assert(frames != null);
+    
+    String functionName = frames[0]['functionName'];
+    List localsList = frames[0]['locals'];
+    Map reportedLocals = {};
+    localsList.forEach((local) => reportedLocals[local['name']] = local['value']);    
+    for (String key in locals.keys) {
+      if (reportedLocals[key] == null) {
+        debugger.error("Error in $functionName(): no value reported for local "
+            "variable $key");
+        return;
+      }
+      String expected = locals[key];
+      String actual = reportedLocals[key]['text'];
+      if (expected != actual) {
+        debugger.error("Error in $functionName(): got '$actual' for local "
+            "variable $key, but expected '$expected'");
+        return;
+      }
+    }
+  }
+}
+
+
+MatchLocals(Map localValues) {
+  return new LocalsMatcher(localValues);
+}
+
+
+class EventMatcher {
+  String eventName;
+  Map params;
+  
+  EventMatcher(this.eventName, this.params);
+  
+  void matchEvent(Debugger debugger) {

[hausner, 2013/06/18 21:05:09]

If an event was matched, it might make sense to take it out of the events list
so you don't accidentally match the same event twice.

+    for (Event event in debugger.events) {
+      if (event.name == eventName) {
+        if (params == null) {
+          return;
+        } else if (matchMaps(params, event.params)) {
+          return;
+        }
+      }
+    }
+    
+    String msg = params == null ? '' : params.toString();
+    debugger.error("Error: could not match event $eventName $msg");
+  }
+}
+
+
+ExpectEvent(String eventName, [Map params]) {
+  return new EventMatcher(eventName, params);
+}
+
+
 class RunCommand extends Command {
   RunCommand.resume() {
     template = {"id": 0, "command": "resume", "params": {"isolateId": 0}};
@@ -276,7 +344,17 @@
 
 SetBreakpoint(int line) => new SetBreakpointCommand(line);
 
+class Event {
+  String name;
+  Map params;
+  
+  Event(Map json) {
+    name = json['event'];
+    params = json['params'];
+  }
+}
 
+
 // A debug script is a list of Command objects.
 class DebugScript {
   List entries;
@@ -285,6 +363,7 @@
     entries.add(MatchFrame(0, "main"));
   }
   bool get isEmpty => entries.isEmpty;
+  bool get isNextEventMatcher => !isEmpty && currentEntry is EventMatcher;
   get currentEntry => entries.last;
   advance() => entries.removeLast();
   add(entry) => entries.add(entry);
@@ -301,6 +380,7 @@
   int seqNr = 0;  // Sequence number of next debugger command message.
   Command lastCommand = null;  // Most recent command sent to target.
   List<String> errors = new List();
+  List<Event> events = new List();
   bool cleanupDone = false;
 
   // Data collected from debug target.
@@ -334,6 +414,8 @@
 
   // Handle debugger events, updating the debugger state.
   void handleEvent(Map<String,dynamic> msg) {
+    events.add(new Event(msg));
+    
     if (msg["event"] == "isolate") {
       if (msg["params"]["reason"] == "created") {
         isolateId = msg["params"]["id"];
@@ -388,6 +470,12 @@
   // Send next debugger command in the script, if a response
   // form the last command has been received and processed.
   void sendNextCommand() {
+    while (script.isNextEventMatcher) {
+      EventMatcher matcher = script.currentEntry;
+      script.advance();      
+      matcher.matchEvent(this);
+    }
+    
     if (lastCommand == null) {
       if (script.currentEntry is Command) {
         script.currentEntry.send(this);