Adjust test for new architecture.

Mobile Buy SDK/Mobile Buy SDK Tests/BUYClientTest.m

@@ -34,6 +34,7 @@
 #import "BUYShopifyErrorCodes.h"
 #import "BUYAccountCredentials.h"
 #import "BUYClient+Customers.h"
+#import "BUYApplePayToken.h"
 
 NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 
@@ -130,7 +131,7 @@ NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 {
 	BUYCheckout *checkout = [[BUYCheckout alloc] initWithModelManager:self.client.modelManager JSONDictionary:@{@"token": @"abcdef", @"payment_due": @0}];
 	
-	NSURLSessionDataTask *task = [self.client completeCheckout:checkout completion:nil];
+	NSURLSessionDataTask *task = [self.client completeCheckout:checkout paymentToken:nil completion:nil];
 	XCTAssertNotNil(task);
 }
 
@@ -196,23 +197,15 @@ NSString * const BUYFakeCustomerToken = @"dsfasdgafdg";
 
 - (void)testCheckoutWithApplePayToken
 {
-	__block int callbackCount = 0;
-	
-	[self.client completeCheckout:nil withApplePayToken:[PKPaymentToken new] completion:^(BUYCheckout *checkout, NSError *error) {
-		callbackCount++;
-		XCTAssertEqual(error.code, BUYShopifyError_InvalidCheckoutObject);
-	}];
+	id<BUYPaymentToken> token = [[BUYApplePayToken alloc] initWithPaymentToken:[PKPaymentToken new]];
+	XCTAssertThrows(
+		[self.client completeCheckout:nil paymentToken:token completion:nil]
+	);
 
 	BUYCheckout *checkout = [[BUYCheckout alloc] initWithModelManager:self.client.modelManager JSONDictionary:@{@"token": @"abcdef", @"payment_due": @0}];
-
-	[self.client completeCheckout:checkout withApplePayToken:nil completion:^(BUYCheckout *checkout, NSError *error) {
-		callbackCount++;
-		XCTAssertEqual(error.code, BUYShopifyError_NoApplePayTokenSpecified);
-	}];
-	
-	XCTAssertEqual(callbackCount, 2);
-	
-	[self testProductsInCollectionWithSortOrderCollectionDefault];
+	XCTAssertNoThrow(
+		[self.client completeCheckout:checkout paymentToken:nil completion:nil]
+	);
 }
 
 - (void)testQueryItemsConversion

Mobile Buy SDK/Mobile Buy SDK Tests/BUYIntegrationTest.m

@@ -220,7 +220,7 @@
 	XCTAssertEqualObjects(_checkout.email, @"test@test.com");
 }
 
-- (void)addCreditCardToCheckout
+- (id<BUYPaymentToken>)addCreditCardToCheckout
 {
 	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
 		return [self shouldUseMocks];
@@ -229,19 +229,23 @@
 	}];
 	
 	BUYCreditCard *creditCard = [self creditCard];
+	__block id<BUYPaymentToken> token = nil;
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
-	[self.client storeCreditCard:creditCard checkout:_checkout completion:^(BUYCheckout *returnedCheckout, NSString *paymentSessionId, NSError *error) {
+	[self.client storeCreditCard:creditCard checkout:_checkout completion:^(BUYCheckout *returnedCheckout, id<BUYPaymentToken> paymentToken, NSError *error) {
 		XCTAssertNil(error);
-		XCTAssertNotNil(paymentSessionId);
+		XCTAssertNotNil(paymentToken);
 		XCTAssertNotNil(returnedCheckout);
 		
 		_checkout = returnedCheckout;
+		token = paymentToken;
 		[expectation fulfill];
 	}];
 	[self waitForExpectationsWithTimeout:10 handler:^(NSError *error) {
 		XCTAssertNil(error);
 	}];
+	
+	return token;
 }
 
 - (BUYCreditCard *)creditCard
@@ -256,7 +260,7 @@
 	return creditCard;
 }
 
-- (void)completeCheckout
+- (void)completeCheckoutWithToken:(id<BUYPaymentToken>)paymentToken
 {
 	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
 		return [self shouldUseMocks];
@@ -265,7 +269,7 @@
 	}];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
-	[self.client completeCheckout:_checkout completion:^(BUYCheckout *returnedCheckout, NSError *error) {
+	[self.client completeCheckout:_checkout paymentToken:paymentToken completion:^(BUYCheckout *returnedCheckout, NSError *error) {
 		XCTAssertNil(error);
 		XCTAssertNotNil(returnedCheckout);
 		
@@ -988,8 +992,9 @@
 	[self createCheckout];
 	[self fetchShippingRates];
 	[self updateCheckout];
-	[self addCreditCardToCheckout];
-	[self completeCheckout];
+	
+	id<BUYPaymentToken> token = [self addCreditCardToCheckout];
+	[self completeCheckoutWithToken:token];
 	
 	[self pollUntilCheckoutIsComplete];
 	[self verifyCompletedCheckout];
@@ -1036,8 +1041,9 @@
 	[self updateCheckout];
 	
 	//We use a credit card here because we're not generating apple pay tokens in the tests
-	[self addCreditCardToCheckout];
-	[self completeCheckout];
+	id<BUYPaymentToken> token = [self addCreditCardToCheckout];
+	[self completeCheckoutWithToken:token];
+	
 	[self pollUntilCheckoutIsComplete];
 	[self verifyCompletedCheckout];
 }