refactor(test): use test_parse_and_visit_statement in more places

Make the code shorter and hopefully easier to read.

Author: strager

test/test-parse-typescript-class.cpp

@@ -889,81 +889,48 @@ TEST_F(Test_Parse_TypeScript_Class,
   }
 
   for (String8 specifier : {u8"public", u8"protected", u8"private"}) {
-#define MATCH_ACCESS_SPECIFIER_ERROR(code_before)                            \
-  ::testing::AnyOf(                                                          \
-      DIAG_TYPE_OFFSETS(p.code,                                              \
-                        Diag_TypeScript_Private_Not_Allowed_In_JavaScript,   \
-                        specifier, code_before.size(), u8"private"_sv),      \
-      DIAG_TYPE_OFFSETS(p.code,                                              \
-                        Diag_TypeScript_Protected_Not_Allowed_In_JavaScript, \
-                        specifier, code_before.size(), u8"protected"_sv),    \
-      DIAG_TYPE_OFFSETS(p.code,                                              \
-                        Diag_TypeScript_Public_Not_Allowed_In_JavaScript,    \
-                        specifier, code_before.size(), u8"public"_sv))
-
-    {
-      Test_Parser p(
-          concat(u8"class C { "_sv, specifier, u8" field = init; }"_sv),
-          capture_diags);
-      SCOPED_TRACE(p.code);
-      p.parse_and_visit_statement();
-      EXPECT_THAT(p.legacy_errors(),
-                  ElementsAreArray({
-                      MATCH_ACCESS_SPECIFIER_ERROR(u8"class C { "_sv),
-                  }));
-    }
-
-    {
-      Test_Parser p(
-          concat(u8"class C { "_sv, specifier, u8" field\nmethod() {} }"_sv),
-          capture_diags);
-      SCOPED_TRACE(p.code);
-      p.parse_and_visit_statement();
-      EXPECT_THAT(p.legacy_errors(),
-                  ElementsAreArray({
-                      MATCH_ACCESS_SPECIFIER_ERROR(u8"class C { "_sv),
-                  }));
-    }
-
-    {
-      Test_Parser p(concat(u8"class C { "_sv, specifier,
-                           u8" field\n[methodName]() {} }"_sv),
-                    capture_diags);
-      SCOPED_TRACE(p.code);
-      p.parse_and_visit_statement();
-      EXPECT_THAT(p.legacy_errors(),
-                  ElementsAreArray({
-                      MATCH_ACCESS_SPECIFIER_ERROR(u8"class C { "_sv),
-                  }));
-    }
-
-    {
-      Test_Parser p(
-          concat(u8"class C { "_sv, specifier, u8" field? method() {} }"_sv),
-          capture_diags);
-      SCOPED_TRACE(p.code);
-      p.parse_and_visit_statement();
-      EXPECT_THAT(
-          p.legacy_errors(),
-          UnorderedElementsAre(
-              DIAG_TYPE(
-                  Diag_TypeScript_Optional_Properties_Not_Allowed_In_JavaScript),
-              DIAG_TYPE(Diag_Missing_Semicolon_After_Field),
-              MATCH_ACCESS_SPECIFIER_ERROR(u8"class C { "_sv)));
-    }
-
-    {
-      Test_Parser p(concat(u8"class C { "_sv, specifier,
-                           u8" async\nmethod() { const await = null; } }"_sv),
-                    capture_diags);
-      SCOPED_TRACE(p.code);
-      p.parse_and_visit_statement();
-      EXPECT_THAT(p.legacy_errors(),
-                  ElementsAreArray({
-                      MATCH_ACCESS_SPECIFIER_ERROR(u8"class C { "_sv),
-                  }));
-    }
-#undef MATCH_ACCESS_SPECIFIER_ERROR
+    auto access_specifier_error =
+        [&](String8_View code_before) -> Diagnostic_Assertion {
+      if (specifier == u8"private"_sv) {
+        return DIAGNOSTIC_ASSERTION_SPAN(
+            Diag_TypeScript_Private_Not_Allowed_In_JavaScript,  //
+            specifier, code_before.size(), u8"private"_sv);
+      } else if (specifier == u8"protected"_sv) {
+        return DIAGNOSTIC_ASSERTION_SPAN(
+            Diag_TypeScript_Protected_Not_Allowed_In_JavaScript,  //
+            specifier, code_before.size(), u8"protected"_sv);
+      } else if (specifier == u8"public"_sv) {
+        return DIAGNOSTIC_ASSERTION_SPAN(
+            Diag_TypeScript_Public_Not_Allowed_In_JavaScript,  //
+            specifier, code_before.size(), u8"public"_sv);
+      } else {
+        QLJS_UNREACHABLE();
+      }
+    };
+
+    test_parse_and_visit_statement(
+        concat(u8"class C { "_sv, specifier, u8" field = init; }"_sv),
+        access_specifier_error(u8"class C { "_sv), javascript_options);
+
+    test_parse_and_visit_statement(
+        concat(u8"class C { "_sv, specifier, u8" field\nmethod() {} }"_sv),
+        access_specifier_error(u8"class C { "_sv), javascript_options);
+
+    test_parse_and_visit_statement(concat(u8"class C { "_sv, specifier,
+                                          u8" field\n[methodName]() {} }"_sv),
+                                   access_specifier_error(u8"class C { "_sv),
+                                   javascript_options);
+
+    test_parse_and_visit_statement(
+        concat(u8"class C { "_sv, specifier, u8" field? method() {} }"_sv),
+        access_specifier_error(u8"class C { "_sv),
+        u8"Diag_TypeScript_Optional_Properties_Not_Allowed_In_JavaScript"_diag,
+        u8"Diag_Missing_Semicolon_After_Field"_diag, javascript_options);
+
+    test_parse_and_visit_statement(
+        concat(u8"class C { "_sv, specifier,
+               u8" async\nmethod() { const await = null; } }"_sv),
+        access_specifier_error(u8"class C { "_sv), javascript_options);
   }
 }