From 0588b509af71eda6956e674363f86bfb67b2e976 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 7 Feb 2013 00:19:29 +0000 Subject: [PATCH] Formatter: Move ObjC literal tests to its own test case. Slightly expand the boxed expressions test with a few more snippets from http://clang.llvm.org/docs/ObjectiveCLiterals.html llvm-svn: 174559 --- clang/unittests/Format/FormatTest.cpp | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 10742a2..6924e45 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -2478,19 +2478,6 @@ TEST_F(FormatTest, ObjCAt) { verifyFormat("@throw"); verifyFormat("@try"); - verifyFormat("@\"String\""); - verifyFormat("@1"); - verifyFormat("@+4.8"); - verifyFormat("@-4"); - verifyFormat("@1LL"); - verifyFormat("@.5"); - verifyFormat("@'c'"); - verifyFormat("@true"); - verifyFormat("NSNumber *smallestInt = @(-INT_MAX - 1);"); - // FIXME: Array and dictionary literals need more work. - verifyFormat("@["); - verifyFormat("@{"); - EXPECT_EQ("@interface", format("@ interface")); // The precise formatting of this doesn't matter, nobody writes code like @@ -2523,5 +2510,26 @@ TEST_F(FormatTest, ObjCSnippets) { verifyGoogleFormat("@property(assign, getter=isEditable) BOOL editable;"); } +TEST_F(FormatTest, ObjCLiterals) { + verifyFormat("@\"String\""); + verifyFormat("@1"); + verifyFormat("@+4.8"); + verifyFormat("@-4"); + verifyFormat("@1LL"); + verifyFormat("@.5"); + verifyFormat("@'c'"); + verifyFormat("@true"); + + verifyFormat("NSNumber *smallestInt = @(-INT_MAX - 1);"); + verifyFormat("NSNumber *piOverTwo = @(M_PI / 2);"); + verifyFormat("NSNumber *favoriteColor = @(Green);"); + verifyFormat("NSString *path = @(getenv(\"PATH\"));"); + + // FIXME: Array and dictionary literals need more work. + verifyFormat("@["); + verifyFormat("@{"); + +} + } // end namespace tooling } // end namespace clang -- 2.7.4