diff --git a/ios/RNPhotosFrameworkTests/Info.plist b/ios/RNPhotosFrameworkTests/Info.plist deleted file mode 100644 index 6c6c23c..0000000 --- a/ios/RNPhotosFrameworkTests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/ios/RNPhotosFrameworkTests/PHAssetsService_getAssetsForFetchResultTests.m b/ios/RNPhotosFrameworkTests/PHAssetsService_getAssetsForFetchResultTests.m deleted file mode 100644 index 45aa284..0000000 --- a/ios/RNPhotosFrameworkTests/PHAssetsService_getAssetsForFetchResultTests.m +++ /dev/null @@ -1,134 +0,0 @@ -#pragma clang diagnostic ignored "-Wincompatible-pointer-types" - -#import -#import "PHAssetsService.h" -#import "RNPFHelpers.h" - -@interface PHAssetsServicegetAssetsForFetchResultTests : XCTestCase -@end - -@implementation PHAssetsServicegetAssetsForFetchResultTests -NSMutableArray *arrayWithFakeAssets; -NSMutableArray *scenarioAssets; - - -- (void)setUp { - arrayWithFakeAssets = [NSMutableArray new]; - for(int i = 0; i < 200;i++){ - [arrayWithFakeAssets addObject:@(i)]; - } - - scenarioAssets = [NSMutableArray new]; - [scenarioAssets addObject:@(2012)]; - [scenarioAssets addObject:@(2013)]; - [scenarioAssets addObject:@(2014)]; - [scenarioAssets addObject:@(2015)]; - [scenarioAssets addObject:@(2016)]; - - [super setUp]; -} - -- (void)tearDown { - arrayWithFakeAssets = nil; - scenarioAssets = nil; - [super tearDown]; -} - -- (void)testLoad { - - - -} - -- (void)testShouldReturnEqualAmountOfAssets { - NSArray *resultYesYes = [PHAssetsService getAssetsForFetchResult:arrayWithFakeAssets startIndex:5 endIndex:15 assetDisplayStartToEnd:YES andAssetDisplayBottomUp:YES]; - [self setUp]; - NSArray *resultYesNo = [PHAssetsService getAssetsForFetchResult:arrayWithFakeAssets startIndex:5 endIndex:15 assetDisplayStartToEnd:YES andAssetDisplayBottomUp:NO]; - [self setUp]; - NSArray *resultNoYes = [PHAssetsService getAssetsForFetchResult:arrayWithFakeAssets startIndex:5 endIndex:15 assetDisplayStartToEnd:YES andAssetDisplayBottomUp:NO]; - [self setUp]; - NSArray *resultNoNo = [PHAssetsService getAssetsForFetchResult:arrayWithFakeAssets startIndex:5 endIndex:15 assetDisplayStartToEnd:YES andAssetDisplayBottomUp:NO]; - XCTAssertTrue(resultYesYes.count == 10); - XCTAssertTrue(resultYesNo.count == 10); - XCTAssertTrue(resultNoYes.count == 10); - XCTAssertTrue(resultNoNo.count == 10); -} - --(int) assetAsInt:(PHAssetWithCollectionIndex *)assetWithIndex{ - return [(NSNumber *)[assetWithIndex asset] intValue]; -} - -//Testing scenarios from : https://github.com/olofd/react-native-photos-framework/pull/11#issuecomment-264324873 --(void) testOrderScenarioOne { - // load assets from newest to oldest from the top to bottom of screen - // this is default behavior - NSArray *result = [PHAssetsService getAssetsForFetchResult:scenarioAssets startIndex:0 endIndex:2 assetDisplayStartToEnd:NO andAssetDisplayBottomUp:NO]; - - XCTAssertEqual(result.count, 3); - - XCTAssertEqual([self assetAsInt:result[0]], 2016); - XCTAssertEqual([self assetAsInt:result[1]], 2015); - XCTAssertEqual([self assetAsInt:result[2]], 2014); - //scrolling down will load - result = [PHAssetsService getAssetsForFetchResult:scenarioAssets startIndex:3 endIndex:5 assetDisplayStartToEnd:NO andAssetDisplayBottomUp:NO]; - XCTAssertEqual(result.count, 2); - XCTAssertEqual([self assetAsInt:result[0]], 2013); - XCTAssertEqual([self assetAsInt:result[1]], 2012); -} - --(void) testOrderScenarioTwo { - // load assets from newest to oldest from the bottom to top of screen - NSArray *result = [PHAssetsService getAssetsForFetchResult:scenarioAssets startIndex:0 endIndex:2 assetDisplayStartToEnd:NO andAssetDisplayBottomUp:YES]; - - XCTAssertEqual(result.count, 3); - XCTAssertEqual([self assetAsInt:result[0]], 2014); - XCTAssertEqual([self assetAsInt:result[1]], 2015); - XCTAssertEqual([self assetAsInt:result[2]], 2016); - //scrolling down will load - result = [PHAssetsService getAssetsForFetchResult:scenarioAssets startIndex:3 endIndex:5 assetDisplayStartToEnd:NO andAssetDisplayBottomUp:YES]; - XCTAssertEqual(result.count, 2); - XCTAssertEqual([self assetAsInt:result[0]], 2012); - XCTAssertEqual([self assetAsInt:result[1]], 2013); -} - --(void) testOrderScenarioThree { - // load assets from oldest to newest from the top to bottom of screen - NSArray *result = [PHAssetsService getAssetsForFetchResult:scenarioAssets startIndex:0 endIndex:2 assetDisplayStartToEnd:YES andAssetDisplayBottomUp:NO]; - - XCTAssertEqual(result.count, 3); - XCTAssertEqual([self assetAsInt:result[0]], 2012); - XCTAssertEqual([self assetAsInt:result[1]], 2013); - XCTAssertEqual([self assetAsInt:result[2]], 2014); - //scrolling up will load - result = [PHAssetsService getAssetsForFetchResult:scenarioAssets startIndex:3 endIndex:5 assetDisplayStartToEnd:YES andAssetDisplayBottomUp:NO]; - XCTAssertEqual(result.count, 2); - XCTAssertEqual([self assetAsInt:result[0]], 2015); - XCTAssertEqual([self assetAsInt:result[1]], 2016); -} - --(void) testOrderScenarioFour { - // load assets from oldest to newest from the bottom to top of screen - NSArray *result = [PHAssetsService getAssetsForFetchResult:scenarioAssets startIndex:0 endIndex:2 assetDisplayStartToEnd:YES andAssetDisplayBottomUp:YES]; - - XCTAssertEqual(result.count, 3); - XCTAssertEqual([self assetAsInt:result[0]], 2014); - XCTAssertEqual([self assetAsInt:result[1]], 2013); - XCTAssertEqual([self assetAsInt:result[2]], 2012); - //scrolling up will load - result = [PHAssetsService getAssetsForFetchResult:scenarioAssets startIndex:3 endIndex:5 assetDisplayStartToEnd:YES andAssetDisplayBottomUp:YES]; - XCTAssertEqual(result.count, 2); - XCTAssertEqual([self assetAsInt:result[0]], 2016); - XCTAssertEqual([self assetAsInt:result[1]], 2015); -} - --(void) testOrderScenarioFive { - // load assets from oldest to newest from the bottom to top of screen - NSArray *result = [PHAssetsService getAssetsForFetchResult:scenarioAssets startIndex:3 endIndex:7 assetDisplayStartToEnd:YES andAssetDisplayBottomUp:YES]; - - XCTAssertEqual(result.count, 2); - XCTAssertEqual([self assetAsInt:result[0]], 2016); - XCTAssertEqual([self assetAsInt:result[1]], 2015); -} - - -@end diff --git a/ios/RNPhotosFrameworkTests/RCTConvert+RNPhotosFrameworkTests.m b/ios/RNPhotosFrameworkTests/RCTConvert+RNPhotosFrameworkTests.m deleted file mode 100644 index 68f0528..0000000 --- a/ios/RNPhotosFrameworkTests/RCTConvert+RNPhotosFrameworkTests.m +++ /dev/null @@ -1,47 +0,0 @@ -#import -#import -#import "RCTConvert+RNPhotosFramework.h" - -@interface RCTConvert_RNPhotosFrameworkTests : XCTestCase - -@end - -@implementation RCTConvert_RNPhotosFrameworkTests - -- (void)setUp { - [super setUp]; - // Put setup code here. This method is called before the invocation of each test method in the class. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - -- (void)testSourceTypesNil { - int extracted = [RCTConvert PHAssetSourceTypes:nil]; - int nsOptionsExpected = PHAssetSourceTypeNone; - XCTAssertEqual(extracted, nsOptionsExpected); -} - - -- (void)testSourceTypesEmpty { - int extracted = [RCTConvert PHAssetSourceTypes:@[]]; - int nsOptionsExpected = PHAssetSourceTypeNone; - XCTAssertEqual(extracted, nsOptionsExpected); -} - -- (void)testSourceTypesOneType { - int extracted = [RCTConvert PHAssetSourceTypes:@[@"userLibrary"]]; - int nsOptionsExpected = PHAssetSourceTypeUserLibrary; - XCTAssertEqual(extracted, nsOptionsExpected); -} - -- (void)testSourceTypesMultipleTypes { - int extracted = [RCTConvert PHAssetSourceTypes:@[@"userLibrary" , @"cloudShared", @"itunesSynced"]]; - int nsOptionsExpected = PHAssetSourceTypeCloudShared | PHAssetSourceTypeUserLibrary | PHAssetSourceTypeiTunesSynced; - XCTAssertEqual(extracted, nsOptionsExpected); -} - - -@end diff --git a/local-cli/link/groupFilesByType.js b/local-cli/link/groupFilesByType.js index 5dc692e..6e0fa20 100644 --- a/local-cli/link/groupFilesByType.js +++ b/local-cli/link/groupFilesByType.js @@ -9,7 +9,7 @@ const mime = require('mime'); mime.define({ 'font/opentype': ['otf'], 'font/truetype': ['ttf'], -}); +}, true); /** * Given an array of files, it groups it by it's type. diff --git a/react-native-photos-framework.podspec b/react-native-photos-framework.podspec index 1965356..5a991fb 100644 --- a/react-native-photos-framework.podspec +++ b/react-native-photos-framework.podspec @@ -13,5 +13,5 @@ Pod::Spec.new do |s| :tag => "v" + pkg["version"] } s.source_files = 'ios/**/*.{h,m}' s.platform = :ios, "8.0" - s.dependency 'React/Core' + s.dependency 'React-Core' end