From d55f763fcd22ff3daf4c22417d1554c5b3faf074 Mon Sep 17 00:00:00 2001
From: Sam Atkins <atkinssj@serenityos.org>
Date: Wed, 21 Dec 2022 14:42:45 +0000
Subject: [PATCH] Tests: Replace uses of JsonObject::get_deprecated()/get_ptr()

---
 Tests/AK/TestJSON.cpp                | 12 +++++++-----
 Tests/LibJS/test-test262.cpp         |  4 ++--
 Tests/LibJS/test262-runner.cpp       |  6 +++---
 Tests/LibMarkdown/TestCommonmark.cpp | 12 ++++++------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Tests/AK/TestJSON.cpp b/Tests/AK/TestJSON.cpp
index 13dbd6e9b1..b1297d7d08 100644
--- a/Tests/AK/TestJSON.cpp
+++ b/Tests/AK/TestJSON.cpp
@@ -40,15 +40,17 @@ TEST_CASE(load_form)
 
     EXPECT(form_json.is_object());
 
-    auto name = form_json.as_object().get_deprecated("name"sv).to_deprecated_string();
+    auto name = form_json.as_object().get_deprecated_string("name"sv);
+    EXPECT(name.has_value());
 
-    EXPECT_EQ(name, "Form1");
+    EXPECT_EQ(name.value(), "Form1");
 
-    auto widgets = form_json.as_object().get_deprecated("widgets"sv).as_array();
+    auto widgets = form_json.as_object().get_array("widgets"sv);
+    EXPECT(widgets.has_value());
 
-    widgets.for_each([&](JsonValue const& widget_value) {
+    widgets->for_each([&](JsonValue const& widget_value) {
         auto& widget_object = widget_value.as_object();
-        auto widget_class = widget_object.get_deprecated("class"sv).as_string();
+        auto widget_class = widget_object.get_deprecated_string("class"sv).value();
         widget_object.for_each_member([&]([[maybe_unused]] auto& property_name, [[maybe_unused]] const JsonValue& property_value) {
         });
     });
diff --git a/Tests/LibJS/test-test262.cpp b/Tests/LibJS/test-test262.cpp
index efc28fb039..0adcc607c0 100644
--- a/Tests/LibJS/test-test262.cpp
+++ b/Tests/LibJS/test-test262.cpp
@@ -269,8 +269,8 @@ static ErrorOr<HashMap<size_t, TestResult>> run_test_files(Span<DeprecatedString
             auto result_object_or_error = parser.parse();
             if (!result_object_or_error.is_error() && result_object_or_error.value().is_object()) {
                 auto& result_object = result_object_or_error.value().as_object();
-                if (auto result_string = result_object.get_ptr("result"sv); result_string && result_string->is_string()) {
-                    auto const& view = result_string->as_string();
+                if (auto result_string = result_object.get_deprecated_string("result"sv); result_string.has_value()) {
+                    auto const& view = result_string.value();
                     // Timeout and assert fail already are the result of the stopping test
                     if (view == "timeout"sv || view == "assert_fail"sv) {
                         failed = false;
diff --git a/Tests/LibJS/test262-runner.cpp b/Tests/LibJS/test262-runner.cpp
index 8d62bec0d8..8511c06211 100644
--- a/Tests/LibJS/test262-runner.cpp
+++ b/Tests/LibJS/test262-runner.cpp
@@ -432,9 +432,9 @@ static bool verify_test(Result<void, TestError>& result, TestMetadata const& met
     }
 
     if (metadata.is_async && output.has("output"sv)) {
-        auto& output_messages = output.get_deprecated("output"sv);
-        VERIFY(output_messages.is_string());
-        if (output_messages.as_string().contains("AsyncTestFailure:InternalError: TODO("sv)) {
+        auto output_messages = output.get_deprecated_string("output"sv);
+        VERIFY(output_messages.has_value());
+        if (output_messages->contains("AsyncTestFailure:InternalError: TODO("sv)) {
             output.set("todo_error", true);
             output.set("result", "todo_error");
         }
diff --git a/Tests/LibMarkdown/TestCommonmark.cpp b/Tests/LibMarkdown/TestCommonmark.cpp
index 713e967856..a9ef515404 100644
--- a/Tests/LibMarkdown/TestCommonmark.cpp
+++ b/Tests/LibMarkdown/TestCommonmark.cpp
@@ -30,13 +30,13 @@ TEST_SETUP
         auto testcase = tests[i].as_object();
 
         auto name = DeprecatedString::formatted("{}_ex{}_{}..{}",
-            testcase.get_deprecated("section"sv),
-            testcase.get_deprecated("example"sv),
-            testcase.get_deprecated("start_line"sv),
-            testcase.get_deprecated("end_line"sv));
+            testcase.get("section"sv).value(),
+            testcase.get("example"sv).value(),
+            testcase.get("start_line"sv).value(),
+            testcase.get("end_line"sv).value());
 
-        DeprecatedString markdown = testcase.get_deprecated("markdown"sv).as_string();
-        DeprecatedString html = testcase.get_deprecated("html"sv).as_string();
+        DeprecatedString markdown = testcase.get_deprecated_string("markdown"sv).value();
+        DeprecatedString html = testcase.get_deprecated_string("html"sv).value();
 
         Test::TestSuite::the().add_case(adopt_ref(*new Test::TestCase(
             name, [markdown, html]() {