Improved / fixed the delegate tests.

kgaidis · kgaidis · commit 4d7741c567d1 · 2016-04-26T21:26:43.000-04:00
diff --git a/FZAccordionTableView/FZAccordionTableView.h b/FZAccordionTableView/FZAccordionTableView.h
@@ -125,4 +125,4 @@
 - (void)tableView:(FZAccordionTableView * _Nonnull)tableView willCloseSection:(NSInteger)section withHeader:(UITableViewHeaderFooterView * _Nonnull)header;
 - (void)tableView:(FZAccordionTableView * _Nonnull)tableView didCloseSection:(NSInteger)section withHeader:(UITableViewHeaderFooterView * _Nonnull)header;
 
-@end
+@end
diff --git a/FZAccordionTableView/FZAccordionTableView.m b/FZAccordionTableView/FZAccordionTableView.m
@@ -403,7 +403,6 @@ - (void)autoCollapseAllSectionsExceptSection:(NSInteger)section {
     }
 }
 
-
 #pragma mark - <UITableViewDataSource> -
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -432,7 +431,6 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
         [self.sectionInfos addObject:section];
     }
     
-    
     return numOfSections;
 }
 
@@ -451,8 +449,6 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         numOfRows = [self.subclassDataSource tableView:tableView numberOfRowsInSection:section];;
     }
     
-    return 5;
-    
     [self.sectionInfos[section] setNumberOfRows:numOfRows];
     
     return ([self isSectionOpen:section]) ? numOfRows : 0;
diff --git a/Tests/Testing_Example/FZAccordionTableViewTests.xcodeproj/project.pbxproj b/Tests/Testing_Example/FZAccordionTableViewTests.xcodeproj/project.pbxproj
@@ -9,13 +9,8 @@
 /* Begin PBXBuildFile section */
 		0137E0ED1CCDAED200C2CFAC /* FZAccordionTableViewInitializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0137E0EC1CCDAED200C2CFAC /* FZAccordionTableViewInitializationTests.m */; };
 		0137E0F01CCDAF0400C2CFAC /* FZAccordionTableViewTestHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 0137E0EF1CCDAF0400C2CFAC /* FZAccordionTableViewTestHelpers.m */; };
-		0156F1441CCD219800E0530C /* FZAccordionTableViewUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0156F1431CCD219800E0530C /* FZAccordionTableViewUITests.m */; };
-		0156F14B1CCD26F000E0530C /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 01D1F33A1B24D94A007B97BD /* MainViewController.m */; };
-		0156F14C1CCD26F500E0530C /* FZAccordionTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 01D1F35D1B24D9B2007B97BD /* FZAccordionTableView.m */; };
 		0156F14D1CCD2A6E00E0530C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 01D1F33F1B24D94A007B97BD /* Main.storyboard */; };
 		0156F14E1CCD2A7600E0530C /* AccordionHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 01D1F3671B24DD86007B97BD /* AccordionHeaderView.xib */; };
-		0156F14F1CCD2A7B00E0530C /* AccordionHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 01D1F3651B24DD61007B97BD /* AccordionHeaderView.m */; };
-		0156F1501CCD2A7E00E0530C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 01D1F3371B24D94A007B97BD /* AppDelegate.m */; };
 		0156F1581CCD2BA400E0530C /* FZAccordionTableViewGeneralTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0156F1571CCD2BA400E0530C /* FZAccordionTableViewGeneralTests.m */; };
 		01B0D1B81CD037BC0012BBCA /* FZAccordionTableViewDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 01B0D1B71CD037BC0012BBCA /* FZAccordionTableViewDelegateTests.m */; };
 		01B0D1BA1CD038000012BBCA /* FZAccordionTableViewTestBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 01B0D1B91CD038000012BBCA /* FZAccordionTableViewTestBase.m */; };
@@ -325,11 +320,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0156F1441CCD219800E0530C /* FZAccordionTableViewUITests.m in Sources */,
-				0156F14C1CCD26F500E0530C /* FZAccordionTableView.m in Sources */,
-				0156F14F1CCD2A7B00E0530C /* AccordionHeaderView.m in Sources */,
-				0156F14B1CCD26F000E0530C /* MainViewController.m in Sources */,
-				0156F1501CCD2A7E00E0530C /* AppDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Tests/Testing_Example/FZAccordionTableViewUnitTests/FZAccordionTableViewDelegateTests.m b/Tests/Testing_Example/FZAccordionTableViewUnitTests/FZAccordionTableViewDelegateTests.m
@@ -39,17 +39,28 @@ - (void)tearDown {
 #pragma mark - Tests -
 
 - (void)testOpening {
+    XCTAssert(!self.willOpenSectionCalled);
+    XCTAssert(!self.didOpenSectionCalled);
+    
     [self waitForHeaderViewInSection:0];
     [self.tableView toggleSection:0];
     
     XCTAssert(self.willOpenSectionCalled, @"On opening of a section, 'willOpenSection:' must be called");
     
-    [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.5]];
+    XCTestExpectation *expectation = [self expectationWithDescription:@"On opening of a section, 'didOpenSection:' must be called"];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if (self.didOpenSectionCalled) {
+            [expectation fulfill];
+        }
+    });
     
-    XCTAssert(self.didOpenSectionCalled, @"On opening of a section, 'didOpenSection:' must be called");
+    [self waitForExpectationsWithTimeout:5.0 handler:^(NSError * _Nullable error) { }];
 }
 
 - (void)testClosing {
+    XCTAssert(!self.willCloseSectionCalled);
+    XCTAssert(!self.didCloseSectionCalled);
     
     [self waitForHeaderViewInSection:0];
     // First open
@@ -59,9 +70,13 @@ - (void)testClosing {
     
     XCTAssert(self.willCloseSectionCalled, @"On closing of a section, 'willCloseSection:' must be called");
     
-    [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.5]];
-    
-    XCTAssert(self.didCloseSectionCalled, @"On closing of a section, 'didCloseSection:' must be called");
+    XCTestExpectation *expectation = [self expectationWithDescription:@"On closing of a section, 'didCloseSection:' must be called"];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if (self.didCloseSectionCalled) {
+            [expectation fulfill];
+        }
+    });
+    [self waitForExpectationsWithTimeout:5.0 handler:^(NSError * _Nullable error) { }];
 }
 
 
diff --git a/Tests/Testing_Example/FZAccordionTableViewUnitTests/FZAccordionTableViewGeneralTests.m b/Tests/Testing_Example/FZAccordionTableViewUnitTests/FZAccordionTableViewGeneralTests.m
@@ -10,6 +10,17 @@
 #import "FZAccordionTableViewTestBase.h"
 #include <stdlib.h>
 
+@interface FZAccordionTableViewSectionInfo : NSObject
+@property (nonatomic, getter=isOpen) BOOL open;
+@property (nonatomic) NSInteger numberOfRows;
+@end
+
+@interface FZAccordionTableView(Private)
+
+@property (strong, nonatomic) NSMutableArray <FZAccordionTableViewSectionInfo *> *sectionInfos;
+
+@end
+
 @interface FZAccordionTableViewGeneralTests : FZAccordionTableViewTestBase
 
 @end
@@ -86,51 +97,57 @@ - (void)testAllowMultipleSectionsOpenAsFalse {
     XCTAssert(![self.tableView isSectionOpen:0] && [self.tableView isSectionOpen:1], @"Section 0 should be closed when Section 1 was being forced to be open.");
 }
 
-//#pragma mark - Deletion Tests -
-//
-//- (void)testDeletingRowWithOpenSection {
-//    
-//    NSInteger section = 0;
-//    
-//    [self.mainViewController.tableView toggleSection:section];
-//    XCTAssert([self.mainViewController.tableView isSectionOpen:section], @"Section %d should be open.", (int)section);
-//    
-//    XCTAssert([self.mainViewController.sections[section] integerValue] == [self.mainViewController.tableView.numOfRowsForSection[@(section)] integerValue], @"The number of rows in section %d of our data source should match those of the FZAccordionTableView 'numOfRowsForSection'", (int)section);
-//    
-//    NSInteger numberOfRows = [self.mainViewController.sections[section] integerValue];
-//    self.mainViewController.sections[section] = @(numberOfRows-1);
-//    
-//    XCTAssert([self.mainViewController.sections[section] integerValue] != [self.mainViewController.tableView.numOfRowsForSection[@(section)] integerValue], @"Without calling 'deleteForRows' there should be a difference between data source and what the tableView says.");
-//    
-//    // Calling 'deleteRowsAtIndexPaths' propogates the necessary methods/changes, but throws an exception that we can just ignore.
-//    @try {
-//        [self.mainViewController.tableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:numberOfRows-1 inSection:section]] withRowAnimation:UITableViewRowAnimationNone];
-//    }
-//    @catch(NSException *exception) { }
-//    
-//    XCTAssert([self.mainViewController.sections[section] integerValue] == [self.mainViewController.tableView.numOfRowsForSection[@(section)] integerValue], @"The number of rows in section %d of our data source should match those of the FZAccordionTableView 'numOfRowsForSection' after deletion.", (int)section);
-//}
-//
+#pragma mark - Deletion Tests -
+
+- (void)testDeletingRowWithOpenSection {
+    
+    NSInteger section = 0;
+    
+    // Open the section
+    [self waitForHeaderViewInSection:section];
+    [self.tableView toggleSection:section];
+    XCTAssert([self.tableView isSectionOpen:section], @"Section %d should be open.", (int)section);
+    
+    // Make sure initial conditions hold
+    XCTAssert([self.mainViewController.sections[section] integerValue] == [self.tableView.sectionInfos[section] numberOfRows], @"The number of rows in section %d of our data source should match those of the FZAccordionTableView.", (int)section);
+    
+    // "Delete" in the user data source
+    NSInteger numberOfRows = [self.mainViewController.sections[section] integerValue];
+    self.mainViewController.sections[section] = @(numberOfRows-1);
+    
+    XCTAssert([self.mainViewController.sections[section] integerValue] != [self.tableView.sectionInfos[section] numberOfRows], @"Without calling 'deleteForRows' there should be a difference between data source and what the tableView says.");
+    
+    // Delete in the tableView
+    @try {
+        [self.tableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:numberOfRows-1 inSection:section]] withRowAnimation:UITableViewRowAnimationNone];
+    }
+    @catch(NSException *exception) {
+        // Calling 'deleteRowsAtIndexPaths' propogates the necessary methods/changes, but throws an exception that we can just ignore.
+    }
+    
+    XCTAssert([self.mainViewController.sections[section] integerValue] == [self.tableView.sectionInfos[section] numberOfRows], @"The number of rows in section %d of our data source should match those of the FZAccordionTableView.", (int)section);
+}
+
 //- (void)testDeletingRowWithClosedSection {
 //    
 //    NSInteger section = 0;
 //    
-//    XCTAssert(![self.mainViewController.tableView isSectionOpen:section], @"Section %d should be closed.", (int)section);
+//    XCTAssert(![self.tableView isSectionOpen:section], @"Section %d should be closed.", (int)section);
 //    
-//    XCTAssert([self.mainViewController.sections[section] integerValue] == [self.mainViewController.tableView.numOfRowsForSection[@(section)] integerValue], @"The number of rows in section %d of our data source should match those of the FZAccordionTableView 'numOfRowsForSection'", (int)section);
+//    XCTAssert([self.mainViewController.sections[section] integerValue] == [self.tableView.numOfRowsForSection[@(section)] integerValue], @"The number of rows in section %d of our data source should match those of the FZAccordionTableView 'numOfRowsForSection'", (int)section);
 //    
 //    NSInteger numberOfRows = [self.mainViewController.sections[section] integerValue];
 //    self.mainViewController.sections[section] = @(numberOfRows-1);
 //    
-//    XCTAssert([self.mainViewController.sections[section] integerValue] != [self.mainViewController.tableView.numOfRowsForSection[@(section)] integerValue], @"Without calling 'deleteForRows' there should be a difference between data source and what the tableView says.");
+//    XCTAssert([self.mainViewController.sections[section] integerValue] != [self.tableView.numOfRowsForSection[@(section)] integerValue], @"Without calling 'deleteForRows' there should be a difference between data source and what the tableView says.");
 //    
 //    // Calling 'deleteRowsAtIndexPaths' propogates the necessary methods/changes, but throws an exception that we can just ignore.
 //    @try {
-//        [self.mainViewController.tableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:numberOfRows-1 inSection:section]] withRowAnimation:UITableViewRowAnimationNone];
+//        [self.tableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:numberOfRows-1 inSection:section]] withRowAnimation:UITableViewRowAnimationNone];
 //    }
 //    @catch(NSException *exception) { }
 //    
-//    XCTAssert([self.mainViewController.sections[section] integerValue] == [self.mainViewController.tableView.numOfRowsForSection[@(section)] integerValue], @"The number of rows in section %d of our data source should match those of the FZAccordionTableView 'numOfRowsForSection' after deletion.", (int)section);
+//    XCTAssert([self.mainViewController.sections[section] integerValue] == [self.tableView.numOfRowsForSection[@(section)] integerValue], @"The number of rows in section %d of our data source should match those of the FZAccordionTableView 'numOfRowsForSection' after deletion.", (int)section);
 //}
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,6 @@ - (void)autoCollapseAllSectionsExceptSection:(NSInteger)section {`
`403`	`403`	`}`
`404`	`404`	`}`
`405`	`405`
`406`		`-`
`407`	`406`	`#pragma mark - <UITableViewDataSource> -`
`408`	`407`
`409`	`408`	`- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {`
`@@ -432,7 +431,6 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {`
`432`	`431`	`[self.sectionInfos addObject:section];`
`433`	`432`	`}`
`434`	`433`
`435`		`-`
`436`	`434`	`return numOfSections;`
`437`	`435`	`}`
`438`	`436`
`@@ -451,8 +449,6 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger`
`451`	`449`	`numOfRows = [self.subclassDataSource tableView:tableView numberOfRowsInSection:section];;`
`452`	`450`	`}`
`453`	`451`
`454`		`- return 5;`
`455`		`-`
`456`	`452`	`[self.sectionInfos[section] setNumberOfRows:numOfRows];`
`457`	`453`
`458`	`454`	`return ([self isSectionOpen:section]) ? numOfRows : 0;`