Run diagnostics in a separate visitor
CheckValid() is already quite complicated and adding more to the method
seems not to be scalable.
Bug: 168028537
Test: aidl_unittests
Change-Id: I41a11ce028d8b8f018e80e7203b0d6a955d3768b
diff --git a/options_unittest.cpp b/options_unittest.cpp
index 83ab32a..f573fe6 100644
--- a/options_unittest.cpp
+++ b/options_unittest.cpp
@@ -354,8 +354,8 @@
};
auto options = GetOptions(args);
EXPECT_TRUE(options->Ok());
- auto warning_options = options->GetWarningOptions();
- EXPECT_EQ(DiagnosticSeverity::WARNING, warning_options.Severity(DiagnosticID::interface_name));
+ auto mapping = options->GetDiagnosticMapping();
+ EXPECT_EQ(DiagnosticSeverity::WARNING, mapping.Severity(DiagnosticID::interface_name));
}
TEST(OptionsTests, ParsesWarningEnableSpecificWarning) {
@@ -364,8 +364,8 @@
};
auto options = GetOptions(args);
EXPECT_TRUE(options->Ok());
- auto warning_options = options->GetWarningOptions();
- EXPECT_EQ(DiagnosticSeverity::WARNING, warning_options.Severity(DiagnosticID::interface_name));
+ auto mapping = options->GetDiagnosticMapping();
+ EXPECT_EQ(DiagnosticSeverity::WARNING, mapping.Severity(DiagnosticID::interface_name));
}
TEST(OptionsTests, ParsesWarningDisableSpecificWarning) {
@@ -375,8 +375,8 @@
};
auto options = GetOptions(args);
EXPECT_TRUE(options->Ok());
- auto warning_options = options->GetWarningOptions();
- EXPECT_EQ(DiagnosticSeverity::DISABLED, warning_options.Severity(DiagnosticID::interface_name));
+ auto mapping = options->GetDiagnosticMapping();
+ EXPECT_EQ(DiagnosticSeverity::DISABLED, mapping.Severity(DiagnosticID::interface_name));
}
TEST(OptionsTests, ParsesWarningAsErrors) {
@@ -385,8 +385,8 @@
};
auto options = GetOptions(args);
EXPECT_TRUE(options->Ok());
- auto warning_options = options->GetWarningOptions();
- EXPECT_EQ(DiagnosticSeverity::ERROR, warning_options.Severity(DiagnosticID::interface_name));
+ auto mapping = options->GetDiagnosticMapping();
+ EXPECT_EQ(DiagnosticSeverity::ERROR, mapping.Severity(DiagnosticID::interface_name));
}
TEST(OptionsTests, RejectsUnknownWarning) {