diff options
Diffstat (limited to 'unittests/Format/FormatTest.cpp')
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 90813042da..00657e046b 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1062,7 +1062,7 @@ TEST_F(FormatTest, PutEmptyBlocksIntoOneLine) { TEST_F(FormatTest, FormatsFunctionDefinition) { verifyFormat("void f(int a, int b, int c, int d, int e, int f, int g," " int h, int j, int f,\n" - " int c, int ddddddddddddd) {\n}"); + " int c, int ddddddddddddd) {}"); } TEST_F(FormatTest, FormatsAwesomeMethodCall) { @@ -1097,34 +1097,35 @@ TEST_F(FormatTest, ConstructorInitializers) { verifyFormat("Constructor() : Initializer(FitsOnTheLine) {}"); verifyFormat("Constructor() : Inttializer(FitsOnTheLine) {}", getLLVMStyleWithColumns(45)); - verifyFormat("Constructor() : Inttializer(FitsOnTheLine) {\n}", + verifyFormat("Constructor()\n" + " : Inttializer(FitsOnTheLine) {}", getLLVMStyleWithColumns(44)); verifyFormat("Constructor()\n" - " : Inttializer(FitsOnTheLine) {\n}", + " : Inttializer(FitsOnTheLine) {}", getLLVMStyleWithColumns(43)); verifyFormat( "SomeClass::Constructor()\n" - " : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaaaa(aaaaaaaaaaaa) {\n}"); + " : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaaaa(aaaaaaaaaaaa) {}"); verifyFormat( "SomeClass::Constructor()\n" " : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n" - " aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {\n}"); + " aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}"); verifyFormat( "SomeClass::Constructor()\n" " : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n" - " aaaaaaaaaaaaaaa(aaaaaaaaaaaa) {\n}"); + " aaaaaaaaaaaaaaa(aaaaaaaaaaaa) {}"); verifyFormat("Constructor()\n" " : aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaa),\n" " aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n" " aaaaaaaaaaaaaaaaaaaaaaaaaaa),\n" - " aaaaaaaaaaaaaaaaaaaaaaa() {\n}"); + " aaaaaaaaaaaaaaaaaaaaaaa() {}"); verifyFormat("Constructor()\n" " : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}"); + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}"); // Here a line could be saved by splitting the second initializer onto two // lines, but that is not desireable. @@ -1132,19 +1133,19 @@ TEST_F(FormatTest, ConstructorInitializers) { "Constructor()\n" " : aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaa),\n" " aaaaaaaaaaa(aaaaaaaaaaa),\n" - " aaaaaaaaaaaaaaaaaaaaat(aaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}"); + " aaaaaaaaaaaaaaaaaaaaat(aaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}"); FormatStyle OnePerLine = getLLVMStyle(); OnePerLine.ConstructorInitializerAllOnOneLineOrOnePerLine = true; verifyFormat("SomeClass::Constructor()\n" " : aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n" " aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n" - " aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {\n}", + " aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}", OnePerLine); verifyFormat("SomeClass::Constructor()\n" " : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), // Some comment\n" " aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n" - " aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {\n}", + " aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}", OnePerLine); verifyFormat("MyClass::MyClass(int var)\n" " : some_var_(var), // 4 space indent\n" @@ -1158,7 +1159,7 @@ TEST_F(FormatTest, ConstructorInitializers) { for (unsigned i = 0, e = 80; i != e; ++i) { input += " a,\n"; } - input += " a) {\n}"; + input += " a) {}"; verifyGoogleFormat(input); } @@ -1179,7 +1180,7 @@ TEST_F(FormatTest, BreaksDesireably) { verifyFormat( "aaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}"); + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}"); verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n" " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n" @@ -1300,7 +1301,7 @@ TEST_F(FormatTest, DoesNotBreakTrailingAnnotation) { verifyFormat("void aaaaaaaaaaaa(int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) const\n" " GUARDED_BY(aaaaaaaaaaaaa);"); verifyFormat("void aaaaaaaaaaaa(int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) const\n" - " GUARDED_BY(aaaaaaaaaaaaa) {\n}"); + " GUARDED_BY(aaaaaaaaaaaaa) {}"); } TEST_F(FormatTest, BreaksAccordingToOperatorPrecedence) { @@ -1902,22 +1903,22 @@ TEST_F(FormatTest, FormatsFunctionTypes) { TEST_F(FormatTest, BreaksFunctionDeclarations) { verifyFormat("int *someFunction(int LoooooooooooooooooooongParam1,\n" - " int LoooooooooooooooooooongParam2) {\n}"); + " int LoooooooooooooooooooongParam2) {}"); verifyFormat( "TypeSpecDecl *\n" "TypeSpecDecl::Create(ASTContext &C, DeclContext *DC, SourceLocation L,\n" - " IdentifierIn *II, Type *T) {\n}"); + " IdentifierIn *II, Type *T) {}"); verifyGoogleFormat( "TypeSpecDecl* TypeSpecDecl::Create(\n" - " ASTContext& C, DeclContext* DC, SourceLocation L) {\n}"); + " ASTContext& C, DeclContext* DC, SourceLocation L) {}"); verifyGoogleFormat( "some_namespace::LongReturnType\n" "long_namespace::SomeVeryLongClass::SomeVeryLongFunction(\n" - " int first_long_parameter, int second_parameter) {\n}"); + " int first_long_parameter, int second_parameter) {}"); verifyGoogleFormat("template <typename T>\n" "aaaaaaaa::aaaaa::aaaaaa<T, aaaaaaaaaaaaaaaaaaaaaaaaa>\n" - "aaaaaaaaaaaaaaaaaaaaaaaa<T>::aaaaaaa() {\n}"); + "aaaaaaaaaaaaaaaaaaaaaaaa<T>::aaaaaaa() {}"); } TEST_F(FormatTest, LineStartsWithSpecialCharacter) { @@ -1952,8 +1953,7 @@ TEST_F(FormatTest, IncompleteParameterLists) { " double *min_y,\n" " double *max_y,\n" " double *min_z,\n" - " double *max_z, ) {\n" - "}"); + " double *max_z, ) {}"); } TEST_F(FormatTest, IncorrectCodeTrailingStuff) { |