Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191534
Change subject: fixes unit testing target
......................................................................
fixes unit testing target
Change-Id: Ie8dc444ffdf99e62009cd9ccf53373e56125d2c6
---
M MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
M Wikipedia.xcodeproj/project.pbxproj
M WikipediaUnitTests/CircularBitwiseRotationTests.m
M WikipediaUnitTests/NSArray+BKIndexTests.m
M WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
M wikipedia/AssetsFile/AssetsFile.h
M wikipedia/AssetsFile/AssetsFileEnum.h
M wikipedia/mw-utils/WikipediaAppUtils.h
8 files changed, 11 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/34/191534/1
diff --git
a/MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
b/MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
index 2906366..5b299cc 100644
--- a/MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
+++ b/MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
@@ -27,6 +27,7 @@
license:nil
filePageURL:nil
imageURL:nil
+ imageThumbURL:nil
owner:nil];
}
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 379bc48..bb591fa 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -182,6 +182,8 @@
08D631FA1A69B8CD00D87AD0 /* WMFImageGalleryCollectionViewCell.m
in Sources */ = {isa = PBXBuildFile; fileRef = 08D631F91A69B8CD00D87AD0 /*
WMFImageGalleryCollectionViewCell.m */; };
701FF5EE601DEA3FCAB7EFD3 /* libPods.a in Frameworks */ = {isa =
PBXBuildFile; fileRef = D82982ED992F47428037BDF2 /* libPods.a */; };
954BA118838BF8BA6B01C34A /* libPods-WikipediaUnitTests.a in
Frameworks */ = {isa = PBXBuildFile; fileRef = 8CE61C6963F825760822A28A /*
libPods-WikipediaUnitTests.a */; };
+ BC118C0F1A95894D0072E4D8 /* WikipediaAppUtils.m in Sources */ =
{isa = PBXBuildFile; fileRef = C9180EC318AED30C006C1DCA /* WikipediaAppUtils.m
*/; };
+ BC118C101A9589720072E4D8 /* AssetsFile.m in Sources */ = {isa =
PBXBuildFile; fileRef = 04272E791940EEBC00CC682F /* AssetsFile.m */; };
BC42735D1A7C73B300068882 /* NSArray+Predicate.m in Sources */ =
{isa = PBXBuildFile; fileRef = 04CBAC7219A9B786009F3D7E /* NSArray+Predicate.m
*/; };
BC42735E1A7C73B300068882 /* NSArray+PredicateTests.m in Sources
*/ = {isa = PBXBuildFile; fileRef = BC8309C81A7C370B003FC5C7 /*
NSArray+PredicateTests.m */; };
BC50C37F1A83C784006DC7AF /* WMFNetworkUtilities.m in Sources */
= {isa = PBXBuildFile; fileRef = BC50C37E1A83C784006DC7AF /*
WMFNetworkUtilities.m */; };
@@ -2640,6 +2642,7 @@
BCB669F91A83F71C00C7B1FE /* MWKImageList.m in
Sources */,
BCB669F81A83F71C00C7B1FE /* MWKUserDataStore.m
in Sources */,
BCB669F31A83F71C00C7B1FE /*
MWKRecentSearchEntry.m in Sources */,
+ BC118C0F1A95894D0072E4D8 /* WikipediaAppUtils.m
in Sources */,
BCB669F61A83F71C00C7B1FE /* MWKDataStore.m in
Sources */,
BCB669E71A83F71C00C7B1FE /* MWKSite.m in
Sources */,
BCB58F7C1A8D0C8E00465627 /*
NSArray+BKIndexTests.m in Sources */,
@@ -2662,6 +2665,7 @@
BCB669F21A83F71C00C7B1FE /* MWKHistoryList.m in
Sources */,
BCB669E61A83F6D300C7B1FE /*
MWKHistoryListTests.m in Sources */,
BC42735D1A7C73B300068882 /* NSArray+Predicate.m
in Sources */,
+ BC118C101A9589720072E4D8 /* AssetsFile.m in
Sources */,
BCB669EA1A83F71C00C7B1FE /* MWKSiteDataObject.m
in Sources */,
BC86B9411A929D7900B4C039 /*
UICollectionViewFlowLayout+WMFItemSizeThatFits.m in Sources */,
BCB669EC1A83F71C00C7B1FE /* MWKSection.m in
Sources */,
diff --git a/WikipediaUnitTests/CircularBitwiseRotationTests.m
b/WikipediaUnitTests/CircularBitwiseRotationTests.m
index 46b112e..f7f2e92 100644
--- a/WikipediaUnitTests/CircularBitwiseRotationTests.m
+++ b/WikipediaUnitTests/CircularBitwiseRotationTests.m
@@ -9,11 +9,7 @@
#import <UIKit/UIKit.h>
#import <XCTest/XCTest.h>
-<<<<<<< HEAD
-#import "WMF_FunUtilities.h"
-=======
#import "WikipediaAppUtils.h"
->>>>>>> 8fab4cb... image gallery
@interface CircularBitwiseRotationTests : XCTestCase
diff --git a/WikipediaUnitTests/NSArray+BKIndexTests.m
b/WikipediaUnitTests/NSArray+BKIndexTests.m
index 1f5f8c6..54da71b 100644
--- a/WikipediaUnitTests/NSArray+BKIndexTests.m
+++ b/WikipediaUnitTests/NSArray+BKIndexTests.m
@@ -8,11 +8,7 @@
#import "NSArray+BKIndex.h"
#import <XCTest/XCTest.h>
-<<<<<<< HEAD
-#import "WMF_FunUtilities.h"
-=======
#import "WikipediaAppUtils.h"
->>>>>>> 8fab4cb... image gallery
#define HC_SHORTHAND 1
#import <OCHamcrest/OCHamcrest.h>
diff --git a/WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
b/WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
index a613c5d..ab05154 100644
--- a/WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
+++ b/WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
@@ -23,16 +23,16 @@
- (void)testNotNil
{
NSMutableDictionary *testDict = [NSMutableDictionary new];
- assertThat(@([testDict maybeSetObject:@"foo" forKey:@"bar"]), is(@YES));
+ assertThat(@([testDict wmf_maybeSetObject:@"foo" forKey:@"bar"]),
is(@YES));
assertThat(testDict, is(equalTo(@{@"bar": @"foo"})));
- assertThat(@([testDict maybeSetObject:@"biz" forKey:@"bar"]), is(@YES));
+ assertThat(@([testDict wmf_maybeSetObject:@"biz" forKey:@"bar"]),
is(@YES));
assertThat(testDict, is(equalTo(@{@"bar": @"biz"})));
}
- (void)testNil
{
NSMutableDictionary *testDict = [NSMutableDictionary new];
- assertThat(@([testDict maybeSetObject:nil forKey:@"bar"]), is(@NO));
+ assertThat(@([testDict wmf_maybeSetObject:nil forKey:@"bar"]), is(@NO));
assertThat(testDict, isEmpty());
}
diff --git a/wikipedia/AssetsFile/AssetsFile.h
b/wikipedia/AssetsFile/AssetsFile.h
index f1762f3..7541662 100644
--- a/wikipedia/AssetsFile/AssetsFile.h
+++ b/wikipedia/AssetsFile/AssetsFile.h
@@ -2,6 +2,7 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "AssetsFileEnum.h"
+#import <UIKit/UIKit.h>
@interface AssetsFile : NSObject
diff --git a/wikipedia/AssetsFile/AssetsFileEnum.h
b/wikipedia/AssetsFile/AssetsFileEnum.h
index 99062dc..3ab12f0 100644
--- a/wikipedia/AssetsFile/AssetsFileEnum.h
+++ b/wikipedia/AssetsFile/AssetsFileEnum.h
@@ -1,3 +1,4 @@
+#import <Foundation/Foundation.h>
typedef NS_ENUM(NSUInteger, AssetsFileEnum) {
ASSETS_FILE_UNDEFINED = 0,
diff --git a/wikipedia/mw-utils/WikipediaAppUtils.h
b/wikipedia/mw-utils/WikipediaAppUtils.h
index adee508..b484f35 100644
--- a/wikipedia/mw-utils/WikipediaAppUtils.h
+++ b/wikipedia/mw-utils/WikipediaAppUtils.h
@@ -2,9 +2,9 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
#define MWLocalizedString(key, throwaway) [WikipediaAppUtils
localizedStringForKey:key]
-
/**
* Provides compile time checking for keypaths on a given object.
--
To view, visit https://gerrit.wikimedia.org/r/191534
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8dc444ffdf99e62009cd9ccf53373e56125d2c6
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
