debugger: regen

Change-Id: Ice753c9cda8bd7cb54bc15e2c3a2c9d05f3b9892
Reviewed-on: https://code-review.googlesource.com/c/35233
Reviewed-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Eno Compton <enocom@google.com>
diff --git a/debugger/apiv2/doc.go b/debugger/apiv2/doc.go
index 56402af..3b582bc 100644
--- a/debugger/apiv2/doc.go
+++ b/debugger/apiv2/doc.go
@@ -19,8 +19,8 @@
 //
 //   NOTE: This package is in alpha. It is not stable, and is likely to change.
 //
-// Examines the call stack and variables of a running application
-// without stopping or slowing it down.
+// Examines the call stack and variables of a running application without
+// stopping or slowing it down.
 //
 // Use the client at cloud.google.com/go/cmd/go-cloud-debug-agent in preference to this.
 package debugger // import "cloud.google.com/go/debugger/apiv2"
diff --git a/debugger/apiv2/mock_test.go b/debugger/apiv2/mock_test.go
index 5059154..f184c69 100644
--- a/debugger/apiv2/mock_test.go
+++ b/debugger/apiv2/mock_test.go
@@ -46,6 +46,57 @@
 var _ = ptypes.MarshalAny
 var _ status.Status
 
+type mockController2Server struct {
+	// Embed for forward compatibility.
+	// Tests will keep working if more methods are added
+	// in the future.
+	clouddebuggerpb.Controller2Server
+
+	reqs []proto.Message
+
+	// If set, all calls return this error.
+	err error
+
+	// responses to return if err == nil
+	resps []proto.Message
+}
+
+func (s *mockController2Server) RegisterDebuggee(ctx context.Context, req *clouddebuggerpb.RegisterDebuggeeRequest) (*clouddebuggerpb.RegisterDebuggeeResponse, error) {
+	md, _ := metadata.FromIncomingContext(ctx)
+	if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
+		return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
+	}
+	s.reqs = append(s.reqs, req)
+	if s.err != nil {
+		return nil, s.err
+	}
+	return s.resps[0].(*clouddebuggerpb.RegisterDebuggeeResponse), nil
+}
+
+func (s *mockController2Server) ListActiveBreakpoints(ctx context.Context, req *clouddebuggerpb.ListActiveBreakpointsRequest) (*clouddebuggerpb.ListActiveBreakpointsResponse, error) {
+	md, _ := metadata.FromIncomingContext(ctx)
+	if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
+		return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
+	}
+	s.reqs = append(s.reqs, req)
+	if s.err != nil {
+		return nil, s.err
+	}
+	return s.resps[0].(*clouddebuggerpb.ListActiveBreakpointsResponse), nil
+}
+
+func (s *mockController2Server) UpdateActiveBreakpoint(ctx context.Context, req *clouddebuggerpb.UpdateActiveBreakpointRequest) (*clouddebuggerpb.UpdateActiveBreakpointResponse, error) {
+	md, _ := metadata.FromIncomingContext(ctx)
+	if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
+		return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
+	}
+	s.reqs = append(s.reqs, req)
+	if s.err != nil {
+		return nil, s.err
+	}
+	return s.resps[0].(*clouddebuggerpb.UpdateActiveBreakpointResponse), nil
+}
+
 type mockDebugger2Server struct {
 	// Embed for forward compatibility.
 	// Tests will keep working if more methods are added
@@ -121,72 +172,21 @@
 	return s.resps[0].(*clouddebuggerpb.ListDebuggeesResponse), nil
 }
 
-type mockController2Server struct {
-	// Embed for forward compatibility.
-	// Tests will keep working if more methods are added
-	// in the future.
-	clouddebuggerpb.Controller2Server
-
-	reqs []proto.Message
-
-	// If set, all calls return this error.
-	err error
-
-	// responses to return if err == nil
-	resps []proto.Message
-}
-
-func (s *mockController2Server) RegisterDebuggee(ctx context.Context, req *clouddebuggerpb.RegisterDebuggeeRequest) (*clouddebuggerpb.RegisterDebuggeeResponse, error) {
-	md, _ := metadata.FromIncomingContext(ctx)
-	if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
-		return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
-	}
-	s.reqs = append(s.reqs, req)
-	if s.err != nil {
-		return nil, s.err
-	}
-	return s.resps[0].(*clouddebuggerpb.RegisterDebuggeeResponse), nil
-}
-
-func (s *mockController2Server) ListActiveBreakpoints(ctx context.Context, req *clouddebuggerpb.ListActiveBreakpointsRequest) (*clouddebuggerpb.ListActiveBreakpointsResponse, error) {
-	md, _ := metadata.FromIncomingContext(ctx)
-	if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
-		return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
-	}
-	s.reqs = append(s.reqs, req)
-	if s.err != nil {
-		return nil, s.err
-	}
-	return s.resps[0].(*clouddebuggerpb.ListActiveBreakpointsResponse), nil
-}
-
-func (s *mockController2Server) UpdateActiveBreakpoint(ctx context.Context, req *clouddebuggerpb.UpdateActiveBreakpointRequest) (*clouddebuggerpb.UpdateActiveBreakpointResponse, error) {
-	md, _ := metadata.FromIncomingContext(ctx)
-	if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
-		return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
-	}
-	s.reqs = append(s.reqs, req)
-	if s.err != nil {
-		return nil, s.err
-	}
-	return s.resps[0].(*clouddebuggerpb.UpdateActiveBreakpointResponse), nil
-}
-
 // clientOpt is the option tests should use to connect to the test server.
 // It is initialized by TestMain.
 var clientOpt option.ClientOption
 
 var (
-	mockDebugger2   mockDebugger2Server
 	mockController2 mockController2Server
+	mockDebugger2   mockDebugger2Server
 )
 
 func TestMain(m *testing.M) {
 	flag.Parse()
 
 	serv := grpc.NewServer()
-	clouddebuggerpb.RegisterDebugger2Server(serv, &mockDebugger2)
 	clouddebuggerpb.RegisterController2Server(serv, &mockController2)
+	clouddebuggerpb.RegisterDebugger2Server(serv, &mockDebugger2)
 
 	lis, err := net.Listen("tcp", "localhost:0")
 	if err != nil {
@@ -203,6 +203,183 @@
 	os.Exit(m.Run())
 }
 
+func TestController2RegisterDebuggee(t *testing.T) {
+	var expectedResponse *clouddebuggerpb.RegisterDebuggeeResponse = &clouddebuggerpb.RegisterDebuggeeResponse{}
+
+	mockController2.err = nil
+	mockController2.reqs = nil
+
+	mockController2.resps = append(mockController2.resps[:0], expectedResponse)
+
+	var debuggee *clouddebuggerpb.Debuggee = &clouddebuggerpb.Debuggee{}
+	var request = &clouddebuggerpb.RegisterDebuggeeRequest{
+		Debuggee: debuggee,
+	}
+
+	c, err := NewController2Client(context.Background(), clientOpt)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp, err := c.RegisterDebuggee(context.Background(), request)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if want, got := request, mockController2.reqs[0]; !proto.Equal(want, got) {
+		t.Errorf("wrong request %q, want %q", got, want)
+	}
+
+	if want, got := expectedResponse, resp; !proto.Equal(want, got) {
+		t.Errorf("wrong response %q, want %q)", got, want)
+	}
+}
+
+func TestController2RegisterDebuggeeError(t *testing.T) {
+	errCode := codes.PermissionDenied
+	mockController2.err = gstatus.Error(errCode, "test error")
+
+	var debuggee *clouddebuggerpb.Debuggee = &clouddebuggerpb.Debuggee{}
+	var request = &clouddebuggerpb.RegisterDebuggeeRequest{
+		Debuggee: debuggee,
+	}
+
+	c, err := NewController2Client(context.Background(), clientOpt)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp, err := c.RegisterDebuggee(context.Background(), request)
+
+	if st, ok := gstatus.FromError(err); !ok {
+		t.Errorf("got error %v, expected grpc error", err)
+	} else if c := st.Code(); c != errCode {
+		t.Errorf("got error code %q, want %q", c, errCode)
+	}
+	_ = resp
+}
+func TestController2ListActiveBreakpoints(t *testing.T) {
+	var nextWaitToken string = "nextWaitToken1006864251"
+	var waitExpired bool = false
+	var expectedResponse = &clouddebuggerpb.ListActiveBreakpointsResponse{
+		NextWaitToken: nextWaitToken,
+		WaitExpired:   waitExpired,
+	}
+
+	mockController2.err = nil
+	mockController2.reqs = nil
+
+	mockController2.resps = append(mockController2.resps[:0], expectedResponse)
+
+	var debuggeeId string = "debuggeeId-997255898"
+	var request = &clouddebuggerpb.ListActiveBreakpointsRequest{
+		DebuggeeId: debuggeeId,
+	}
+
+	c, err := NewController2Client(context.Background(), clientOpt)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp, err := c.ListActiveBreakpoints(context.Background(), request)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if want, got := request, mockController2.reqs[0]; !proto.Equal(want, got) {
+		t.Errorf("wrong request %q, want %q", got, want)
+	}
+
+	if want, got := expectedResponse, resp; !proto.Equal(want, got) {
+		t.Errorf("wrong response %q, want %q)", got, want)
+	}
+}
+
+func TestController2ListActiveBreakpointsError(t *testing.T) {
+	errCode := codes.PermissionDenied
+	mockController2.err = gstatus.Error(errCode, "test error")
+
+	var debuggeeId string = "debuggeeId-997255898"
+	var request = &clouddebuggerpb.ListActiveBreakpointsRequest{
+		DebuggeeId: debuggeeId,
+	}
+
+	c, err := NewController2Client(context.Background(), clientOpt)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp, err := c.ListActiveBreakpoints(context.Background(), request)
+
+	if st, ok := gstatus.FromError(err); !ok {
+		t.Errorf("got error %v, expected grpc error", err)
+	} else if c := st.Code(); c != errCode {
+		t.Errorf("got error code %q, want %q", c, errCode)
+	}
+	_ = resp
+}
+func TestController2UpdateActiveBreakpoint(t *testing.T) {
+	var expectedResponse *clouddebuggerpb.UpdateActiveBreakpointResponse = &clouddebuggerpb.UpdateActiveBreakpointResponse{}
+
+	mockController2.err = nil
+	mockController2.reqs = nil
+
+	mockController2.resps = append(mockController2.resps[:0], expectedResponse)
+
+	var debuggeeId string = "debuggeeId-997255898"
+	var breakpoint *clouddebuggerpb.Breakpoint = &clouddebuggerpb.Breakpoint{}
+	var request = &clouddebuggerpb.UpdateActiveBreakpointRequest{
+		DebuggeeId: debuggeeId,
+		Breakpoint: breakpoint,
+	}
+
+	c, err := NewController2Client(context.Background(), clientOpt)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp, err := c.UpdateActiveBreakpoint(context.Background(), request)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if want, got := request, mockController2.reqs[0]; !proto.Equal(want, got) {
+		t.Errorf("wrong request %q, want %q", got, want)
+	}
+
+	if want, got := expectedResponse, resp; !proto.Equal(want, got) {
+		t.Errorf("wrong response %q, want %q)", got, want)
+	}
+}
+
+func TestController2UpdateActiveBreakpointError(t *testing.T) {
+	errCode := codes.PermissionDenied
+	mockController2.err = gstatus.Error(errCode, "test error")
+
+	var debuggeeId string = "debuggeeId-997255898"
+	var breakpoint *clouddebuggerpb.Breakpoint = &clouddebuggerpb.Breakpoint{}
+	var request = &clouddebuggerpb.UpdateActiveBreakpointRequest{
+		DebuggeeId: debuggeeId,
+		Breakpoint: breakpoint,
+	}
+
+	c, err := NewController2Client(context.Background(), clientOpt)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp, err := c.UpdateActiveBreakpoint(context.Background(), request)
+
+	if st, ok := gstatus.FromError(err); !ok {
+		t.Errorf("got error %v, expected grpc error", err)
+	} else if c := st.Code(); c != errCode {
+		t.Errorf("got error code %q, want %q", c, errCode)
+	}
+	_ = resp
+}
 func TestDebugger2SetBreakpoint(t *testing.T) {
 	var expectedResponse *clouddebuggerpb.SetBreakpointResponse = &clouddebuggerpb.SetBreakpointResponse{}
 
@@ -514,180 +691,3 @@
 	}
 	_ = resp
 }
-func TestController2RegisterDebuggee(t *testing.T) {
-	var expectedResponse *clouddebuggerpb.RegisterDebuggeeResponse = &clouddebuggerpb.RegisterDebuggeeResponse{}
-
-	mockController2.err = nil
-	mockController2.reqs = nil
-
-	mockController2.resps = append(mockController2.resps[:0], expectedResponse)
-
-	var debuggee *clouddebuggerpb.Debuggee = &clouddebuggerpb.Debuggee{}
-	var request = &clouddebuggerpb.RegisterDebuggeeRequest{
-		Debuggee: debuggee,
-	}
-
-	c, err := NewController2Client(context.Background(), clientOpt)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := c.RegisterDebuggee(context.Background(), request)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if want, got := request, mockController2.reqs[0]; !proto.Equal(want, got) {
-		t.Errorf("wrong request %q, want %q", got, want)
-	}
-
-	if want, got := expectedResponse, resp; !proto.Equal(want, got) {
-		t.Errorf("wrong response %q, want %q)", got, want)
-	}
-}
-
-func TestController2RegisterDebuggeeError(t *testing.T) {
-	errCode := codes.PermissionDenied
-	mockController2.err = gstatus.Error(errCode, "test error")
-
-	var debuggee *clouddebuggerpb.Debuggee = &clouddebuggerpb.Debuggee{}
-	var request = &clouddebuggerpb.RegisterDebuggeeRequest{
-		Debuggee: debuggee,
-	}
-
-	c, err := NewController2Client(context.Background(), clientOpt)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := c.RegisterDebuggee(context.Background(), request)
-
-	if st, ok := gstatus.FromError(err); !ok {
-		t.Errorf("got error %v, expected grpc error", err)
-	} else if c := st.Code(); c != errCode {
-		t.Errorf("got error code %q, want %q", c, errCode)
-	}
-	_ = resp
-}
-func TestController2ListActiveBreakpoints(t *testing.T) {
-	var nextWaitToken string = "nextWaitToken1006864251"
-	var waitExpired bool = false
-	var expectedResponse = &clouddebuggerpb.ListActiveBreakpointsResponse{
-		NextWaitToken: nextWaitToken,
-		WaitExpired:   waitExpired,
-	}
-
-	mockController2.err = nil
-	mockController2.reqs = nil
-
-	mockController2.resps = append(mockController2.resps[:0], expectedResponse)
-
-	var debuggeeId string = "debuggeeId-997255898"
-	var request = &clouddebuggerpb.ListActiveBreakpointsRequest{
-		DebuggeeId: debuggeeId,
-	}
-
-	c, err := NewController2Client(context.Background(), clientOpt)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := c.ListActiveBreakpoints(context.Background(), request)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if want, got := request, mockController2.reqs[0]; !proto.Equal(want, got) {
-		t.Errorf("wrong request %q, want %q", got, want)
-	}
-
-	if want, got := expectedResponse, resp; !proto.Equal(want, got) {
-		t.Errorf("wrong response %q, want %q)", got, want)
-	}
-}
-
-func TestController2ListActiveBreakpointsError(t *testing.T) {
-	errCode := codes.PermissionDenied
-	mockController2.err = gstatus.Error(errCode, "test error")
-
-	var debuggeeId string = "debuggeeId-997255898"
-	var request = &clouddebuggerpb.ListActiveBreakpointsRequest{
-		DebuggeeId: debuggeeId,
-	}
-
-	c, err := NewController2Client(context.Background(), clientOpt)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := c.ListActiveBreakpoints(context.Background(), request)
-
-	if st, ok := gstatus.FromError(err); !ok {
-		t.Errorf("got error %v, expected grpc error", err)
-	} else if c := st.Code(); c != errCode {
-		t.Errorf("got error code %q, want %q", c, errCode)
-	}
-	_ = resp
-}
-func TestController2UpdateActiveBreakpoint(t *testing.T) {
-	var expectedResponse *clouddebuggerpb.UpdateActiveBreakpointResponse = &clouddebuggerpb.UpdateActiveBreakpointResponse{}
-
-	mockController2.err = nil
-	mockController2.reqs = nil
-
-	mockController2.resps = append(mockController2.resps[:0], expectedResponse)
-
-	var debuggeeId string = "debuggeeId-997255898"
-	var breakpoint *clouddebuggerpb.Breakpoint = &clouddebuggerpb.Breakpoint{}
-	var request = &clouddebuggerpb.UpdateActiveBreakpointRequest{
-		DebuggeeId: debuggeeId,
-		Breakpoint: breakpoint,
-	}
-
-	c, err := NewController2Client(context.Background(), clientOpt)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := c.UpdateActiveBreakpoint(context.Background(), request)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if want, got := request, mockController2.reqs[0]; !proto.Equal(want, got) {
-		t.Errorf("wrong request %q, want %q", got, want)
-	}
-
-	if want, got := expectedResponse, resp; !proto.Equal(want, got) {
-		t.Errorf("wrong response %q, want %q)", got, want)
-	}
-}
-
-func TestController2UpdateActiveBreakpointError(t *testing.T) {
-	errCode := codes.PermissionDenied
-	mockController2.err = gstatus.Error(errCode, "test error")
-
-	var debuggeeId string = "debuggeeId-997255898"
-	var breakpoint *clouddebuggerpb.Breakpoint = &clouddebuggerpb.Breakpoint{}
-	var request = &clouddebuggerpb.UpdateActiveBreakpointRequest{
-		DebuggeeId: debuggeeId,
-		Breakpoint: breakpoint,
-	}
-
-	c, err := NewController2Client(context.Background(), clientOpt)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := c.UpdateActiveBreakpoint(context.Background(), request)
-
-	if st, ok := gstatus.FromError(err); !ok {
-		t.Errorf("got error %v, expected grpc error", err)
-	} else if c := st.Code(); c != errCode {
-		t.Errorf("got error code %q, want %q", c, errCode)
-	}
-	_ = resp
-}