Fixup test cases

Author: itzexpoexpo

clang/unittests/Format/FormatTest.cpp

@@ -15348,7 +15348,7 @@ TEST_F(FormatTest, NeverMergeShortRecords) {
 }
 
 TEST_F(FormatTest, AllowShortRecordOnASingleLineNonSplit) {
-  FormatStyle Style = getLLVMStyle();
+  auto Style = getLLVMStyle();
 
   Style.BreakBeforeBraces = FormatStyle::BS_Custom;
   Style.BraceWrapping.SplitEmptyRecord = false;
@@ -15358,7 +15358,9 @@ TEST_F(FormatTest, AllowShortRecordOnASingleLineNonSplit) {
                "  void bar();\n"
                "};",
                Style);
-  verifyFormat("class foo {\n};", Style);
+  verifyFormat("class foo {\n"
+               "};",
+               Style);
 
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_EmptyIfAttached;
   verifyFormat("class foo {\n"
@@ -15379,25 +15381,26 @@ TEST_F(FormatTest, AllowShortRecordOnASingleLineNonSplit) {
   verifyFormat("class foo {};", Style);
 
   Style.BraceWrapping.AfterClass = true;
-  Style.BraceWrapping.AfterStruct = true;
-  Style.BraceWrapping.AfterUnion = true;
 
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_Never;
-  verifyFormat("class foo\n{\n"
+  verifyFormat("class foo\n"
+               "{\n"
                "  void bar();\n"
                "};",
                Style);
   verifyFormat("class foo\n{};", Style);
 
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_EmptyIfAttached;
-  verifyFormat("class foo\n{\n"
+  verifyFormat("class foo\n"
+               "{\n"
                "  void bar();\n"
                "};",
                Style);
   verifyFormat("class foo\n{};", Style);
 
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_Empty;
-  verifyFormat("class foo\n{\n"
+  verifyFormat("class foo\n"
+               "{\n"
                "  void bar();\n"
                "};",
                Style);
@@ -15409,24 +15412,26 @@ TEST_F(FormatTest, AllowShortRecordOnASingleLineNonSplit) {
 }
 
 TEST_F(FormatTest, AllowShortRecordOnASingleLineSplit) {
-  FormatStyle Style = getLLVMStyle();
+  auto Style = getLLVMStyle();
 
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.SplitEmptyRecord = true;
+  EXPECT_EQ(Style.BraceWrapping.SplitEmptyRecord, true);
 
-  Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_Never;
+  EXPECT_EQ(Style.AllowShortRecordOnASingleLine,
+            FormatStyle::SRS_EmptyIfAttached);
   verifyFormat("class foo {\n"
                "  void bar();\n"
                "};",
                Style);
-  verifyFormat("class foo {\n};", Style);
+  verifyFormat("class foo {};", Style);
 
-  Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_EmptyIfAttached;
+  Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_Never;
   verifyFormat("class foo {\n"
                "  void bar();\n"
                "};",
                Style);
-  verifyFormat("class foo {};", Style);
+  verifyFormat("class foo {\n"
+               "};",
+               Style);
 
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_Empty;
   verifyFormat("class foo {\n"
@@ -15439,29 +15444,32 @@ TEST_F(FormatTest, AllowShortRecordOnASingleLineSplit) {
   verifyFormat("class foo { void bar(); };", Style);
   verifyFormat("class foo {};", Style);
 
+  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
   Style.BraceWrapping.AfterClass = true;
-  Style.BraceWrapping.AfterStruct = true;
-  Style.BraceWrapping.AfterUnion = true;
 
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_Never;
-  verifyFormat("class foo\n{\n}", Style);
-  verifyFormat("struct foo\n{\n}", Style);
-  verifyFormat("union foo\n{\n}", Style);
+  verifyFormat("class foo\n"
+               "{\n"
+               "}",
+               Style);
 
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_EmptyIfAttached;
-  verifyFormat("class foo\n{\n}", Style);
-  verifyFormat("struct foo\n{\n}", Style);
-  verifyFormat("union foo\n{\n}", Style);
+  verifyFormat("class foo\n"
+               "{\n"
+               "}",
+               Style);
 
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_Empty;
-  verifyFormat("class foo\n{\n}", Style);
-  verifyFormat("struct foo\n{\n}", Style);
-  verifyFormat("union foo\n{\n}", Style);
+  verifyFormat("class foo\n"
+               "{\n"
+               "}",
+               Style);
 
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_Always;
-  verifyFormat("class foo\n{\n}", Style);
-  verifyFormat("struct foo\n{\n}", Style);
-  verifyFormat("union foo\n{\n}", Style);
+  verifyFormat("class foo\n"
+               "{\n"
+               "}",
+               Style);
 }
 
 TEST_F(FormatTest, UnderstandContextOfRecordTypeKeywords) {