Debugger wire protocol: setting breakpoints

runtime/vm/debugger_api_impl_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/unit_test.h"
 
 namespace dart {
@@ skipping 593 matching lines @@
       "  c = add(a, b) {      \n"
       "    return a + b;      \n"
       "  };                   \n"
       "  return c(10, 20);    \n"
       "}                      \n";
 
   LoadScript(kScriptChars);
   Dart_SetBreakpointHandler(&ExprClosureBreakpointHandler);
 
   Dart_Handle script_url = Dart_NewString(TestCase::url());
-  Dart_Handle line_no = Dart_NewInteger(5);  // In closure 'add'.
-  Dart_Breakpoint bpt;
-  Dart_Handle res = Dart_SetBreakpointAtLine(script_url, line_no, &bpt);
+  intptr_t line_no = 5;  // In closure 'add'.
+  Dart_Handle res = Dart_SetBreakpoint(script_url, line_no);
   EXPECT_NOT_ERROR(res);
+  EXPECT(Dart_IsInteger(res));
 
   breakpoint_hit_counter = 0;
   Dart_Handle retval = Invoke("main");
   EXPECT_NOT_ERROR(retval);
   int64_t int_value = 0;
   Dart_IntegerToInt64(retval, &int_value);
   EXPECT_EQ(30, int_value);
   EXPECT_EQ(1, breakpoint_hit_counter);
 }
 
 
+static intptr_t bp_id_to_be_deleted;
+
 static void DeleteBreakpointHandler(Dart_Breakpoint bpt,
                                     Dart_StackTrace trace) {
   const char* expected_trace[] = {"foo", "main"};
   const intptr_t expected_trace_length = 2;
   breakpoint_hit_counter++;
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_NOT_ERROR(res);
   EXPECT_EQ(expected_trace_length, trace_len);
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
     res = Dart_GetActivationFrame(trace, i, &frame);
     EXPECT_NOT_ERROR(res);
     Dart_Handle func_name;
     res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL);
     EXPECT_NOT_ERROR(res);
     EXPECT(Dart_IsString(func_name));
     const char* name_chars;
     Dart_StringToCString(func_name, &name_chars);
     EXPECT_STREQ(expected_trace[i], name_chars);
     if (verbose) OS::Print("  >> %d: %s\n", i, name_chars);
   }
   // Remove the breakpoint after we've hit it twice
   if (breakpoint_hit_counter == 2) {
     if (verbose) OS::Print("uninstalling breakpoint\n");
-    Dart_Handle res = Dart_DeleteBreakpoint(bpt);
+    Dart_Handle res = Dart_RemoveBreakpoint(bp_id_to_be_deleted);
     EXPECT_NOT_ERROR(res);
   }
 }
 
 
 TEST_CASE(Debug_DeleteBreakpoint) {
   const char* kScriptChars =
       "moo(s) { }             \n"
       "                       \n"
       "foo() {                \n"
       "    moo('good news');  \n"
       "}                      \n"
       "                       \n"
       "void main() {          \n"
       "  foo();               \n"
       "  foo();               \n"
       "  foo();               \n"
       "}                      \n";
 
   LoadScript(kScriptChars);
 
   Dart_Handle script_url = Dart_NewString(TestCase::url());
-  Dart_Handle line_no = Dart_NewInteger(4);  // In function 'foo'.
+  intptr_t line_no = 4;  // In function 'foo'.
 
   Dart_SetBreakpointHandler(&DeleteBreakpointHandler);
 
-  Dart_Breakpoint bpt;
-  Dart_Handle res = Dart_SetBreakpointAtLine(script_url, line_no, &bpt);
+  Dart_Handle res = Dart_SetBreakpoint(script_url, line_no);
   EXPECT_NOT_ERROR(res);
+  EXPECT(Dart_IsInteger(res));
+  int64_t bp_id = 0;
+  Dart_IntegerToInt64(res, &bp_id);
 
   // Function main() calls foo() 3 times. On the second iteration, the
   // breakpoint is removed by the handler, so we expect the breakpoint
   // to fire twice only.
+  bp_id_to_be_deleted = bp_id;
   breakpoint_hit_counter = 0;
   Dart_Handle retval = Invoke("main");
   EXPECT(!Dart_IsError(retval));
   EXPECT_EQ(2, breakpoint_hit_counter);
 }
 
 
 static void InspectStaticFieldHandler(Dart_Breakpoint bpt,
                                       Dart_StackTrace trace) {
   ASSERT(script_lib != NULL);
@@ skipping 268 matching lines @@
   EXPECT(Dart_IsString(source));
   char const* source_chars;
   Dart_StringToCString(source, &source_chars);
   OS::Print("\n=== source: ===\n%s", source_chars);
   EXPECT_STREQ(kScriptChars, source_chars);
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart