[NFC] unittests: Tidy up some DiagnosticEngine tests

Author: AnthonyLatsis

unittests/AST/DiagnosticBehaviorTests.cpp

@@ -29,13 +29,12 @@ class TestDiagnosticConsumer : public DiagnosticConsumer {
     this->callback(Info);
   }
 };
-} // end anonymous namespace
 
-static void diagnosticBehaviorTestCase(
-    llvm::function_ref<void(DiagnosticEngine &)> diagnose,
-    llvm::function_ref<void(DiagnosticEngine &, const DiagnosticInfo &)>
-        callback,
-    unsigned expectedNumCallbackCalls) {
+static void
+testCase(llvm::function_ref<void(DiagnosticEngine &)> diagnose,
+         llvm::function_ref<void(DiagnosticEngine &, const DiagnosticInfo &)>
+             callback,
+         unsigned expectedNumCallbackCalls) {
   SourceManager sourceMgr;
   DiagnosticEngine diags(sourceMgr);
 
@@ -55,7 +54,7 @@ static void diagnosticBehaviorTestCase(
 }
 
 TEST(DiagnosticBehavior, WarnUntilSwiftLangMode) {
-  diagnosticBehaviorTestCase(
+  testCase(
       [](DiagnosticEngine &diags) {
         diags.setLanguageVersion(version::Version({5}));
         diags.diagnose(SourceLoc(), diag::error_immediate_mode_missing_stdlib)
@@ -69,7 +68,7 @@ TEST(DiagnosticBehavior, WarnUntilSwiftLangMode) {
       },
       /*expectedNumCallbackCalls=*/1);
 
-  diagnosticBehaviorTestCase(
+  testCase(
       [](DiagnosticEngine &diags) {
         diags.setLanguageVersion(version::Version({4}));
         diags.diagnose(SourceLoc(), diag::error_immediate_mode_missing_stdlib)
@@ -87,7 +86,7 @@ TEST(DiagnosticBehavior, WarnUntilSwiftLangMode) {
       },
       /*expectedNumCallbackCalls=*/1);
 
-  diagnosticBehaviorTestCase(
+  testCase(
       [](DiagnosticEngine &diags) {
         diags.setLanguageVersion(version::Version({4}));
         diags.diagnose(SourceLoc(), diag::error_immediate_mode_missing_stdlib)
@@ -106,3 +105,5 @@ TEST(DiagnosticBehavior, WarnUntilSwiftLangMode) {
       },
       /*expectedNumCallbackCalls=*/1);
 }
+
+} // end anonymous namespace

unittests/AST/DiagnosticGroupsTests.cpp

@@ -39,12 +39,10 @@ class TestDiagnosticConsumer : public DiagnosticConsumer {
 struct TestDiagnostic : public Diagnostic {
   TestDiagnostic(DiagID ID, DiagGroupID GroupID) : Diagnostic(ID, GroupID) {}
 };
-} // end anonymous namespace
 
-static void diagnosticGroupsTestCase(
-    llvm::function_ref<void(DiagnosticEngine &)> diagnose,
-    llvm::function_ref<void(const DiagnosticInfo &)> callback,
-    unsigned expectedNumCallbackCalls) {
+static void testCase(llvm::function_ref<void(DiagnosticEngine &)> diagnose,
+                     llvm::function_ref<void(const DiagnosticInfo &)> callback,
+                     unsigned expectedNumCallbackCalls) {
   SourceManager sourceMgr;
   DiagnosticEngine diags(sourceMgr);
 
@@ -66,7 +64,7 @@ static void diagnosticGroupsTestCase(
 TEST(DiagnosticGroups, TargetAll) {
   // Test that uncategorized diagnostics are escalated when escalating all
   // warnings.
-  diagnosticGroupsTestCase(
+  testCase(
       [](DiagnosticEngine &diags) {
         const std::vector rules = {
             WarningAsErrorRule(WarningAsErrorRule::Action::Enable)};
@@ -91,16 +89,16 @@ TEST(DiagnosticGroups, OverrideBehaviorLimitations) {
                               DiagGroupID::DeprecatedDeclaration);
 
     // Make sure ID actually is an error by default.
-    diagnosticGroupsTestCase(
+    testCase(
         [&diagnostic](DiagnosticEngine &diags) {
           diags.diagnose(SourceLoc(), diagnostic);
         },
         [](const DiagnosticInfo &info) {
-          EXPECT_TRUE(info.Kind == DiagnosticKind::Error);
+          EXPECT_EQ(info.Kind, DiagnosticKind::Error);
         },
         /*expectedNumCallbackCalls=*/1);
 
-    diagnosticGroupsTestCase(
+    testCase(
         [&diagnostic](DiagnosticEngine &diags) {
           const std::vector rules = {WarningAsErrorRule(
               WarningAsErrorRule::Action::Enable, "DeprecatedDeclaration")};
@@ -124,7 +122,7 @@ TEST(DiagnosticGroups, OverrideBehaviorLimitations) {
         DiagGroupID::DeprecatedDeclaration);
 
     // Make sure ID actually is a warning by default.
-    diagnosticGroupsTestCase(
+    testCase(
         [&diagnostic](DiagnosticEngine &diags) {
           diags.diagnose(SourceLoc(), diagnostic);
         },
@@ -133,7 +131,7 @@ TEST(DiagnosticGroups, OverrideBehaviorLimitations) {
         },
         /*expectedNumCallbackCalls=*/1);
 
-    diagnosticGroupsTestCase(
+    testCase(
         [&diagnostic](DiagnosticEngine &diags) {
           const std::vector rules = {WarningAsErrorRule(
               WarningAsErrorRule::Action::Enable, "DeprecatedDeclaration")};
@@ -148,3 +146,5 @@ TEST(DiagnosticGroups, OverrideBehaviorLimitations) {
         /*expectedNumCallbackCalls=*/1);
   }
 }
+
+} // end anonymous namespace