Fixed all tests locally

MobileNativeFoundation · Dec 21, 2023 · cdf6a57 · cdf6a57
1 parent ebeda7e
commit cdf6a57
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/bluepill/tests/BPIntegrationTests.m b/bluepill/tests/BPIntegrationTests.m
@@ -207,6 +207,8 @@ - (void)testTwoBPInstances {
     XCTAssert([runner busySwimlaneCount] == 0);
 }
 
+// Note: If this is failing for you locally, try resetting all of your
+// sims with `sudo rm -rf /private/tmp/com.apple.CoreSimulator.SimDevice.*`
 - (void)testClonedSimulators {
     BPConfiguration *config = [self generateConfig];
     config.numSims = @2;
@@ -266,13 +268,23 @@ - (void)testTwoBPInstancesWithXCTestRunFile {
     BPRunner *runner = [BPRunner BPRunnerWithConfig:config withBpPath:bpPath];
     XCTAssert(runner != nil);
     int rc = [runner runWithBPXCTestFiles:app.testBundles];
+
+    // Set this once we learn how many tests are in the BPSampleAppTests bundle.
+    NSInteger sampleAppTestsRemaining = NSNotFound;
     for (BPXCTestFile *testBundle in app.testBundles) {
+        // BPSampleAppTests is a huge bundle and will be broken into multiple batches
+        // Across all of these batches, the NOT skipped tests should add up to the total
+        // test count.
         if ([testBundle.name isEqualToString:@"BPSampleAppTests"]) {
-            XCTAssertEqual(testBundle.skipTestIdentifiers.count, 8);
+            if (sampleAppTestsRemaining == NSNotFound) {
+                sampleAppTestsRemaining = testBundle.allTestCases.count;
+            }
+            sampleAppTestsRemaining -= (testBundle.allTestCases.count - testBundle.skipTestIdentifiers.count);
         } else {
             XCTAssertEqual(testBundle.skipTestIdentifiers.count, 0);
         }
     }
+    XCTAssertEqual(sampleAppTestsRemaining, 0);
     XCTAssert(rc != 0); // this runs tests that fail
 }
 

diff --git a/bp/src/BPConstants.h b/bp/src/BPConstants.h
@@ -10,7 +10,7 @@
 #import <Foundation/Foundation.h>
 
 #pragma mark - Version Constants
-#define BP_DEFAULT_XCODE_VERSION "14.1"
+#define BP_DEFAULT_XCODE_VERSION "14.0"
 #define BP_DEFAULT_RUNTIME "iOS 16.0"
 #define BP_DEFAULT_BASE_SDK "16.0"
 

diff --git a/bp/src/BPUtils.h b/bp/src/BPUtils.h
@@ -199,16 +199,6 @@ typedef BOOL (^BPRunBlock)(void);
  */
 + (NSString *)removeSwiftArgumentsFromTestName:(NSString *)testName;
 
-/*!
- * @discussion XCTest requires that swift test names are fully namespaced, and don't include parens,
- * contrary to what Bluepill consumers provide.
- *
- * @param testName the name of the test to format
- * @param bundleName The name of the test's bundle
- * @return trimmed test name
- */
-+ (NSString *)formatSwiftTestForXCTest:(NSString *)testName withBundleName:(NSString *)bundleName;
-
 /*!
  * @discussion setup the environment for weak linked frameworks
  * @param argc the number of arguments to the command

diff --git a/bp/tests/Utils/BPTestUtils.m b/bp/tests/Utils/BPTestUtils.m
@@ -104,7 +104,7 @@ + (NSString *)formatSwiftTestForXCTest:(NSString *)testName withBundleName:(NSSt
 + (BOOL)checkIfTestCase:(NSString *)testCase bundleName:(NSString *)bundleName wasRunInLog:(NSString *)logPath {
     NSString *testName = testCase;
     if ([self isTestSwiftTest:testName]) {
-        testName = [BPUtils formatSwiftTestForXCTest:testName withBundleName:bundleName];
+        testName = [BPTestUtils formatSwiftTestForXCTest:testName withBundleName:bundleName];
     }
     NSArray *testComponents = [testName componentsSeparatedByString:@"/"];
     NSString *expectedString = [NSString stringWithFormat:@"Test Case '-[%@ %@]' started.", testComponents[0], testComponents[1]];