Adding unit tests for new protocol types.

Author: ashgti

lldb/tools/lldb-dap/Handler/VariablesRequestHandler.cpp

@@ -28,7 +28,7 @@ VariablesRequestHandler::Run(const VariablesArguments &arguments) const {
   uint64_t start = arguments.start;
   bool hex = false;
   if (arguments.format)
-    hex = arguments.format->hex.value_or(false);
+    hex = arguments.format->hex;
 
   std::vector<Variable> variables;
 

lldb/tools/lldb-dap/Protocol/ProtocolTypes.h

@@ -475,7 +475,7 @@ llvm::json::Value toJSON(const Thread &);
 /// Provides formatting information for a value.
 struct ValueFormat {
   /// Display the value in hex.
-  std::optional<bool> hex;
+  bool hex = false;
 };
 bool fromJSON(const llvm::json::Value &, ValueFormat &, llvm::json::Path);
 

lldb/unittests/DAP/ProtocolTypesTest.cpp

@@ -883,3 +883,120 @@ TEST(ProtocolTypesTest, ModulesResponseBody) {
   ASSERT_THAT_EXPECTED(expected, llvm::Succeeded());
   EXPECT_EQ(pp(*expected), pp(response));
 }
+
+TEST(ProtocolTypesTest, VariablePresentationHint) {
+  VariablePresentationHint hint;
+  hint.kind = "kind";
+  hint.attributes = {"a", "b", "c"};
+  hint.visibility = "public";
+  hint.lazy = true;
+
+  const StringRef json = R"({
+  "attributes": [
+    "a",
+    "b",
+    "c"
+  ],
+  "kind": "kind",
+  "lazy": true,
+  "visibility": "public"
+})";
+
+  EXPECT_EQ(pp(Value(hint)), json);
+  EXPECT_THAT_EXPECTED(json::parse(json), HasValue(Value(hint)));
+}
+
+TEST(ProtocolTypesTest, Variable) {
+  Variable var;
+  var.name = "var1";
+  var.variablesReference = 42;
+  var.value = "value";
+  var.type = "type";
+
+  VariablePresentationHint hint;
+  hint.kind = "kind";
+  var.presentationHint = std::move(hint);
+  var.evaluateName = "my_name";
+  var.namedVariables = 7;
+  var.indexedVariables = 7;
+  var.memoryReference = "0x123";
+  var.declarationLocationReference = 24;
+  var.valueLocationReference = 100;
+
+  const StringRef json = R"({
+  "declarationLocationReference": 24,
+  "evaluateName": "my_name",
+  "indexedVariables": 7,
+  "memoryReference": "0x123",
+  "name": "var1",
+  "namedVariables": 7,
+  "presentationHint": {
+    "kind": "kind"
+  },
+  "type": "type",
+  "value": "value",
+  "valueLocationReference": 100,
+  "variablesReference": 42
+})";
+
+  EXPECT_EQ(pp(Value(var)), json);
+  EXPECT_THAT_EXPECTED(json::parse(json), HasValue(Value(var)));
+}
+
+TEST(ProtocolTypesTest, VariablesArguments) {
+  llvm::Expected<VariablesArguments> expected = parse<VariablesArguments>(R"({
+    "variablesReference": 42,
+    "filter": "indexed",
+    "start": 10,
+    "count": 5,
+    "format": {
+      "hex": true
+    }
+  })");
+  ASSERT_THAT_EXPECTED(expected, llvm::Succeeded());
+  EXPECT_EQ(expected->variablesReference, 42u);
+  EXPECT_EQ(expected->filter, VariablesArguments::eVariablesFilterIndexed);
+  EXPECT_EQ(expected->start, 10u);
+  EXPECT_EQ(expected->count, 5u);
+  EXPECT_EQ(expected->format->hex, true);
+
+  EXPECT_THAT_EXPECTED(
+      parse<VariablesArguments>(R"({})"),
+      FailedWithMessage("missing value at (root).variablesReference"));
+  EXPECT_THAT_EXPECTED(
+      parse<VariablesArguments>(
+          R"({"variablesReference": 42, "filter": "my-filter"})"),
+      FailedWithMessage(
+          "unexpected value, expected 'named' or 'indexed' at (root).filter"));
+}
+
+TEST(ProtocolTypesTest, VariablesResponseBody) {
+  Variable var1;
+  var1.name = "var1";
+  var1.variablesReference = 42;
+  var1.value = "<var1-value>";
+
+  Variable var2;
+  var2.name = "var2";
+  var2.variablesReference = 3;
+  var2.value = "<var2-value>";
+
+  VariablesResponseBody response{{var1, var2}};
+
+  Expected<json::Value> expected = json::parse(R"({
+      "variables": [
+        {
+          "name": "var1",
+          "value": "<var1-value>",
+          "variablesReference": 42
+        },
+        {
+          "name": "var2",
+          "value": "<var2-value>",
+          "variablesReference": 3
+        }
+      ]
+    })");
+  ASSERT_THAT_EXPECTED(expected, llvm::Succeeded());
+  EXPECT_EQ(pp(*expected), pp(response));
+}