Moving gtest PrintTo helpers into its own file.

Author: ashgti

lldb/include/lldb/Protocol/MCP/Protocol.h

@@ -45,7 +45,6 @@ struct Request {
 llvm::json::Value toJSON(const Request &);
 bool fromJSON(const llvm::json::Value &, Request &, llvm::json::Path);
 bool operator==(const Request &, const Request &);
-void PrintTo(const Request &req, std::ostream *os);
 
 enum ErrorCode : signed {
   /// Invalid JSON was received by the server. An error occurred on the server
@@ -92,7 +91,6 @@ struct Response {
 llvm::json::Value toJSON(const Response &);
 bool fromJSON(const llvm::json::Value &, Response &, llvm::json::Path);
 bool operator==(const Response &, const Response &);
-void PrintTo(const Response &resp, std::ostream *os);
 
 /// A notification which does not expect a response.
 /// See
@@ -106,7 +104,6 @@ struct Notification {
 llvm::json::Value toJSON(const Notification &);
 bool fromJSON(const llvm::json::Value &, Notification &, llvm::json::Path);
 bool operator==(const Notification &, const Notification &);
-void PrintTo(const Notification &note, std::ostream *os);
 
 /// A general message as defined by the JSON-RPC 2.0 spec.
 using Message = std::variant<Request, Response, Notification>;
@@ -116,7 +113,6 @@ static_assert(std::is_convertible_v<Message, Message>,
               "Message is not convertible to itself");
 bool fromJSON(const llvm::json::Value &, Message &, llvm::json::Path);
 llvm::json::Value toJSON(const Message &);
-void PrintTo(const Message &message, std::ostream *os);
 
 /// A known resource that the server is capable of reading.
 ///

lldb/source/Protocol/MCP/Protocol.cpp

@@ -81,10 +81,6 @@ bool operator==(const Request &a, const Request &b) {
   return a.id == b.id && a.method == b.method && a.params == b.params;
 }
 
-void PrintTo(const Request &req, std::ostream *os) {
-  *os << formatv("{0}", toJSON(req)).str();
-}
-
 llvm::json::Value toJSON(const Error &E) {
   llvm::json::Object Result{{"code", E.code}, {"message", E.message}};
   if (E.data)
@@ -148,10 +144,6 @@ bool operator==(const Response &a, const Response &b) {
   return a.id == b.id && a.result == b.result;
 }
 
-void PrintTo(const Response &resp, std::ostream *os) {
-  *os << formatv("{0}", toJSON(resp)).str();
-}
-
 llvm::json::Value toJSON(const Notification &N) {
   llvm::json::Object Result{{"jsonrpc", "2.0"}, {"method", N.method}};
   if (N.params)
@@ -175,15 +167,6 @@ bool operator==(const Notification &a, const Notification &b) {
   return a.method == b.method && a.params == b.params;
 }
 
-void PrintTo(const Notification &note, std::ostream *os) {
-  *os << formatv("{0}", toJSON(note)).str();
-}
-
-void PrintTo(const Message &message, std::ostream *os) {
-  return std::visit([os](auto &&message) { return PrintTo(message, os); },
-                    message);
-}
-
 bool fromJSON(const llvm::json::Value &V, Resource &R, llvm::json::Path P) {
   llvm::json::ObjectMapper O(V, P);
   return O && O.map("uri", R.uri) && O.map("name", R.name) &&

lldb/unittests/Protocol/ProtocolMCPServerTest.cpp

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "ProtocolMCPTestUtilities.h"
 #include "TestingSupport/Host/JSONTransportTestUtilities.h"
 #include "TestingSupport/Host/PipeTestUtilities.h"
 #include "TestingSupport/SubsystemRAII.h"

lldb/unittests/Protocol/ProtocolMCPTest.cpp

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "ProtocolMCPTestUtilities.h"
 #include "TestingSupport/TestUtilities.h"
 #include "lldb/Protocol/MCP/Protocol.h"
 #include "llvm/Testing/Support/Error.h"

lldb/unittests/Protocol/ProtocolMCPTestUtilities.h

@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_UNITTESTS_PROTOCOL_PROTOCOLMCPTESTUTILITIES_H
+#define LLDB_UNITTESTS_PROTOCOL_PROTOCOLMCPTESTUTILITIES_H
+
+#include "lldb/Protocol/MCP/Protocol.h"
+#include "llvm/Support/FormatVariadic.h"
+#include "llvm/Support/JSON.h" // IWYU pragma: keep
+#include "gtest/gtest.h"       // IWYU pragma: keep
+#include <ostream>
+#include <variant>
+
+namespace lldb_protocol::mcp {
+
+inline void PrintTo(const Request &req, std::ostream *os) {
+  *os << llvm::formatv("{0}", toJSON(req)).str();
+}
+
+inline void PrintTo(const Response &resp, std::ostream *os) {
+  *os << llvm::formatv("{0}", toJSON(resp)).str();
+}
+
+inline void PrintTo(const Notification &note, std::ostream *os) {
+  *os << llvm::formatv("{0}", toJSON(note)).str();
+}
+
+inline void PrintTo(const Message &message, std::ostream *os) {
+  return std::visit([os](auto &&message) { return PrintTo(message, os); },
+                    message);
+}
+
+} // namespace lldb_protocol::mcp
+
+#endif