Check branch, branches and remote with NSParameterAssert()

Author: Ben Chatelain

ObjectiveGit/GTRepository+RemoteOperations.m

@@ -170,18 +170,23 @@ - (NSArray *)fetchHeadEntriesWithError:(NSError **)error {
 #pragma mark - Push (Public)
 
 - (BOOL)pushBranch:(GTBranch *)branch toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(GTRemotePushTransferProgressBlock)progressBlock {
+	NSParameterAssert(branch != nil);
+	NSParameterAssert(remote != nil);
+
 	return [self pushBranches:@[ branch ] toRemote:remote withOptions:options error:error progress:progressBlock];
 }
 
 - (BOOL)pushBranches:(NSArray *)branches toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(GTRemotePushTransferProgressBlock)progressBlock {
+	NSParameterAssert(branches != nil);
+	NSParameterAssert(branches.count != 0);
+	NSParameterAssert(remote != nil);
+
 	NSMutableArray *refspecs = nil;
-	if (branches.count != 0) {
-		// Build refspecs for the passed in branches
-		refspecs = [NSMutableArray arrayWithCapacity:branches.count];
-		for (GTBranch *branch in branches) {
-			// Assumes upstream branch reference has same name as local tracking branch
-			[refspecs addObject:[NSString stringWithFormat:@"%@:%@", branch.reference.name, branch.reference.name]];
-		}
+	// Build refspecs for the passed in branches
+	refspecs = [NSMutableArray arrayWithCapacity:branches.count];
+	for (GTBranch *branch in branches) {
+		// Assumes upstream branch reference has same name as local tracking branch
+		[refspecs addObject:[NSString stringWithFormat:@"%@:%@", branch.reference.name, branch.reference.name]];
 	}
 
 	return [self pushRefspecs:refspecs toRemote:remote withOptions:options error:error progress:progressBlock];

ObjectiveGitTests/GTRemotePushSpec.m

@@ -100,6 +100,32 @@
 			error = NULL;
 		});
 
+		context(@"when -pushBranch: is given invalid parameters", ^{
+			it(@"needs a non-nil branch", ^{
+				XCTAssertThrowsSpecificNamed([localRepo pushBranch:nil toRemote:remote withOptions:nil error:&error progress:NULL], NSException, NSInternalInconsistencyException, @"should throw NSInternalInconsistencyException");
+			});
+
+			it(@"needs a non-nil remote", ^{
+				GTBranch *masterBranch = localBranchWithName(@"master", localRepo);
+				XCTAssertThrowsSpecificNamed([localRepo pushBranch:masterBranch toRemote:nil withOptions:nil error:&error progress:NULL], NSException, NSInternalInconsistencyException, @"should throw NSInternalInconsistencyException");
+			});
+		});
+
+		context(@"when -pushBranches: is given invalid parameters", ^{
+			it(@"needs a non-nil branch array", ^{
+				XCTAssertThrowsSpecificNamed([localRepo pushBranches:nil toRemote:remote withOptions:nil error:&error progress:NULL], NSException, NSInternalInconsistencyException, @"should throw NSInternalInconsistencyException");
+			});
+
+			it(@"needs a non-empty branch array", ^{
+				XCTAssertThrowsSpecificNamed([localRepo pushBranches:@[] toRemote:remote withOptions:nil error:&error progress:NULL], NSException, NSInternalInconsistencyException, @"should throw NSInternalInconsistencyException");
+			});
+
+			it(@"needs a non-nil remote", ^{
+				GTBranch *masterBranch = localBranchWithName(@"master", localRepo);
+				XCTAssertThrowsSpecificNamed([localRepo pushBranches:@[masterBranch] toRemote:nil withOptions:nil error:&error progress:NULL], NSException, NSInternalInconsistencyException, @"should throw NSInternalInconsistencyException");
+			});
+		});
+
 		context(@"when the local and remote branches are in sync", ^{
 			it(@"should push no commits", ^{
 				GTBranch *masterBranch = localBranchWithName(@"master", localRepo);
@@ -142,8 +168,8 @@
 			expect(@([localTrackingBranch numberOfCommitsWithError:NULL])).to(equal(@3));
 
 			// Number of commits on remote before push
-//			GTBranch *remoteMasterBranch = localBranchWithName(@"master", remoteRepo);
-//			expect(@([remoteMasterBranch numberOfCommitsWithError:NULL])).to(equal(@3));
+			GTBranch *remoteMasterBranch = localBranchWithName(@"master", remoteRepo);
+			expect(@([remoteMasterBranch numberOfCommitsWithError:NULL])).to(equal(@3));
 
 			// Push
 			__block BOOL transferProgressed = NO;
@@ -158,13 +184,13 @@
 			localTrackingBranch = [masterBranch trackingBranchWithError:&error success:&success];
 			expect(error).to(beNil());
 			expect(@(success)).to(beTrue());
-			expect(@([localTrackingBranch numberOfCommitsWithError:NULL])).to(equal(@3));
+//			expect(@([localTrackingBranch numberOfCommitsWithError:NULL])).to(equal(@3));
 
 			// Refetch master branch to ensure the commit count is accurate
-//			remoteMasterBranch = localBranchWithName(@"master", remoteRepo);
+			remoteMasterBranch = localBranchWithName(@"master", remoteRepo);
 
 			// Number of commits on remote after push
-//			expect(@([remoteMasterBranch numberOfCommitsWithError:NULL])).to(equal(@4));
+			expect(@([remoteMasterBranch numberOfCommitsWithError:NULL])).to(equal(@4));
 
 			// Verify commit is in remote
 			GTCommit *pushedCommit = [remoteRepo lookUpObjectByOID:testCommit.OID objectType:GTObjectTypeCommit error:&error];