tests

Author: Chris Yang

shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm

@@ -61,10 +61,6 @@
   NSString* flutterAssetsPath = FLTAssetPath(bundle);
   NSURL* assets = [bundle URLForResource:flutterAssetsPath withExtension:nil];
 
-  if ([assets checkResourceIsReachableAndReturnError:NULL]) {
-    return assets;
-  }
-
   if (!assets) {
     assets = [[NSBundle mainBundle] URLForResource:flutterAssetsPath withExtension:nil];
   }

shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm

@@ -87,35 +87,29 @@ - (void)testFLTGetApplicationBundleWhenCurrentTargetIsExtension {
   XCTAssertEqualObjects(bundle.bundleURL, [NSBundle mainBundle].bundleURL);
 }
 
-// NSURL* FLTAssetsURLFromBundle(NSBundle* bundle) {
-//   NSString* assetsPathFromInfoPlist = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
-//   NSString* flutterAssetsPath = assetsPathFromInfoPlist ?:
-//   @"Frameworks/App.framework/flutter_assets"; NSURL* assets = [bundle
-//   URLForResource:flutterAssetsPath withExtension:nil];
-
-//   if ([assets checkResourceIsReachableAndReturnError:NULL]) {
-//     return assets;
-//   }
-
-//   if (!assets) {
-//     assets = [[NSBundle mainBundle] URLForResource:flutterAssetsPath withExtension:nil];
-//   }
-//   return assets;
-// }
 - (void)testFLTAssetsURLFromBundle {
   {
-    // Found asset path in info.plist.
+    // Found asset path in info.plist (even not reachable)
     id mockBundle = OCMClassMock([NSBundle class]);
     OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
     NSURL* mockAssetsURL = OCMClassMock([NSURL class]);
     OCMStub([mockBundle URLForResource:@"foo/assets" withExtension:nil]).andReturn(mockAssetsURL);
-    OCMStub([mockAssetsURL checkResourceIsReachableAndReturnError:NULL]).andReturn(YES);
+    OCMStub([mockAssetsURL checkResourceIsReachableAndReturnError:NULL]).andReturn(NO);
     OCMStub([mockAssetsURL path]).andReturn(@"foo/assets");
     NSURL* url = FLTAssetsURLFromBundle(mockBundle);
     XCTAssertEqualObjects(url.path, @"foo/assets");
   }
   {
     // No asset path in info.plist, defaults to main bundle
+    id mockBundle = OCMClassMock([NSBundle class]);
+    id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+    NSURL* mockAssetsURL = OCMClassMock([NSURL class]);
+    OCMStub([mockBundle URLForResource:@"Frameworks/App.framework/flutter_assets" withExtension:nil]).andReturn(nil);
+    OCMStub([mockAssetsURL checkResourceIsReachableAndReturnError:NULL]).andReturn(NO);
+    OCMStub([mockAssetsURL path]).andReturn(@"path/to/foo/assets");
+    OCMStub([mockMainBundle URLForResource:@"Frameworks/App.framework/flutter_assets" withExtension:nil]).andReturn(mockAssetsURL);
+    NSURL* url = FLTAssetsURLFromBundle(mockBundle);
+    XCTAssertEqualObjects(url.path, @"path/to/foo/assets");
   }
 }