Author: Sergei Druzhkov Date: 2026-02-03T16:44:13+03:00 New Revision: fb8c5f8d6bb564275140f9d6ab4a45b76937d98e
URL: https://github.com/llvm/llvm-project/commit/fb8c5f8d6bb564275140f9d6ab4a45b76937d98e DIFF: https://github.com/llvm/llvm-project/commit/fb8c5f8d6bb564275140f9d6ab4a45b76937d98e.diff LOG: [lldb-dap][NFC] Reuse PrettyPrint instead of pp (#179337) Removed code duplication in `ProtocolTypesTest.cpp`. Added: Modified: lldb/unittests/DAP/ProtocolTypesTest.cpp Removed: ################################################################################ diff --git a/lldb/unittests/DAP/ProtocolTypesTest.cpp b/lldb/unittests/DAP/ProtocolTypesTest.cpp index 0d60329f30269..88af97248febc 100644 --- a/lldb/unittests/DAP/ProtocolTypesTest.cpp +++ b/lldb/unittests/DAP/ProtocolTypesTest.cpp @@ -21,15 +21,11 @@ using namespace llvm; using namespace lldb; using namespace lldb_dap; using namespace lldb_dap::protocol; +using lldb_private::PrettyPrint; using lldb_private::roundtripJSON; using llvm::json::parse; using llvm::json::Value; -/// Returns a pretty printed json string of a `llvm::json::Value`. -static std::string pp(const json::Value &E) { - return formatv("{0:2}", E).str(); -} - TEST(ProtocolTypesTest, ExceptionBreakpointsFilter) { ExceptionBreakpointsFilter filter; filter.filter = "testFilter"; @@ -597,7 +593,7 @@ TEST(ProtocolTypesTest, DisassembledInstruction) { })"; // Validate toJSON - EXPECT_EQ(json, pp(instruction)); + EXPECT_EQ(json, PrettyPrint(instruction)); // Validate fromJSON EXPECT_THAT_EXPECTED(parse<DisassembledInstruction>(json), @@ -627,7 +623,7 @@ TEST(ProtocolTypesTest, Thread) { "name": "thr1" })"; // Validate toJSON - EXPECT_EQ(json, pp(thread)); + EXPECT_EQ(json, PrettyPrint(thread)); // Validate fromJSON EXPECT_THAT_EXPECTED(parse<Thread>(json), HasValue(Value(thread))); // Validate parsing errors @@ -654,7 +650,7 @@ TEST(ProtocolTypesTest, ThreadResponseBody) { ] })"; // Validate toJSON - EXPECT_EQ(json, pp(body)); + EXPECT_EQ(json, PrettyPrint(body)); } TEST(ProtocolTypesTest, CapabilitiesEventBody) { @@ -672,7 +668,7 @@ TEST(ProtocolTypesTest, CapabilitiesEventBody) { } })"; // Validate toJSON - EXPECT_EQ(json, pp(body)); + EXPECT_EQ(json, PrettyPrint(body)); } TEST(ProtocolTypesTest, ExceptionFilterOptions) { @@ -741,7 +737,7 @@ TEST(ProtocolTypesTest, SetExceptionBreakpointsResponseBody) { } ] })", - pp(body)); + PrettyPrint(body)); } TEST(ProtocolTypesTest, StepInTarget) { @@ -794,7 +790,7 @@ TEST(ProtocolTypesTest, ReadMemoryResponseBody) { Expected<Value> expected = json::parse( R"({ "address": "0xDEADBEEF", "data": "aGVsbG8gd29ybGQh", "unreadableBytes": 1})"); ASSERT_THAT_EXPECTED(expected, llvm::Succeeded()); - EXPECT_EQ(pp(*expected), pp(response)); + EXPECT_EQ(PrettyPrint(*expected), PrettyPrint(response)); } TEST(ProtocolTypesTest, Modules) { @@ -825,7 +821,7 @@ TEST(ProtocolTypesTest, Modules) { "addressRange": "0xcafeface", "debugInfoSize": "1.5MB" })"); ASSERT_THAT_EXPECTED(expected, llvm::Succeeded()); - EXPECT_EQ(pp(*expected), pp(module)); + EXPECT_EQ(PrettyPrint(*expected), PrettyPrint(module)); // Test without optional values. module.path.clear(); @@ -837,14 +833,14 @@ TEST(ProtocolTypesTest, Modules) { module.dateTimeStamp.clear(); module.addressRange.clear(); module.debugInfoSizeBytes = 0; - EXPECT_NE(pp(*expected), pp(module)); + EXPECT_NE(PrettyPrint(*expected), PrettyPrint(module)); Expected<json::Value> expected_no_opt = json::parse( R"({ "id" : "AC805E8E-B6A4-CD92-4B05-5CFA7CE24AE8-8926C776", "name": "libm.so.6"})"); ASSERT_THAT_EXPECTED(expected_no_opt, llvm::Succeeded()); - EXPECT_EQ(pp(*expected_no_opt), pp(module)); + EXPECT_EQ(PrettyPrint(*expected_no_opt), PrettyPrint(module)); } TEST(ProtocolTypesTest, ModulesArguments) { @@ -885,7 +881,7 @@ TEST(ProtocolTypesTest, ModulesResponseBody) { ], "totalModules": 2 })"); ASSERT_THAT_EXPECTED(expected, llvm::Succeeded()); - EXPECT_EQ(pp(*expected), pp(response)); + EXPECT_EQ(PrettyPrint(*expected), PrettyPrint(response)); } TEST(ProtocolTypesTest, VariablePresentationHint) { @@ -906,7 +902,7 @@ TEST(ProtocolTypesTest, VariablePresentationHint) { "visibility": "public" })"; - EXPECT_EQ(pp(Value(hint)), json); + EXPECT_EQ(PrettyPrint(Value(hint)), json); EXPECT_THAT_EXPECTED(json::parse(json), HasValue(Value(hint))); } @@ -943,7 +939,7 @@ TEST(ProtocolTypesTest, Variable) { "variablesReference": 42 })"; - EXPECT_EQ(pp(Value(var)), json); + EXPECT_EQ(PrettyPrint(Value(var)), json); EXPECT_THAT_EXPECTED(json::parse(json), HasValue(Value(var))); } @@ -1002,7 +998,7 @@ TEST(ProtocolTypesTest, VariablesResponseBody) { ] })"); ASSERT_THAT_EXPECTED(expected, llvm::Succeeded()); - EXPECT_EQ(pp(*expected), pp(response)); + EXPECT_EQ(PrettyPrint(*expected), PrettyPrint(response)); } TEST(ProtocolTypesTest, CompletionItem) { @@ -1029,7 +1025,7 @@ TEST(ProtocolTypesTest, CompletionItem) { "type": "constructor" })"; - EXPECT_EQ(pp(Value(item)), json); + EXPECT_EQ(PrettyPrint(Value(item)), json); EXPECT_THAT_EXPECTED(json::parse(json), HasValue(Value(item))); } @@ -1071,7 +1067,7 @@ TEST(ProtocolTypesTest, CompletionsResponseBody) { ] })"); ASSERT_THAT_EXPECTED(expected, llvm::Succeeded()); - EXPECT_EQ(pp(*expected), pp(response)); + EXPECT_EQ(PrettyPrint(*expected), PrettyPrint(response)); } TEST(ProtocolTypesTest, InvalidatedEventBody) { @@ -1089,7 +1085,7 @@ TEST(ProtocolTypesTest, InvalidatedEventBody) { "threadId": 20 })"); ASSERT_THAT_EXPECTED(expected, llvm::Succeeded()); - EXPECT_EQ(pp(*expected), pp(body)); + EXPECT_EQ(PrettyPrint(*expected), PrettyPrint(body)); } TEST(ProtocolTypesTest, MemoryEventBody) { @@ -1102,7 +1098,7 @@ TEST(ProtocolTypesTest, MemoryEventBody) { "memoryReference": "0x3039", "offset": 0 })"; - EXPECT_EQ(json, pp(body)); + EXPECT_EQ(json, PrettyPrint(body)); } TEST(ProtocolTypesTest, DataBreakpointInfoArguments) { @@ -1150,7 +1146,7 @@ TEST(ProtocolTypesTest, ExceptionDetails) { // Check required keys. Expected<json::Value> expected = parse(R"({})"); ASSERT_THAT_EXPECTED(expected, llvm::Succeeded()); - EXPECT_EQ(pp(*expected), pp(details)); + EXPECT_EQ(PrettyPrint(*expected), PrettyPrint(details)); // Check optional keys. details.message = "SIGABRT exception"; @@ -1174,7 +1170,7 @@ TEST(ProtocolTypesTest, ExceptionDetails) { })"); ASSERT_THAT_EXPECTED(expected_opt, llvm::Succeeded()); - EXPECT_EQ(pp(*expected_opt), pp(details)); + EXPECT_EQ(PrettyPrint(*expected_opt), PrettyPrint(details)); } TEST(ProtocolTypesTest, StackFramePresentationHint) { @@ -1241,7 +1237,7 @@ TEST(ProtocolTypesTest, StackFrame) { })"); ASSERT_THAT_EXPECTED(expected_frame, llvm::Succeeded()); - EXPECT_EQ(pp(*expected_frame), pp(frame)); + EXPECT_EQ(PrettyPrint(*expected_frame), PrettyPrint(frame)); frame.id = 2; frame.canRestart = true; @@ -1260,7 +1256,7 @@ TEST(ProtocolTypesTest, StackFrame) { })"); ASSERT_THAT_EXPECTED(expected_frame, llvm::Succeeded()); - EXPECT_EQ(pp(*expected_frame), pp(frame)); + EXPECT_EQ(PrettyPrint(*expected_frame), PrettyPrint(frame)); } TEST(ProtocolTypesTest, DAPSession) { _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
