[clang] [clang-format][NFC] Port FormatTestComments to verifyFormat (PR #164310)

[via cfe-commits]

=?utf-8?q?Björn_Schäpers?= <bjoern at hazardy.de>,
=?utf-8?q?Björn_Schäpers?= <bjoern at hazardy.de>
Message-ID:
In-Reply-To: <llvm.org/llvm/llvm-project/pull/164310 at github.com>


================
@@ -2451,225 +2444,230 @@ TEST_F(FormatTestComments, BlockCommentsInControlLoops) {
 }
 
 TEST_F(FormatTestComments, BlockComments) {
-  EXPECT_EQ("/* */ /* */ /* */\n/* */ /* */ /* */",
-            format("/* *//* */  /* */\n/* *//* */  /* */"));
-  EXPECT_EQ("/* */ a /* */ b;", format("  /* */  a/* */  b;"));
-  EXPECT_EQ("#define A /*123*/ \\\n"
-            "  b\n"
-            "/* */\n"
-            "someCall(\n"
-            "    parameter);",
-            format("#define A /*123*/ b\n"
-                   "/* */\n"
-                   "someCall(parameter);",
-                   getLLVMStyleWithColumns(15)));
-
-  EXPECT_EQ("#define A\n"
-            "/* */ someCall(\n"
-            "    parameter);",
-            format("#define A\n"
-                   "/* */someCall(parameter);",
-                   getLLVMStyleWithColumns(15)));
+  const auto Style10 = getLLVMStyleWithColumns(10);
+  const auto Style15 = getLLVMStyleWithColumns(15);
+
+  verifyFormat("/* */ /* */ /* */\n/* */ /* */ /* */",
+               "/* *//* */  /* */\n/* *//* */  /* */");
+  verifyFormat("/* */ a /* */ b;", "  /* */  a/* */  b;");
+  verifyFormat("#define A /*123*/ \\\n"
+               "  b\n"
+               "/* */\n"
+               "someCall(\n"
+               "    parameter);",
+               "#define A /*123*/ b\n"
+               "/* */\n"
+               "someCall(parameter);",
+               Style15);
+
+  verifyFormat("#define A\n"
+               "/* */ someCall(\n"
+               "    parameter);",
+               "#define A\n"
+               "/* */someCall(parameter);",
+               Style15);
   verifyNoChange("/*\n**\n*/");
-  EXPECT_EQ("/*\n"
-            " *\n"
-            " * aaaaaa\n"
-            " * aaaaaa\n"
-            " */",
-            format("/*\n"
-                   "*\n"
-                   " * aaaaaa aaaaaa\n"
-                   "*/",
-                   getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("/*\n"
-            "**\n"
-            "* aaaaaa\n"
-            "* aaaaaa\n"
-            "*/",
-            format("/*\n"
-                   "**\n"
-                   "* aaaaaa aaaaaa\n"
-                   "*/",
-                   getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("int aaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-            "    /* line 1\n"
-            "       bbbbbbbbbbbb */\n"
-            "    bbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-            format("int aaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-                   "    /* line 1\n"
-                   "       bbbbbbbbbbbb */ bbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-                   getLLVMStyleWithColumns(50)));
+  verifyFormat("/*\n"
+               " *\n"
+               " * aaaaaa\n"
+               " * aaaaaa\n"
+               " */",
+               "/*\n"
+               "*\n"
+               " * aaaaaa aaaaaa\n"
+               "*/",
+               Style10);
+  verifyFormat("/*\n"
+               "**\n"
+               "* aaaaaa\n"
+               "* aaaaaa\n"
+               "*/",
+               "/*\n"
+               "**\n"
+               "* aaaaaa aaaaaa\n"
+               "*/",
+               Style10);
+  verifyFormat("int aaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
+               "    /* line 1\n"
+               "       bbbbbbbbbbbb */\n"
+               "    bbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
+               "int aaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
+               "    /* line 1\n"
+               "       bbbbbbbbbbbb */ bbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
+               getLLVMStyleWithColumns(50));
 
   FormatStyle NoBinPacking = getLLVMStyle();
   NoBinPacking.BinPackParameters = FormatStyle::BPPS_OnePerLine;
-  EXPECT_EQ("someFunction(1, /* comment 1 */\n"
-            "             2, /* comment 2 */\n"
-            "             3, /* comment 3 */\n"
-            "             aaaa,\n"
-            "             bbbb);",
-            format("someFunction (1,   /* comment 1 */\n"
-                   "                2, /* comment 2 */  \n"
-                   "               3,   /* comment 3 */\n"
-                   "aaaa, bbbb );",
-                   NoBinPacking));
+  verifyFormat("someFunction(1, /* comment 1 */\n"
+               "             2, /* comment 2 */\n"
+               "             3, /* comment 3 */\n"
+               "             aaaa,\n"
+               "             bbbb);",
+               "someFunction (1,   /* comment 1 */\n"
+               "                2, /* comment 2 */  \n"
+               "               3,   /* comment 3 */\n"
+               "aaaa, bbbb );",
+               NoBinPacking);
   verifyFormat(
       "bool aaaaaaaaaaaaa = /* comment: */ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
       "                     aaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  EXPECT_EQ(
+  verifyFormat(
       "bool aaaaaaaaaaaaa = /* trailing comment */\n"
       "    aaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
       "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaa;",
-      format(
-          "bool       aaaaaaaaaaaaa =       /* trailing comment */\n"
-          "    aaaaaaaaaaaaaaaaaaaaaaaaaaa||aaaaaaaaaaaaaaaaaaaaaaaaa    ||\n"
-          "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa   || aaaaaaaaaaaaaaaaaaaaaaaaaa;"));
-  EXPECT_EQ(
-      "int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa; /* comment */\n"
-      "int bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;   /* comment */\n"
-      "int cccccccccccccccccccccccccccccc;       /* comment */",
-      format("int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa; /* comment */\n"
-             "int      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb; /* comment */\n"
-             "int    cccccccccccccccccccccccccccccc;  /* comment */"));
+
----------------
owenca wrote:

Why the extra empty line?

https://github.com/llvm/llvm-project/pull/164310