diff options
Diffstat (limited to 'unittests/Format/FormatTest.cpp')
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 65 |
1 files changed, 45 insertions, 20 deletions
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index d1894e1e42..7d9463603b 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1979,20 +1979,18 @@ TEST_F(FormatTest, FormatForObjectiveCMethodDecls) { format("- (void)sendAction:(SEL)aSelector to:(id)anObject forAllCells:(BOOL)flag;")); // Very long objectiveC method declaration. - EXPECT_EQ( - "- (NSUInteger)indexOfObject:(id)anObject inRange:(NSRange)range\n " - "outRange:(NSRange)out_range outRange1:(NSRange)out_range1\n " - "outRange2:(NSRange)out_range2 outRange3:(NSRange)out_range3\n " - "outRange4:(NSRange)out_range4 outRange5:(NSRange)out_range5\n " - "outRange6:(NSRange)out_range6 outRange7:(NSRange)out_range7\n " - "outRange8:(NSRange)out_range8 outRange9:(NSRange)out_range9;", - format( - "- (NSUInteger)indexOfObject:(id)anObject inRange:(NSRange)range " - "outRange:(NSRange) out_range outRange1:(NSRange) out_range1 " - "outRange2:(NSRange) out_range2 outRange3:(NSRange) out_range3 " - "outRange4:(NSRange) out_range4 outRange5:(NSRange) out_range5 " - "outRange6:(NSRange) out_range6 outRange7:(NSRange) out_range7 " - "outRange8:(NSRange) out_range8 outRange9:(NSRange) out_range9;")); + verifyFormat("- (NSUInteger)indexOfObject:(id)anObject\n" + " inRange:(NSRange)range\n" + " outRange:(NSRange)out_range\n" + " outRange1:(NSRange)out_range1\n" + " outRange2:(NSRange)out_range2\n" + " outRange3:(NSRange)out_range3\n" + " outRange4:(NSRange)out_range4\n" + " outRange5:(NSRange)out_range5\n" + " outRange6:(NSRange)out_range6\n" + " outRange7:(NSRange)out_range7\n" + " outRange8:(NSRange)out_range8\n" + " outRange9:(NSRange)out_range9;"); verifyFormat("- (int)sum:(vector<int>)numbers;"); verifyGoogleFormat("- (void)setDelegate:(id<Protocol>)delegate;"); @@ -2218,6 +2216,18 @@ TEST_F(FormatTest, FormatObjCProtocol) { "@end\n"); } +TEST_F(FormatTest, FormatObjCMethodDeclarations) { + verifyFormat("- (void)doSomethingWith:(GTMFoo *)theFoo\n" + " rect:(NSRect)theRect\n" + " interval:(float)theInterval {\n" + "}"); + verifyFormat("- (void)shortf:(GTMFoo *)theFoo\n" + " longKeyword:(NSRect)theRect\n" + " evenLongerKeyword:(float)theInterval\n" + " error:(NSError **)theError {\n" + "}"); +} + TEST_F(FormatTest, FormatObjCMethodExpr) { verifyFormat("[foo bar:baz];"); verifyFormat("return [foo bar:baz];"); @@ -2266,7 +2276,7 @@ TEST_F(FormatTest, FormatObjCMethodExpr) { verifyFormat("[cond ? obj1 : obj2 methodWithParam:param]"); verifyFormat("[button setAction:@selector(zoomOut:)];"); verifyFormat("[color getRed:&r green:&g blue:&b alpha:&a];"); - + verifyFormat("arr[[self indexForFoo:a]];"); verifyFormat("throw [self errorFor:a];"); verifyFormat("@throw [self errorFor:a];"); @@ -2275,12 +2285,27 @@ TEST_F(FormatTest, FormatObjCMethodExpr) { // which would be at 80 columns. verifyFormat( "void f() {\n" - " if ((self = [super initWithContentRect:contentRect styleMask:styleMask\n" - " backing:NSBackingStoreBuffered defer:YES]))"); - + " if ((self = [super initWithContentRect:contentRect\n" + " styleMask:styleMask\n" + " backing:NSBackingStoreBuffered\n" + " defer:YES]))"); + verifyFormat("[foo checkThatBreakingAfterColonWorksOk:\n" - " [bar ifItDoes:reduceOverallLineLengthLikeInThisCase]];"); - + " [bar ifItDoes:reduceOverallLineLengthLikeInThisCase]];"); + + verifyFormat("[myObj short:arg1 // Force line break\n" + " longKeyword:arg2\n" + " evenLongerKeyword:arg3\n" + " error:arg4];"); + verifyFormat( + "void f() {\n" + " popup_window_.reset([[RenderWidgetPopupWindow alloc]\n" + " initWithContentRect:NSMakeRect(origin_global.x, origin_global.y,\n" + " pos.width(), pos.height())\n" + " styleMask:NSBorderlessWindowMask\n" + " backing:NSBackingStoreBuffered\n" + " defer:NO]);\n" + "}"); } TEST_F(FormatTest, ObjCAt) { |