Author: djasper Date: Wed Mar 18 07:59:19 2015 New Revision: 232632 URL: http://llvm.org/viewvc/llvm-project?rev=232632&view=rev Log: [clang-format] Add missing test for std::function<void( int, int )> spacing also fixed by r230473.
The fix in r230473 was done to enable fixing the spacing for std::function<void( int, int )>. I did not realized that it also fixed this issue. Since it is fairly different from Deleted &operator=(const Deleted &)& = default; fixed in r230473, it seems sensible to add the regression test for it. Also cleaned up the test by removing duplicated code and comment, and kept repeated test set consistent. Result of running the new tests with r230473 backed out: [ RUN ] FormatTest.ConfigurableSpacesInParentheses Actual: "std::function<void(int, int)> callback;" Expected: "std::function<void( int, int )> callback;" Actual: "std::function<void( int, int )> callback;" Expected: "std::function<void(int, int)> callback;" Actual: "std::function<void( int, int ) > callback;" Expected: "std::function<void(int, int)> callback;" [ FAILED ] FormatTest.ConfigurableSpacesInParentheses (402 ms) Result of new tests with r230473: [ RUN ] FormatTest.ConfigurableSpacesInParentheses [ OK ] FormatTest.ConfigurableSpacesInParentheses (209 ms) Review: http://reviews.llvm.org/D7922 Patch by Jean-Philippe Dufraigne. Thanks! Modified: cfe/trunk/unittests/Format/FormatTest.cpp Modified: cfe/trunk/unittests/Format/FormatTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=232632&r1=232631&r2=232632&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTest.cpp (original) +++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Mar 18 07:59:19 2015 @@ -8197,6 +8197,8 @@ TEST_F(FormatTest, ConfigurableSpacesInP Spaces.SpacesInParentheses = true; verifyFormat("call( x, y, z );", Spaces); + verifyFormat("call();", Spaces); + verifyFormat("std::function<void( int, int )> callback;", Spaces); verifyFormat("while ( (bool)1 )\n" " continue;", Spaces); verifyFormat("for ( ;; )\n" @@ -8223,19 +8225,13 @@ TEST_F(FormatTest, ConfigurableSpacesInP verifyFormat("my_int a = ( my_int )sizeof(int);", Spaces); verifyFormat("#define x (( int )-1)", Spaces); - Spaces.SpacesInParentheses = false; - Spaces.SpaceInEmptyParentheses = true; - verifyFormat("call(x, y, z);", Spaces); - verifyFormat("call( )", Spaces); - - // Run the first set of tests again with - // Spaces.SpacesInParentheses = false, - // Spaces.SpaceInEmptyParentheses = true and - // Spaces.SpacesInCStyleCastParentheses = true + // Run the first set of tests again with: Spaces.SpacesInParentheses = false, Spaces.SpaceInEmptyParentheses = true; Spaces.SpacesInCStyleCastParentheses = true; verifyFormat("call(x, y, z);", Spaces); + verifyFormat("call( );", Spaces); + verifyFormat("std::function<void(int, int)> callback;", Spaces); verifyFormat("while (( bool )1)\n" " continue;", Spaces); verifyFormat("for (;;)\n" @@ -8252,8 +8248,11 @@ TEST_F(FormatTest, ConfigurableSpacesInP " break;\n" "}", Spaces); + // Run the first set of tests again with: Spaces.SpaceAfterCStyleCast = true; verifyFormat("call(x, y, z);", Spaces); + verifyFormat("call( );", Spaces); + verifyFormat("std::function<void(int, int)> callback;", Spaces); verifyFormat("while (( bool ) 1)\n" " continue;", Spaces); @@ -8274,6 +8273,8 @@ TEST_F(FormatTest, ConfigurableSpacesInP " break;\n" "}", Spaces); + + // Run subset of tests again with: Spaces.SpacesInCStyleCastParentheses = false; Spaces.SpaceAfterCStyleCast = true; verifyFormat("while ((bool) 1)\n" _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
