Fjalapeno has submitted this change and it was merged.
Change subject: lint OldDataSchema and WikipediaUnitTests
......................................................................
lint OldDataSchema and WikipediaUnitTests
Change-Id: If434950389a7e827a7cee2186df50be132a6a257
---
M OldDataSchema/Categories/NSManagedObject+WMFModelFactory.m
M OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.h
M OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.m
M OldDataSchema/Data/ArticleDataContextSingleton.h
M OldDataSchema/Data/ArticleDataContextSingleton.m
M OldDataSchema/Data/Model/Article.h
M OldDataSchema/Data/Model/DiscoveryContext.h
M OldDataSchema/Data/Model/GalleryImage.h
M OldDataSchema/Data/Model/History.h
M OldDataSchema/Data/Model/Image.h
M OldDataSchema/Data/Model/ImageData.h
M OldDataSchema/Data/Model/Saved.h
M OldDataSchema/Data/Model/Section.h
M OldDataSchema/Data/Model/SectionImage.h
M WikipediaUnitTests/BITHockeyManagerWMFExtensionsTests.m
M WikipediaUnitTests/CircularBitwiseRotationTests.m
M WikipediaUnitTests/MWKArticle_ShareSnippetTests.m
M WikipediaUnitTests/NSArray+BKIndexTests.m
M WikipediaUnitTests/NSArray+PredicateTests.m
M WikipediaUnitTests/NSIndexSet+BKReduceTests.m
M WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
M WikipediaUnitTests/NSString+FormattedAttributedStringTests.m
M WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
M WikipediaUnitTests/OldDataSchemaMigratorTests.m
M
WikipediaUnitTests/Utilities/HCIsCollectionContainingInAnyOrder+WMFCollectionMatcherUtils.m
M WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
M WikipediaUnitTests/Utilities/NSPersistentStoreCoordinator+WMFTempCoordinator.m
M WikipediaUnitTests/WMFDateFormatterTests.m
M WikipediaUnitTests/WMFErrorForApiErrorObjectTests.m
M WikipediaUnitTests/WMFImageInfoControllerTests.m
M WikipediaUnitTests/WMFJoinedPropertyParametersTests.m
M scripts/uncrustify_all.sh
32 files changed, 263 insertions(+), 312 deletions(-)
Approvals:
Fjalapeno: Looks good to me, approved
jenkins-bot: Verified
diff --git a/OldDataSchema/Categories/NSManagedObject+WMFModelFactory.m
b/OldDataSchema/Categories/NSManagedObject+WMFModelFactory.m
index 5827b67..96d5d62 100644
--- a/OldDataSchema/Categories/NSManagedObject+WMFModelFactory.m
+++ b/OldDataSchema/Categories/NSManagedObject+WMFModelFactory.m
@@ -14,7 +14,7 @@
return NSStringFromClass(self);
}
-+ (instancetype)wmf_newWithContext:(NSManagedObjectContext *)context {
++ (instancetype)wmf_newWithContext:(NSManagedObjectContext*)context {
return [[self alloc]
initWithEntity:[NSEntityDescription entityForName:[self
wmf_entityName] inManagedObjectContext:context]
insertIntoManagedObjectContext:context];
diff --git a/OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.h
b/OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.h
index 0d006ea..f423e6f 100644
--- a/OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.h
+++ b/OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.h
@@ -7,8 +7,8 @@
@interface NSManagedObjectContext (SimpleFetch)
--(NSManagedObject *)getEntityForName:(NSString *)entityName
withPredicateFormat:(NSString *)predicateFormat, ...;
+- (NSManagedObject*)getEntityForName:(NSString*)entityName
withPredicateFormat:(NSString*)predicateFormat, ...;
--(NSManagedObjectID *)getArticleIDForTitle:(NSString *)title domain:(NSString
*)domain;
+- (NSManagedObjectID*)getArticleIDForTitle:(NSString*)title
domain:(NSString*)domain;
@end
diff --git a/OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.m
b/OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.m
index ef26e20..687a03d 100644
--- a/OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.m
+++ b/OldDataSchema/Categories/NSManagedObjectContext+SimpleFetch.m
@@ -7,48 +7,47 @@
@implementation NSManagedObjectContext (SimpleFetch)
--(NSManagedObject *)getEntityForName:(NSString *)entityName
withPredicateFormat:(NSString *)predicateFormat, ...
+- (NSManagedObject*)getEntityForName:(NSString*)entityName
withPredicateFormat:(NSString*)predicateFormat, ...
{
// See:
http://www.cocoawithlove.com/2009/05/variable-argument-lists-in-cocoa.html for
variadic methods syntax reminder.
va_list args;
va_start(args, predicateFormat);
- NSPredicate * predicate = [NSPredicate predicateWithFormat:predicateFormat
arguments:args];
+ NSPredicate* predicate = [NSPredicate predicateWithFormat:predicateFormat
arguments:args];
va_end(args);
- NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
- NSEntityDescription *entity = [NSEntityDescription entityForName:
entityName
- inManagedObjectContext: self];
+ NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init];
+ NSEntityDescription* entity = [NSEntityDescription
entityForName:entityName
+ inManagedObjectContext
:self];
[fetchRequest setEntity:entity];
[fetchRequest setPredicate:predicate];
[fetchRequest setFetchLimit:1];
- NSError *error = nil;
- NSArray *entities = [self executeFetchRequest:fetchRequest error:&error];
- if(error){
+ NSError* error = nil;
+ NSArray* entities = [self executeFetchRequest:fetchRequest error:&error];
+ if (error) {
NSLog(@"Error: %@", error);
return nil;
}
// Return nil if no results - makes it easier to test whether any entities
were found.
- if (entities){
+ if (entities) {
return (entities.count == 1) ? entities[0] : nil;
- }else{
+ } else {
return nil;
}
}
--(NSManagedObjectID *)getArticleIDForTitle:(NSString *)title domain:(NSString
*)domain
-{
- Article *article = (Article *)[self getEntityForName: @"Article"
withPredicateFormat: @"\
+- (NSManagedObjectID*)getArticleIDForTitle:(NSString*)title
domain:(NSString*)domain {
+ Article* article = (Article*)[self getEntityForName:@"Article"
withPredicateFormat:@"\
title == %@ \
AND \
site == %@ \
AND \
domain == %@",
- title,
- @"wikipedia.org",//[SessionSingleton
sharedInstance].site,
- domain
- ];
+ title,
+ @"wikipedia.org",//[SessionSingleton
sharedInstance].site,
+ domain
+ ];
return (article) ? article.objectID : nil;
}
diff --git a/OldDataSchema/Data/ArticleDataContextSingleton.h
b/OldDataSchema/Data/ArticleDataContextSingleton.h
index fd5b76a..85ed424 100644
--- a/OldDataSchema/Data/ArticleDataContextSingleton.h
+++ b/OldDataSchema/Data/ArticleDataContextSingleton.h
@@ -3,7 +3,7 @@
@interface ArticleDataContextSingleton : NSObject
-+ (ArticleDataContextSingleton *)sharedInstance;
++ (ArticleDataContextSingleton*)sharedInstance;
/**
* The path to the DB
@@ -15,7 +15,7 @@
/**
* Created lazily
*/
-@property (nonatomic, retain) NSManagedObjectContext *mainContext;
+@property (nonatomic, retain) NSManagedObjectContext* mainContext;
/**
* Create a new background context. You are responsible for its lifecycle
@@ -32,6 +32,6 @@
* @param context The context to save
* @param completionBlock a completion block fired after the save operation
*/
-- (void)saveContextAndPropagateChangesToStore:(NSManagedObjectContext*)context
completionBlock:(void(^)(NSError* error))completionBlock;
+- (void)saveContextAndPropagateChangesToStore:(NSManagedObjectContext*)context
completionBlock:(void (^)(NSError* error))completionBlock;
@end
diff --git a/OldDataSchema/Data/ArticleDataContextSingleton.m
b/OldDataSchema/Data/ArticleDataContextSingleton.m
index 7dd54fe..9151e30 100644
--- a/OldDataSchema/Data/ArticleDataContextSingleton.m
+++ b/OldDataSchema/Data/ArticleDataContextSingleton.m
@@ -4,15 +4,14 @@
@interface ArticleDataContextSingleton ()
-@property (nonatomic, retain) NSManagedObjectContext *masterContext;
+@property (nonatomic, retain) NSManagedObjectContext* masterContext;
@end
@implementation ArticleDataContextSingleton
-+ (ArticleDataContextSingleton *)sharedInstance
-{
++ (ArticleDataContextSingleton*)sharedInstance {
static dispatch_once_t once;
static id sharedInstance;
dispatch_once(&once, ^{
@@ -21,28 +20,24 @@
return sharedInstance;
}
-
-- (NSString*)databasePath{
-
- NSString *articlesDBPath = [[self documentRootPath]
stringByAppendingString:@"/articleData6.sqlite"];
+- (NSString*)databasePath {
+ NSString* articlesDBPath = [[self documentRootPath]
stringByAppendingString:@"/articleData6.sqlite"];
return articlesDBPath;
}
-- (NSManagedObjectContext*)masterContext{
-
- if(!_masterContext){
-
- NSPersistentStoreCoordinator *persistentStoreCoordinator =
- [[NSPersistentStoreCoordinator alloc]
initWithManagedObjectModel:[NSManagedObjectModel wmf_oldDataSchema]];
-
- NSURL *url = [NSURL fileURLWithPath:[self databasePath]];
-
- NSDictionary *options = @{
-
NSMigratePersistentStoresAutomaticallyOption: @YES,
- NSInferMappingModelAutomaticallyOption: @YES
- };
- NSError *error = nil;
- NSPersistentStore *persistentStore = [persistentStoreCoordinator
addPersistentStoreWithType:NSSQLiteStoreType
+- (NSManagedObjectContext*)masterContext {
+ if (!_masterContext) {
+ NSPersistentStoreCoordinator* persistentStoreCoordinator =
+ [[NSPersistentStoreCoordinator alloc]
initWithManagedObjectModel:[NSManagedObjectModel wmf_oldDataSchema]];
+
+ NSURL* url = [NSURL fileURLWithPath:[self databasePath]];
+
+ NSDictionary* options = @{
+ NSMigratePersistentStoresAutomaticallyOption: @YES,
+ NSInferMappingModelAutomaticallyOption: @YES
+ };
+ NSError* error = nil;
+ NSPersistentStore* persistentStore = [persistentStoreCoordinator
addPersistentStoreWithType:NSSQLiteStoreType
configuration:nil
URL:url
options:options
@@ -51,74 +46,64 @@
NSLog(@"Error creating persistent store coordinator: %@",
error.localizedFailureReason);
return nil;
}
-
- _masterContext = [[NSManagedObjectContext alloc]
initWithConcurrencyType:NSPrivateQueueConcurrencyType];
- _masterContext.persistentStoreCoordinator = persistentStoreCoordinator;
+ _masterContext = [[NSManagedObjectContext
alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+ _masterContext.persistentStoreCoordinator = persistentStoreCoordinator;
}
-
+
return _masterContext;
}
-- (NSManagedObjectContext*)mainContext{
-
- if(!_mainContext){
-
- if(!self.masterContext){
+- (NSManagedObjectContext*)mainContext {
+ if (!_mainContext) {
+ if (!self.masterContext) {
return nil;
}
-
+
// Setup main context.
- _mainContext = [[NSManagedObjectContext alloc]
initWithConcurrencyType:NSMainQueueConcurrencyType];
+ _mainContext = [[NSManagedObjectContext alloc]
initWithConcurrencyType:NSMainQueueConcurrencyType];
_mainContext.parentContext = self.masterContext;
-
+
// Ensure object changes saved to mainContext bubble up to
masterContext.
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(propagateMainSavesToMaster)
name:NSManagedObjectContextDidSaveNotification
object:_mainContext];
-
}
-
+
return _mainContext;
}
-- (NSManagedObjectContext*)backgroundContext{
-
+- (NSManagedObjectContext*)backgroundContext {
NSManagedObjectContext* newContext = [[NSManagedObjectContext alloc]
initWithConcurrencyType:NSPrivateQueueConcurrencyType];
newContext.parentContext = self.masterContext;
return newContext;
}
-
-- (NSString *)documentRootPath
-{
- NSArray* documentPaths =
NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+- (NSString*)documentRootPath {
+ NSArray* documentPaths =
NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString* documentRootPath = [documentPaths objectAtIndex:0];
return documentRootPath;
}
-- (void)saveContextAndPropagateChangesToStore:(NSManagedObjectContext*)context
completionBlock:(void(^)(NSError* error))completionBlock{
-
+- (void)saveContextAndPropagateChangesToStore:(NSManagedObjectContext*)context
completionBlock:(void (^)(NSError* error))completionBlock {
[context performBlock:^{
-
__block NSError* errorToSend = nil;
-
+
NSError* error = nil;
- if([context save:&error]){
+ if ([context save:&error]) {
[self.masterContext performBlock:^{
- NSError *masterError = nil;
+ NSError* masterError = nil;
if (![self.masterContext save:&masterError]) {
errorToSend = masterError;
}
}];
- }else{
+ } else {
errorToSend = error;
}
- if(completionBlock){
-
+ if (completionBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
completionBlock(errorToSend);
});
@@ -126,11 +111,9 @@
}];
}
-
-- (void)propagateMainSavesToMaster{
-
+- (void)propagateMainSavesToMaster {
[self.masterContext performBlock:^{
- NSError *masterError = nil;
+ NSError* masterError = nil;
if (![self.masterContext save:&masterError]) {
NSLog(@"Error saving to master context = %@", masterError);
}
diff --git a/OldDataSchema/Data/Model/Article.h
b/OldDataSchema/Data/Model/Article.h
index c1cb37f..8027b83 100644
--- a/OldDataSchema/Data/Model/Article.h
+++ b/OldDataSchema/Data/Model/Article.h
@@ -13,50 +13,50 @@
@interface Article : NSManagedObject
-@property (nonatomic, retain) NSNumber * articleId;
-@property (nonatomic, retain) NSDate * dateCreated;
-@property (nonatomic, retain) NSString * domain;
-@property (nonatomic, retain) NSString * domainName;
-@property (nonatomic, retain) NSNumber * languagecount;
-@property (nonatomic, retain) NSDate * lastmodified;
-@property (nonatomic, retain) NSString * lastmodifiedby;
-@property (nonatomic, retain) NSNumber * lastScrollX;
-@property (nonatomic, retain) NSNumber * lastScrollY;
-@property (nonatomic, retain) NSNumber * needsRefresh;
-@property (nonatomic, retain) NSString * redirected;
-@property (nonatomic, retain) NSString * site;
-@property (nonatomic, retain) NSString * title;
-@property (nonatomic, retain) NSString * protectionStatus;
-@property (nonatomic, retain) NSNumber * editable;
-@property (nonatomic, retain) NSString * displayTitle;
-@property (nonatomic, retain) NSSet *galleryImage;
-@property (nonatomic, retain) NSSet *history;
-@property (nonatomic, retain) NSSet *saved;
-@property (nonatomic, retain) NSSet *section;
-@property (nonatomic, retain) Image *thumbnailImage;
+@property (nonatomic, retain) NSNumber* articleId;
+@property (nonatomic, retain) NSDate* dateCreated;
+@property (nonatomic, retain) NSString* domain;
+@property (nonatomic, retain) NSString* domainName;
+@property (nonatomic, retain) NSNumber* languagecount;
+@property (nonatomic, retain) NSDate* lastmodified;
+@property (nonatomic, retain) NSString* lastmodifiedby;
+@property (nonatomic, retain) NSNumber* lastScrollX;
+@property (nonatomic, retain) NSNumber* lastScrollY;
+@property (nonatomic, retain) NSNumber* needsRefresh;
+@property (nonatomic, retain) NSString* redirected;
+@property (nonatomic, retain) NSString* site;
+@property (nonatomic, retain) NSString* title;
+@property (nonatomic, retain) NSString* protectionStatus;
+@property (nonatomic, retain) NSNumber* editable;
+@property (nonatomic, retain) NSString* displayTitle;
+@property (nonatomic, retain) NSSet* galleryImage;
+@property (nonatomic, retain) NSSet* history;
+@property (nonatomic, retain) NSSet* saved;
+@property (nonatomic, retain) NSSet* section;
+@property (nonatomic, retain) Image* thumbnailImage;
@end
@interface Article (CoreDataGeneratedAccessors)
-- (void)addGalleryImageObject:(GalleryImage *)value;
-- (void)removeGalleryImageObject:(GalleryImage *)value;
-- (void)addGalleryImage:(NSSet *)values;
-- (void)removeGalleryImage:(NSSet *)values;
+- (void)addGalleryImageObject:(GalleryImage*)value;
+- (void)removeGalleryImageObject:(GalleryImage*)value;
+- (void)addGalleryImage:(NSSet*)values;
+- (void)removeGalleryImage:(NSSet*)values;
-- (void)addHistoryObject:(History *)value;
-- (void)removeHistoryObject:(History *)value;
-- (void)addHistory:(NSSet *)values;
-- (void)removeHistory:(NSSet *)values;
+- (void)addHistoryObject:(History*)value;
+- (void)removeHistoryObject:(History*)value;
+- (void)addHistory:(NSSet*)values;
+- (void)removeHistory:(NSSet*)values;
-- (void)addSavedObject:(Saved *)value;
-- (void)removeSavedObject:(Saved *)value;
-- (void)addSaved:(NSSet *)values;
-- (void)removeSaved:(NSSet *)values;
+- (void)addSavedObject:(Saved*)value;
+- (void)removeSavedObject:(Saved*)value;
+- (void)addSaved:(NSSet*)values;
+- (void)removeSaved:(NSSet*)values;
-- (void)addSectionObject:(Section *)value;
-- (void)removeSectionObject:(Section *)value;
-- (void)addSection:(NSSet *)values;
-- (void)removeSection:(NSSet *)values;
+- (void)addSectionObject:(Section*)value;
+- (void)removeSectionObject:(Section*)value;
+- (void)addSection:(NSSet*)values;
+- (void)removeSection:(NSSet*)values;
@end
diff --git a/OldDataSchema/Data/Model/DiscoveryContext.h
b/OldDataSchema/Data/Model/DiscoveryContext.h
index afcb1e5..7fcca94 100644
--- a/OldDataSchema/Data/Model/DiscoveryContext.h
+++ b/OldDataSchema/Data/Model/DiscoveryContext.h
@@ -8,8 +8,8 @@
@interface DiscoveryContext : NSManagedObject
-@property (nonatomic, retain) NSNumber * isPrefix;
-@property (nonatomic, retain) NSString * text;
-@property (nonatomic, retain) History *history;
+@property (nonatomic, retain) NSNumber* isPrefix;
+@property (nonatomic, retain) NSString* text;
+@property (nonatomic, retain) History* history;
@end
diff --git a/OldDataSchema/Data/Model/GalleryImage.h
b/OldDataSchema/Data/Model/GalleryImage.h
index 2956081..287186d 100644
--- a/OldDataSchema/Data/Model/GalleryImage.h
+++ b/OldDataSchema/Data/Model/GalleryImage.h
@@ -8,8 +8,8 @@
@interface GalleryImage : NSManagedObject
-@property (nonatomic, retain) NSNumber * index;
-@property (nonatomic, retain) Article *article;
-@property (nonatomic, retain) Image *image;
+@property (nonatomic, retain) NSNumber* index;
+@property (nonatomic, retain) Article* article;
+@property (nonatomic, retain) Image* image;
@end
diff --git a/OldDataSchema/Data/Model/History.h
b/OldDataSchema/Data/Model/History.h
index 53989d6..663e197 100644
--- a/OldDataSchema/Data/Model/History.h
+++ b/OldDataSchema/Data/Model/History.h
@@ -8,17 +8,17 @@
@interface History : NSManagedObject
-@property (nonatomic, retain) NSDate * dateVisited;
-@property (nonatomic, retain) NSString * discoveryMethod;
-@property (nonatomic, retain) Article *article;
-@property (nonatomic, retain) NSSet *discoveryContext;
+@property (nonatomic, retain) NSDate* dateVisited;
+@property (nonatomic, retain) NSString* discoveryMethod;
+@property (nonatomic, retain) Article* article;
+@property (nonatomic, retain) NSSet* discoveryContext;
@end
@interface History (CoreDataGeneratedAccessors)
-- (void)addDiscoveryContextObject:(DiscoveryContext *)value;
-- (void)removeDiscoveryContextObject:(DiscoveryContext *)value;
-- (void)addDiscoveryContext:(NSSet *)values;
-- (void)removeDiscoveryContext:(NSSet *)values;
+- (void)addDiscoveryContextObject:(DiscoveryContext*)value;
+- (void)removeDiscoveryContextObject:(DiscoveryContext*)value;
+- (void)addDiscoveryContext:(NSSet*)values;
+- (void)removeDiscoveryContext:(NSSet*)values;
@end
diff --git a/OldDataSchema/Data/Model/Image.h b/OldDataSchema/Data/Model/Image.h
index a3b5e5e..e1f0d34 100644
--- a/OldDataSchema/Data/Model/Image.h
+++ b/OldDataSchema/Data/Model/Image.h
@@ -8,45 +8,45 @@
@interface Image : NSManagedObject
-@property (nonatomic, retain) NSString * alt;
-@property (nonatomic, retain) NSNumber * dataSize;
-@property (nonatomic, retain) NSDate * dateLastAccessed;
-@property (nonatomic, retain) NSDate * dateRetrieved;
-@property (nonatomic, retain) NSString * extension;
-@property (nonatomic, retain) NSString * fileName;
-@property (nonatomic, retain) NSString * fileNameNoSizePrefix;
-@property (nonatomic, retain) NSNumber * height;
-@property (nonatomic, retain) NSString * imageDescription;
-@property (nonatomic, retain) NSString * mimeType;
-@property (nonatomic, retain) NSString * sourceUrl;
-@property (nonatomic, retain) NSNumber * width;
-@property (nonatomic, retain) NSSet *article;
-@property (nonatomic, retain) NSSet *galleryImage;
-@property (nonatomic, retain) NSSet *section;
-@property (nonatomic, retain) NSSet *sectionImage;
-@property (nonatomic, retain) ImageData *imageData;
+@property (nonatomic, retain) NSString* alt;
+@property (nonatomic, retain) NSNumber* dataSize;
+@property (nonatomic, retain) NSDate* dateLastAccessed;
+@property (nonatomic, retain) NSDate* dateRetrieved;
+@property (nonatomic, retain) NSString* extension;
+@property (nonatomic, retain) NSString* fileName;
+@property (nonatomic, retain) NSString* fileNameNoSizePrefix;
+@property (nonatomic, retain) NSNumber* height;
+@property (nonatomic, retain) NSString* imageDescription;
+@property (nonatomic, retain) NSString* mimeType;
+@property (nonatomic, retain) NSString* sourceUrl;
+@property (nonatomic, retain) NSNumber* width;
+@property (nonatomic, retain) NSSet* article;
+@property (nonatomic, retain) NSSet* galleryImage;
+@property (nonatomic, retain) NSSet* section;
+@property (nonatomic, retain) NSSet* sectionImage;
+@property (nonatomic, retain) ImageData* imageData;
@end
@interface Image (CoreDataGeneratedAccessors)
-- (void)addArticleObject:(Article *)value;
-- (void)removeArticleObject:(Article *)value;
-- (void)addArticle:(NSSet *)values;
-- (void)removeArticle:(NSSet *)values;
+- (void)addArticleObject:(Article*)value;
+- (void)removeArticleObject:(Article*)value;
+- (void)addArticle:(NSSet*)values;
+- (void)removeArticle:(NSSet*)values;
-- (void)addGalleryImageObject:(GalleryImage *)value;
-- (void)removeGalleryImageObject:(GalleryImage *)value;
-- (void)addGalleryImage:(NSSet *)values;
-- (void)removeGalleryImage:(NSSet *)values;
+- (void)addGalleryImageObject:(GalleryImage*)value;
+- (void)removeGalleryImageObject:(GalleryImage*)value;
+- (void)addGalleryImage:(NSSet*)values;
+- (void)removeGalleryImage:(NSSet*)values;
-- (void)addSectionObject:(Section *)value;
-- (void)removeSectionObject:(Section *)value;
-- (void)addSection:(NSSet *)values;
-- (void)removeSection:(NSSet *)values;
+- (void)addSectionObject:(Section*)value;
+- (void)removeSectionObject:(Section*)value;
+- (void)addSection:(NSSet*)values;
+- (void)removeSection:(NSSet*)values;
-- (void)addSectionImageObject:(SectionImage *)value;
-- (void)removeSectionImageObject:(SectionImage *)value;
-- (void)addSectionImage:(NSSet *)values;
-- (void)removeSectionImage:(NSSet *)values;
+- (void)addSectionImageObject:(SectionImage*)value;
+- (void)removeSectionImageObject:(SectionImage*)value;
+- (void)addSectionImage:(NSSet*)values;
+- (void)removeSectionImage:(NSSet*)values;
@end
diff --git a/OldDataSchema/Data/Model/ImageData.h
b/OldDataSchema/Data/Model/ImageData.h
index 1362540..7390c87 100644
--- a/OldDataSchema/Data/Model/ImageData.h
+++ b/OldDataSchema/Data/Model/ImageData.h
@@ -8,7 +8,7 @@
@interface ImageData : NSManagedObject
-@property (nonatomic, retain) NSData * data;
-@property (nonatomic, retain) Image *imageData;
+@property (nonatomic, retain) NSData* data;
+@property (nonatomic, retain) Image* imageData;
@end
diff --git a/OldDataSchema/Data/Model/Saved.h b/OldDataSchema/Data/Model/Saved.h
index b6a6503..48b21f3 100644
--- a/OldDataSchema/Data/Model/Saved.h
+++ b/OldDataSchema/Data/Model/Saved.h
@@ -8,7 +8,7 @@
@interface Saved : NSManagedObject
-@property (nonatomic, retain) NSDate * dateSaved;
-@property (nonatomic, retain) Article *article;
+@property (nonatomic, retain) NSDate* dateSaved;
+@property (nonatomic, retain) Article* article;
@end
diff --git a/OldDataSchema/Data/Model/Section.h
b/OldDataSchema/Data/Model/Section.h
index 606fb76..761de73 100644
--- a/OldDataSchema/Data/Model/Section.h
+++ b/OldDataSchema/Data/Model/Section.h
@@ -8,26 +8,26 @@
@interface Section : NSManagedObject
-@property (nonatomic, retain) NSString * anchor;
-@property (nonatomic, retain) NSDate * dateRetrieved;
-@property (nonatomic, retain) NSString * html;
-@property (nonatomic, retain) NSString * index;
-@property (nonatomic, retain) NSString * title;
-@property (nonatomic, retain) NSNumber * tocLevel;
-@property (nonatomic, retain) NSString * level;
-@property (nonatomic, retain) NSNumber * sectionId;
-@property (nonatomic, retain) NSString * number;
-@property (nonatomic, retain) NSString * fromTitle;
-@property (nonatomic, retain) Article *article;
-@property (nonatomic, retain) NSSet *sectionImage;
-@property (nonatomic, retain) Image *thumbnailImage;
+@property (nonatomic, retain) NSString* anchor;
+@property (nonatomic, retain) NSDate* dateRetrieved;
+@property (nonatomic, retain) NSString* html;
+@property (nonatomic, retain) NSString* index;
+@property (nonatomic, retain) NSString* title;
+@property (nonatomic, retain) NSNumber* tocLevel;
+@property (nonatomic, retain) NSString* level;
+@property (nonatomic, retain) NSNumber* sectionId;
+@property (nonatomic, retain) NSString* number;
+@property (nonatomic, retain) NSString* fromTitle;
+@property (nonatomic, retain) Article* article;
+@property (nonatomic, retain) NSSet* sectionImage;
+@property (nonatomic, retain) Image* thumbnailImage;
@end
@interface Section (CoreDataGeneratedAccessors)
-- (void)addSectionImageObject:(SectionImage *)value;
-- (void)removeSectionImageObject:(SectionImage *)value;
-- (void)addSectionImage:(NSSet *)values;
-- (void)removeSectionImage:(NSSet *)values;
+- (void)addSectionImageObject:(SectionImage*)value;
+- (void)removeSectionImageObject:(SectionImage*)value;
+- (void)addSectionImage:(NSSet*)values;
+- (void)removeSectionImage:(NSSet*)values;
@end
diff --git a/OldDataSchema/Data/Model/SectionImage.h
b/OldDataSchema/Data/Model/SectionImage.h
index 0f23a06..b62f92d 100644
--- a/OldDataSchema/Data/Model/SectionImage.h
+++ b/OldDataSchema/Data/Model/SectionImage.h
@@ -8,8 +8,8 @@
@interface SectionImage : NSManagedObject
-@property (nonatomic, retain) NSNumber * index;
-@property (nonatomic, retain) Image *image;
-@property (nonatomic, retain) Section *section;
+@property (nonatomic, retain) NSNumber* index;
+@property (nonatomic, retain) Image* image;
+@property (nonatomic, retain) Section* section;
@end
diff --git a/WikipediaUnitTests/BITHockeyManagerWMFExtensionsTests.m
b/WikipediaUnitTests/BITHockeyManagerWMFExtensionsTests.m
index 11b7093..ed3075f 100644
--- a/WikipediaUnitTests/BITHockeyManagerWMFExtensionsTests.m
+++ b/WikipediaUnitTests/BITHockeyManagerWMFExtensionsTests.m
@@ -15,19 +15,14 @@
@implementation BITHockeyManagerWMFExtensionsTests
-- (void)testKnownBundleID{
-
+- (void)testKnownBundleID {
BOOL success = [[BITHockeyManager sharedHockeyManager]
wmf_setAPIKeyForBundleID:@"org.wikimedia.wikipedia.tfalpha"];
assertThat(@(success), is(isTrue()));
}
-
-- (void)testUnknownBundleID{
-
+- (void)testUnknownBundleID {
BOOL success = [[BITHockeyManager sharedHockeyManager]
wmf_setAPIKeyForBundleID:@"org.wikimedia.wikipedia.garbage"];
assertThat(@(success), is(isFalse()));
}
-
-
@end
\ No newline at end of file
diff --git a/WikipediaUnitTests/CircularBitwiseRotationTests.m
b/WikipediaUnitTests/CircularBitwiseRotationTests.m
index f7f2e92..0f9fcdd 100644
--- a/WikipediaUnitTests/CircularBitwiseRotationTests.m
+++ b/WikipediaUnitTests/CircularBitwiseRotationTests.m
@@ -17,10 +17,9 @@
@implementation CircularBitwiseRotationTests
-- (void)testExamples
-{
+- (void)testExamples {
NSUInteger testValue = 0b00000001;
- NSUInteger len = sizeof(testValue) * CHAR_BIT;
+ NSUInteger len = sizeof(testValue) * CHAR_BIT;
XCTAssertEqual(CircularBitwiseRotation(testValue, 0), 0b001);
XCTAssertEqual(CircularBitwiseRotation(testValue, 1), 0b00000010);
XCTAssertEqual(CircularBitwiseRotation(testValue, 2), 0b00000100);
diff --git a/WikipediaUnitTests/MWKArticle_ShareSnippetTests.m
b/WikipediaUnitTests/MWKArticle_ShareSnippetTests.m
index 59635da..7c80200 100644
--- a/WikipediaUnitTests/MWKArticle_ShareSnippetTests.m
+++ b/WikipediaUnitTests/MWKArticle_ShareSnippetTests.m
@@ -25,7 +25,7 @@
- (void)setUp {
[super setUp];
NSDictionary* obamaMobileViewJSON = [[self wmf_bundle]
wmf_jsonFromContentsOfFile:@"Obama"];
- MWKTitle* dummyTitle =
+ MWKTitle* dummyTitle =
[MWKTitle titleWithString:@"foo" site:[MWKSite
siteWithDomain:@"wikipedia.org" language:@"en"]];
self.article = [[MWKArticle alloc] initWithTitle:dummyTitle dataStore:nil
dict:obamaMobileViewJSON[@"mobileview"]];
}
diff --git a/WikipediaUnitTests/NSArray+BKIndexTests.m
b/WikipediaUnitTests/NSArray+BKIndexTests.m
index 54da71b..ab953dd 100644
--- a/WikipediaUnitTests/NSArray+BKIndexTests.m
+++ b/WikipediaUnitTests/NSArray+BKIndexTests.m
@@ -19,18 +19,16 @@
@implementation NSArray_BKIndexTests
-- (void)testEmpty
-{
- assertThat([@[] bk_indexWithKeypath:WMF_SAFE_KEYPATH([NSString new],
lowercaseString)], isEmpty());
+- (void)testEmpty {
+ assertThat([@[] bk_indexWithKeypath: WMF_SAFE_KEYPATH([NSString new],
lowercaseString)], isEmpty());
}
-- (void)testExamples
-{
- assertThat(([@[@"foo", @"Foo", @"bar"]
bk_indexWithKeypath:WMF_SAFE_KEYPATH([NSString new], lowercaseString)]),
+- (void)testExamples {
+ assertThat(([@[@"foo", @"Foo", @"bar"] bk_indexWithKeypath:
WMF_SAFE_KEYPATH([NSString new], lowercaseString)]),
hasEntries(
- @"foo", @"Foo",
- @"bar", @"bar", nil
- ));
+ @"foo", @"Foo",
+ @"bar", @"bar", nil
+ ));
}
@end
diff --git a/WikipediaUnitTests/NSArray+PredicateTests.m
b/WikipediaUnitTests/NSArray+PredicateTests.m
index f6851bb..9da827a 100644
--- a/WikipediaUnitTests/NSArray+PredicateTests.m
+++ b/WikipediaUnitTests/NSArray+PredicateTests.m
@@ -20,39 +20,34 @@
@implementation NSArray_PredicateTests
-- (void)testEmptyArray
-{
+- (void)testEmptyArray {
assertThat([@[] firstMatchForPredicate:[NSPredicate
predicateWithValue:YES]], is(nilValue()));
assertThat([@[] firstMatchForPredicate:[NSPredicate
predicateWithValue:NO]], is(nilValue()));
}
-- (void)testFindsCorrectObject
-{
- NSArray *testArray = @[@"foo", @"bar", @"baz"];
+- (void)testFindsCorrectObject {
+ NSArray* testArray = @[@"foo", @"bar", @"baz"];
for (id element in testArray) {
- NSPredicate *isElement = [NSPredicate predicateWithBlock:^BOOL(id obj,
NSDictionary *bindings) {
+ NSPredicate* isElement = [NSPredicate predicateWithBlock:^BOOL (id
obj, NSDictionary* bindings) {
return [obj isEqual:element];
}];
assertThat([testArray firstMatchForPredicate:isElement], is(element));
}
}
-
-- (void)testFalsePredicate
-{
+- (void)testFalsePredicate {
assertThat(([@[@1, @2, @3] firstMatchForPredicate:[NSPredicate
predicateWithValue:NO]]), is(nilValue()));
}
-- (void)testPerformance
-{
+- (void)testPerformance {
static const NSUInteger N = 1e5;
- NSNumber *worstCase = @(N-1);
- NSMutableArray *testArray = [NSMutableArray arrayWithCapacity:N];
+ NSNumber* worstCase = @(N - 1);
+ NSMutableArray* testArray = [NSMutableArray arrayWithCapacity:N];
for (NSUInteger i = 0; i < N; i++) {
[testArray addObject:@(i)];
}
[self measureBlock:^{
- [testArray firstMatchForPredicate:[NSPredicate
predicateWithBlock:^BOOL(NSNumber *x, NSDictionary *bindings) {
+ [testArray firstMatchForPredicate:[NSPredicate
predicateWithBlock:^BOOL (NSNumber* x, NSDictionary* bindings) {
return [x isEqualToNumber:worstCase];
}]];
}];
diff --git a/WikipediaUnitTests/NSIndexSet+BKReduceTests.m
b/WikipediaUnitTests/NSIndexSet+BKReduceTests.m
index 27944ce..3a56fcf 100644
--- a/WikipediaUnitTests/NSIndexSet+BKReduceTests.m
+++ b/WikipediaUnitTests/NSIndexSet+BKReduceTests.m
@@ -21,14 +21,14 @@
- (void)testReduce {
NSIndexSet* indexes = [NSMutableIndexSet
indexSetWithIndexesInRange:NSMakeRange(0, 10)];
- assertThat([indexes bk_reduce:[NSMutableArray new]
withBlock:^id(NSMutableArray* acc, NSUInteger idx) {
+ assertThat([indexes bk_reduce:[NSMutableArray new] withBlock:^id
(NSMutableArray* acc, NSUInteger idx) {
[acc addObject:@(idx)];
return acc;
}], is(@[@0, @1, @2, @3, @4, @5, @6, @7, @8, @9]));
}
- (void)testBadInput {
- assertThat([[NSIndexSet indexSet] bk_reduce:nil withBlock:^id(id _,
NSUInteger __) { return nil; }],
+ assertThat([[NSIndexSet indexSet] bk_reduce:nil withBlock:^id (id _,
NSUInteger __) { return nil; }],
is(nilValue()));
id input = [NSMutableArray new];
diff --git a/WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
b/WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
index ab05154..8ed28bc 100644
--- a/WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
+++ b/WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
@@ -20,18 +20,16 @@
@implementation NSMutableDictionary_WMFMaybeSetTests
-- (void)testNotNil
-{
- NSMutableDictionary *testDict = [NSMutableDictionary new];
+- (void)testNotNil {
+ NSMutableDictionary* testDict = [NSMutableDictionary new];
assertThat(@([testDict wmf_maybeSetObject:@"foo" forKey:@"bar"]),
is(@YES));
assertThat(testDict, is(equalTo(@{@"bar": @"foo"})));
assertThat(@([testDict wmf_maybeSetObject:@"biz" forKey:@"bar"]),
is(@YES));
assertThat(testDict, is(equalTo(@{@"bar": @"biz"})));
}
-- (void)testNil
-{
- NSMutableDictionary *testDict = [NSMutableDictionary new];
+- (void)testNil {
+ NSMutableDictionary* testDict = [NSMutableDictionary new];
assertThat(@([testDict wmf_maybeSetObject:nil forKey:@"bar"]), is(@NO));
assertThat(testDict, isEmpty());
}
diff --git a/WikipediaUnitTests/NSString+FormattedAttributedStringTests.m
b/WikipediaUnitTests/NSString+FormattedAttributedStringTests.m
index a9752b3..8d39c48 100644
--- a/WikipediaUnitTests/NSString+FormattedAttributedStringTests.m
+++ b/WikipediaUnitTests/NSString+FormattedAttributedStringTests.m
@@ -45,7 +45,6 @@
}
- (void)testComplexAttributedStringCreation {
-
// First create complex attributed string (complexAttributedString1) using
our substitution method:
// (Note the multiple occurences of "$1".)
NSAttributedString* complexAttributedString1 =
@@ -67,7 +66,6 @@
// Test equality.
XCTAssert([complexAttributedString1
isEqualToAttributedString:complexAttributedString2]);
-
}
- (void)testPerformanceExample {
@@ -76,15 +74,13 @@
// Put the code you want to measure the time of here.
for (NSInteger i = 0; i < 10000; i++) {
-
NSAttributedString* complexAttributedString1 =
- [@"Large orange text and some $1 and $2 text. More $1 text."
+ [@"Large orange text and some $1 and $2 text. More $1 text."
attributedStringWithAttributes:self.largeOrangeText
- substitutionStrings:@[@"small green", @"medium blue"]
- substitutionAttributes:@[self.smallGreenText,
self.mediumBlueText]
- ];
+ substitutionStrings:@[@"small green", @"medium
blue"]
+ substitutionAttributes:@[self.smallGreenText,
self.mediumBlueText]
+ ];
}
-
}];
}
diff --git a/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
b/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
index d411c69..16cd7b8 100644
--- a/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
+++ b/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
@@ -27,65 +27,64 @@
}
- (void)testConsecutiveNewlinesCollapsing {
- NSString *string = @"\n\nHola\n\n";
+ NSString* string = @"\n\nHola\n\n";
XCTAssertEqualObjects([string wmf_stringByCollapsingConsecutiveNewlines],
@"\nHola\n");
}
- (void)testNestedParenthesesRemoval {
- NSString *string = @"He(a(b(c(d)e)f)g)llo";
- XCTAssertEqualObjects([string
wmf_stringByRecursivelyRemovingParenthesizedContent],
- @"Hello");
+ NSString* string = @"He(a(b(c(d)e)f)g)llo";
+ XCTAssertEqualObjects([string
wmf_stringByRecursivelyRemovingParenthesizedContent],
+ @"Hello");
}
- (void)testBracketedContentRemoval {
- NSString *string = @"J[aeio]ump";
+ NSString* string = @"J[aeio]ump";
XCTAssertEqualObjects([string wmf_stringByRemovingBracketedContent],
@"Jump");
}
-- (void)testRemovalOfSpaceBeforeCommaAndSemicolon
-{
- NSString *string = @"fish , squids ; eagles , crows";
+- (void)testRemovalOfSpaceBeforeCommaAndSemicolon {
+ NSString* string = @"fish , squids ; eagles , crows";
XCTAssertEqualObjects([string
wmf_stringByRemovingWhiteSpaceBeforeCommasAndSemicolons],
@"fish, squids; eagles, crows");
}
- (void)testRemovalOfSpaceBeforePeriod {
- NSString *string = @"Yes . No 。 Maybe ． So ｡";
+ NSString* string = @"Yes . No 。 Maybe ． So ｡";
XCTAssertEqualObjects([string wmf_stringByRemovingWhiteSpaceBeforePeriod],
@"Yes. No。 Maybe． So｡");
}
- (void)testConsecutiveSpacesCollapsing {
- NSString *string = @" Metal ";
+ NSString* string = @" Metal ";
XCTAssertEqualObjects([string wmf_stringByCollapsingConsecutiveSpaces],
@" Metal ");
}
- (void)testRemovalOfLeadingOrTrailingSpacesNewlinesOrColons {
- NSString *string = @"\n Syncopation:\n:";
+ NSString* string = @"\n Syncopation:\n:";
XCTAssertEqualObjects([string
wmf_stringByRemovingLeadingOrTrailingSpacesNewlinesOrColons],
@"Syncopation");
}
- (void)testPunctuationAwareWhitespaceCollapsingCommasSemicolonsAndPeriods {
- NSString *string = @"trim space before commas , semicolons ; and periods
.";
+ NSString* string = @"trim space before commas , semicolons ; and periods
.";
XCTAssertEqualObjects([string
wmf_getCollapsedWhitespaceStringAdjustedForTerminalPunctuation], @"trim space
before commas, semicolons; and periods.");
}
- (void)testPunctuationAwareWhitespaceCollapsingLeadingAndTrailingWhitespace {
- NSString *string = @" \t trim leading and trailing whitespace ok? \n \t";
+ NSString* string = @" \t trim leading and trailing whitespace ok? \n \t";
XCTAssertEqualObjects([string
wmf_getCollapsedWhitespaceStringAdjustedForTerminalPunctuation], @"trim leading
and trailing whitespace ok?");
}
-
(void)testPunctuationAwareWhitespaceCollapsingReduceWhitespaceAroundParenthesisOrBrackets
{
- NSString *string = @"collapse but do not ( no! ) completely remove
space around parenthesis or brackets [ \t brackets!\t]";
+ NSString* string = @"collapse but do not ( no! ) completely remove
space around parenthesis or brackets [ \t brackets!\t]";
XCTAssertEqualObjects([string
wmf_getCollapsedWhitespaceStringAdjustedForTerminalPunctuation], @"collapse but
do not ( no! ) completely remove space around parenthesis or brackets [
brackets! ]");
}
- (void)testAllWhitepacesCollapsing {
- NSString *string = @" \t \n This should \t\t not have \t\n so much
space! \n\n\t";
+ NSString* string = @" \t \n This should \t\t not have \t\n so much
space! \n\n\t";
XCTAssertEqualObjects([string
wmf_stringByCollapsingAllWhitespaceToSingleSpaces],
@" This should not have so much space! ");
}
diff --git a/WikipediaUnitTests/OldDataSchemaMigratorTests.m
b/WikipediaUnitTests/OldDataSchemaMigratorTests.m
index 7439be1..f34d1d7 100644
--- a/WikipediaUnitTests/OldDataSchemaMigratorTests.m
+++ b/WikipediaUnitTests/OldDataSchemaMigratorTests.m
@@ -45,7 +45,6 @@
// objects must be inserted into a MOC in order for (inverse)
relationships to be maintained automatically
// self.tmpContext = [NSManagedObjectContext
wmf_tempContextInBundle:[NSBundle bundleForClass:[self class]]];
self.tmpContext = [NSManagedObjectContext wmf_tempContext];
-
}
- (void)tearDown {
@@ -84,7 +83,7 @@
- (void)testArticleWithInvalidSectionIsGracefullySkipped {
Article* oldArticle = [self createOldArticleWithSections:10
imagesPerSection:5];
- Section* section = oldArticle.sectionsBySectionId.lastObject;
+ Section* section = oldArticle.sectionsBySectionId.lastObject;
// sectionId is a required field
section.sectionId = nil;
[self verifySkippedMigrationOfArticle:oldArticle];
@@ -92,7 +91,7 @@
- (void)testArticleWithInvalidSectionImageIsGracefullySkipped {
Article* oldArticle = [self createOldArticleWithSections:10
imagesPerSection:5];
- Section* section = oldArticle.sectionsBySectionId.lastObject;
+ Section* section = oldArticle.sectionsBySectionId.lastObject;
SectionImage* image = section.sectionImagesByIndex.lastObject;
// sourceUrl is a required field
image.image.sourceUrl = nil;
@@ -100,25 +99,25 @@
}
//- (void)testBackingUpStore{
-//
+//
// NSString* path = [self databasePathForContext:self.tmpContext];
-//
+//
// OldDataSchemaMigrator* oldDataSchema = [[OldDataSchemaMigrator alloc]
initWithDatabasePath:path];
-//
+//
// XCTAssertTrue([oldDataSchema moveOldDataToBackupLocation],
// @"Backup was not moved!");
-//
+//
//}
//
//
//- (void)testRemovingBackupStore{
-//
+//
// NSString* path = [self databasePathForContext:self.tmpContext];
-//
+//
// OldDataSchemaMigrator* oldDataSchema = [[OldDataSchemaMigrator alloc]
initWithDatabasePath:path];
-//
+//
// [oldDataSchema moveOldDataToBackupLocation];
-//
+//
// XCTAssertTrue([oldDataSchema removebackupDataImmediately],
// @"Store was not removed!");
//
@@ -126,8 +125,7 @@
#pragma mark - Test Utils
-- (NSString*)databasePathForContext:(NSManagedObjectContext*)context{
-
+- (NSString*)databasePathForContext:(NSManagedObjectContext*)context {
return [[[[[context persistentStoreCoordinator] persistentStores]
firstObject] URL] absoluteString];
}
@@ -135,7 +133,7 @@
XCTAssertNoThrow([self.migrator migrateArticle:oldArticle],
@"Failed to catch an article migration exception.");
MWKTitle* migratedArticleTitle = [self.migrator
migrateArticleTitle:oldArticle];
- NSString* articleDataPath = [self.dataStore
pathForTitle:migratedArticleTitle];
+ NSString* articleDataPath = [self.dataStore
pathForTitle:migratedArticleTitle];
XCTAssertFalse([[NSFileManager defaultManager]
fileExistsAtPath:articleDataPath],
@"Expected article to not be saved due to exception during
migration.");
}
@@ -234,7 +232,7 @@
}
- (void)verifyArticleSectionAndLeadImages:(MWKArticle*)migratedArticle
correspondsToOldArticle:(Article*)oldArticle {
- NSArray* oldArticleImages = [oldArticle allImages];
+ NSArray* oldArticleImages = [oldArticle allImages];
NSUInteger const thumbnailModifier = oldArticle.thumbnailImage ? 1 : 0;
assertThat(@(migratedArticle.images.count),
is(equalToInt(oldArticleImages.count + thumbnailModifier)));
for (NSUInteger i = thumbnailModifier; i < oldArticleImages.count; i++) {
diff --git
a/WikipediaUnitTests/Utilities/HCIsCollectionContainingInAnyOrder+WMFCollectionMatcherUtils.m
b/WikipediaUnitTests/Utilities/HCIsCollectionContainingInAnyOrder+WMFCollectionMatcherUtils.m
index de65c9f..8499e3b 100644
---
a/WikipediaUnitTests/Utilities/HCIsCollectionContainingInAnyOrder+WMFCollectionMatcherUtils.m
+++
b/WikipediaUnitTests/Utilities/HCIsCollectionContainingInAnyOrder+WMFCollectionMatcherUtils.m
@@ -16,8 +16,8 @@
@implementation HCIsCollectionContainingInAnyOrder (WMFCollectionMatcherUtils)
-+ (instancetype)wmf_isCollectionContainingItemsInAnyOrder:(NSArray
*)itemsOrMatchers {
- return [self isCollectionContainingInAnyOrder:[itemsOrMatchers
bk_map:^id(id obj) {
++
(instancetype)wmf_isCollectionContainingItemsInAnyOrder:(NSArray*)itemsOrMatchers
{
+ return [self isCollectionContainingInAnyOrder:[itemsOrMatchers bk_map:^id
(id obj) {
return [obj conformsToProtocol:@protocol(HCMatcher)] ? obj :
HC_equalTo(obj);
}]];
}
diff --git a/WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
b/WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
index 2ef5dce..8dbdf76 100644
--- a/WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
+++ b/WikipediaUnitTests/Utilities/NSBundle+TestAssets.m
@@ -10,7 +10,7 @@
@implementation NSBundle (TestAssets)
-- (NSData*)wmf_dataFromContentsOfFile:(NSString *)filename ofType:(NSString
*)type {
+- (NSData*)wmf_dataFromContentsOfFile:(NSString*)filename
ofType:(NSString*)type {
NSError* error;
NSData* data = [NSData dataWithContentsOfFile:[self
pathForResource:filename ofType:type]
options:0
@@ -20,7 +20,6 @@
}
- (id)wmf_jsonFromContentsOfFile:(NSString*)filename {
-
NSError* error;
id json = [NSJSONSerialization JSONObjectWithData:[self
wmf_dataFromContentsOfFile:filename ofType:@"json"]
diff --git
a/WikipediaUnitTests/Utilities/NSPersistentStoreCoordinator+WMFTempCoordinator.m
b/WikipediaUnitTests/Utilities/NSPersistentStoreCoordinator+WMFTempCoordinator.m
index ad05221..10cebee 100644
---
a/WikipediaUnitTests/Utilities/NSPersistentStoreCoordinator+WMFTempCoordinator.m
+++
b/WikipediaUnitTests/Utilities/NSPersistentStoreCoordinator+WMFTempCoordinator.m
@@ -13,10 +13,10 @@
@implementation NSPersistentStoreCoordinator (WMFTempCoordinator)
+ (NSPersistentStoreCoordinator*)wmf_tempCoordinator {
- NSPersistentStoreCoordinator *persistentStoreCoordinator =
- [[NSPersistentStoreCoordinator alloc]
initWithManagedObjectModel:[NSManagedObjectModel wmf_oldDataSchema]];
+ NSPersistentStoreCoordinator* persistentStoreCoordinator =
+ [[NSPersistentStoreCoordinator alloc]
initWithManagedObjectModel:[NSManagedObjectModel wmf_oldDataSchema]];
- NSError *error = nil;
+ NSError* error = nil;
NSPersistentStore* persistentStore =
[persistentStoreCoordinator
addPersistentStoreWithType:NSSQLiteStoreType
diff --git a/WikipediaUnitTests/WMFDateFormatterTests.m
b/WikipediaUnitTests/WMFDateFormatterTests.m
index bfbb7da..4798a4d 100644
--- a/WikipediaUnitTests/WMFDateFormatterTests.m
+++ b/WikipediaUnitTests/WMFDateFormatterTests.m
@@ -20,14 +20,14 @@
@implementation WMFDateFormatterTests
- (void)testIso8601Example {
- NSString* testTimestamp = @"2015-02-10T10:31:27Z";
- NSDate* decodedDate = [[NSDateFormatter wmf_iso8601Formatter]
dateFromString:testTimestamp];
+ NSString* testTimestamp = @"2015-02-10T10:31:27Z";
+ NSDate* decodedDate = [[NSDateFormatter wmf_iso8601Formatter]
dateFromString:testTimestamp];
assertThat(decodedDate, is(notNilValue()));
assertThat([[NSDateFormatter wmf_iso8601Formatter]
stringFromDate:decodedDate], is(equalTo(testTimestamp)));
}
- (void)testShortTimeFormatterIsValidForAllLocales {
- NSString* testTimestamp = @"2015-02-10T10:31:27Z";
+ NSString* testTimestamp = @"2015-02-10T10:31:27Z";
NSArray* availableLocaleIDs = [NSLocale availableLocaleIdentifiers];
dispatch_apply(availableLocaleIDs.count,
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^(size_t i) {
@@ -50,14 +50,14 @@
- (void)testShortTimeFormatterExamples {
NSString* testTimestamp = @"2015-02-10T14:31:27Z";
- NSDate* decodedDate = [[NSDateFormatter wmf_iso8601Formatter]
dateFromString:testTimestamp];
+ NSDate* decodedDate = [[NSDateFormatter wmf_iso8601Formatter]
dateFromString:testTimestamp];
NSParameterAssert(decodedDate);
NSDateFormatter* usFormatter =
[NSDateFormatter wmf_shortTimeFormatterWithLocale:[NSLocale
localeWithLocaleIdentifier:@"en_US"]];
NSDateFormatter* gbFormatter =
- [NSDateFormatter wmf_shortTimeFormatterWithLocale:[NSLocale
localeWithLocaleIdentifier:@"en_GB"]];
+ [NSDateFormatter wmf_shortTimeFormatterWithLocale:[NSLocale
localeWithLocaleIdentifier:@"en_GB"]];
assertThat([usFormatter stringFromDate:decodedDate], is(equalTo(@"2:31
PM")));
diff --git a/WikipediaUnitTests/WMFErrorForApiErrorObjectTests.m
b/WikipediaUnitTests/WMFErrorForApiErrorObjectTests.m
index b46f2a4..5f81abb 100644
--- a/WikipediaUnitTests/WMFErrorForApiErrorObjectTests.m
+++ b/WikipediaUnitTests/WMFErrorForApiErrorObjectTests.m
@@ -20,9 +20,8 @@
@implementation WMFErrorForApiErrorObjectTests
-- (void)testExample
-{
- NSDictionary *apiErrorObj = @{
+- (void)testExample {
+ NSDictionary* apiErrorObj = @{
@"code": @"badcontinue",
@"info": @"Invalid continue param. You should pass the original value
returned by the previous query",
@"*": @"See https://en.wikipedia.org/w/api.php for API usage"
@@ -36,16 +35,14 @@
nil));
}
-- (void)testMissingFields
-{
+- (void)testMissingFields {
assertThat(WMFErrorForApiErrorObject(@{}),
allOf(hasProperty(@"domain", WMFNetworkingErrorDomain),
hasProperty(@"userInfo", isEmpty()),
nil));
}
-- (void)testNil
-{
+- (void)testNil {
assertThat(WMFErrorForApiErrorObject(nil), is(nilValue()));
}
diff --git a/WikipediaUnitTests/WMFImageInfoControllerTests.m
b/WikipediaUnitTests/WMFImageInfoControllerTests.m
index df8ad6f..f7821f7 100644
--- a/WikipediaUnitTests/WMFImageInfoControllerTests.m
+++ b/WikipediaUnitTests/WMFImageInfoControllerTests.m
@@ -45,7 +45,7 @@
self.mockInfoFetcher = mock([MWKImageInfoFetcher class]);
self.tmpDataStore = [MWKDataStore temporaryDataStore];
- self.mockDelegate =
mockProtocol(@protocol(WMFImageInfoControllerDelegate));
+ self.mockDelegate =
mockProtocol(@protocol(WMFImageInfoControllerDelegate));
MWKTitle* testTitle = [MWKTitle titleWithString:@"foo"
site:[MWKSite
siteWithDomain:@"wikipedia.org" language:@"en"]];
@@ -76,8 +76,8 @@
NSArray* testImages = [[self generateSourceURLs:5]
bk_map:^MWKImage*(NSString* sourceURL) {
return [[MWKImage alloc] initWithArticle:mockArticle
sourceURL:sourceURL];
}];
- NSRange preFetchedRange = NSMakeRange(0, 2);
- NSArray* expectedImageInfo = [[MWKImageInfo mappedFromImages:testImages]
subarrayWithRange:preFetchedRange];
+ NSRange preFetchedRange = NSMakeRange(0, 2);
+ NSArray* expectedImageInfo = [[MWKImageInfo mappedFromImages:testImages]
subarrayWithRange:preFetchedRange];
[given([mockArticle dataStore]) willReturn:mockDataStore];
[given([mockArticle images]) willReturn:mockImageList];
@@ -102,12 +102,11 @@
}
}
-
- (void)testFetchBatchRanges {
NSMutableIndexSet* indexesToFetch = [NSMutableIndexSet
indexSetWithIndex:0];
[indexesToFetch addIndex:self.controller.uniqueArticleImages.count - 1];
[self.controller fetchBatchesContainingIndexes:indexesToFetch];
- [indexesToFetch enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
+ [indexesToFetch enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL* stop) {
NSRange expectedRange = [self.controller batchRangeForTargetIndex:idx];
assertThat(@(WMFRangeIsNotFoundOrEmpty(expectedRange)), isFalse());
NSArray* expectedTitles = [self expectedTitlesForRange:expectedRange];
@@ -125,16 +124,16 @@
- (void)testFetchBatchAlongWithNeighborReturnsOneRequestForEachFetch {
[given([self.mockInfoFetcher
- fetchInfoForPageTitles:[self
expectedTitlesForRange:[self.controller batchRangeForTargetIndex:0]]
- fromSite:anything()
- success:anything()
- failure:anything()]) willReturn:@"dummy request"];
+ fetchInfoForPageTitles:[self
expectedTitlesForRange:[self.controller batchRangeForTargetIndex:0]]
+ fromSite:anything()
+ success:anything()
+ failure:anything()]) willReturn:@"dummy request"];
[given([self.mockInfoFetcher
fetchInfoForPageTitles:[self
expectedTitlesForRange:[self.controller
batchRangeForTargetIndex:self.controller.infoBatchSize]]
- fromSite:anything()
- success:anything()
- failure:anything()]) willReturn:@"dummy request 2"];
+ fromSite:anything()
+ success:anything()
+ failure:anything()]) willReturn:@"dummy request 2"];
NSArray* requests = [self.controller fetchBatchContainingIndex:0
withNthNeighbor:self.controller.infoBatchSize];
assertThat(requests, is(@[@"dummy request", @"dummy request 2"]));
@@ -202,7 +201,7 @@
#pragma mark - Verifications & Expectations
- (void)verifyInfoFetcherCallForIndexes:(NSIndexSet*)indexes {
- [indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
+ [indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL* stop) {
NSRange expectedRange = [self.controller batchRangeForTargetIndex:idx];
assertThat(@(WMFRangeIsNotFoundOrEmpty(expectedRange)), isFalse());
[self verifyInfoFetcherCallForRange:expectedRange withSuccess:nil
failure:nil];
@@ -215,8 +214,8 @@
NSArray* expectedTitles = [self expectedTitlesForRange:range];
[MKTVerifyCount(self.mockInfoFetcher, times(1))
fetchInfoForPageTitles:expectedTitles
fromSite:self.testArticle.site
-
success:success ?: anything()
-
failure:failure ?: anything()];
+
success:success ? : anything()
+
failure:failure ? : anything()];
}
- (NSArray*)expectedTitlesForRange:(NSRange)range {
@@ -224,7 +223,7 @@
}
- (void)verifySuccessfulFetchesForRanges:(NSArray*)ranges {
- NSUInteger numImages = [ranges count] * self.controller.infoBatchSize;
+ NSUInteger numImages = [ranges count] *
self.controller.infoBatchSize;
NSMutableArray* accumulatedFetchedImageInfos = [NSMutableArray
arrayWithCapacity:numImages];
void (^ verifyDataStoreAndControllerData)() = ^{
@@ -274,7 +273,7 @@
#pragma mark - Delegate Call Forwarding
-- (void)imageInfoController:(WMFImageInfoController *)controller
failedToFetchBatch:(NSRange)range error:(NSError *)error {
+- (void)imageInfoController:(WMFImageInfoController*)controller
failedToFetchBatch:(NSRange)range error:(NSError*)error {
[self popExpectationAfter:^{
[self.mockDelegate imageInfoController:controller
failedToFetchBatch:range error:error];
}];
@@ -305,7 +304,7 @@
#pragma mark - Data Generation
- (NSArray*)createAllExpectedBatches {
- NSUInteger numBatches = self.controller.uniqueArticleImages.count /
self.controller.infoBatchSize;
+ NSUInteger numBatches = self.controller.uniqueArticleImages.count /
self.controller.infoBatchSize;
NSMutableArray* ranges = [NSMutableArray arrayWithCapacity:numBatches];
for (int i = 0; i < numBatches; i++) {
[ranges addObject:WMFBoxedRangeMake(i * self.controller.infoBatchSize,
self.controller.infoBatchSize)];
diff --git a/WikipediaUnitTests/WMFJoinedPropertyParametersTests.m
b/WikipediaUnitTests/WMFJoinedPropertyParametersTests.m
index 3e58f79..61ae87d 100644
--- a/WikipediaUnitTests/WMFJoinedPropertyParametersTests.m
+++ b/WikipediaUnitTests/WMFJoinedPropertyParametersTests.m
@@ -19,23 +19,19 @@
@implementation WMFJoinedPropertyParametersTests
-- (void)testNonEmptyArray
-{
+- (void)testNonEmptyArray {
assertThat(WMFJoinedPropertyParameters(@[@"foo", @"bar", @"baz"]),
is(@"foo|bar|baz"));
}
-- (void)testUnaryArray
-{
+- (void)testUnaryArray {
assertThat(WMFJoinedPropertyParameters(@[@"foo"]), is(@"foo"));
}
-- (void)testEmptyArray
-{
+- (void)testEmptyArray {
assertThat(WMFJoinedPropertyParameters(@[]), is(@""));
}
-- (void)testNil
-{
+- (void)testNil {
assertThat(WMFJoinedPropertyParameters(nil), is(@""));
}
diff --git a/scripts/uncrustify_all.sh b/scripts/uncrustify_all.sh
index b2ae753..0edab52 100755
--- a/scripts/uncrustify_all.sh
+++ b/scripts/uncrustify_all.sh
@@ -7,7 +7,7 @@
UNCRUSTIFY_CONFIG="$PROJECT_DIR/uncrustify.cfg"
UNCRUSTIFY_FILELIST="$PROJECT_DIR/to_uncrustify.txt"
UNCRUSTIFY_DEBUGLOG="$PROJECT_DIR/uncrustify_debug.log"
-UNCRUSTIFY_SRCDIR="$PROJECT_DIR/Wikipedia $PROJECT_DIR/MediaWikiKit"
+UNCRUSTIFY_SRCDIR="$PROJECT_DIR/Wikipedia $PROJECT_DIR/MediaWikiKit
$PROJECT_DIR/OldDataSchema $PROJECT_DIR/WikipediaUnitTests"
if ! ls $WORKSPACE_FN > /dev/null; then
echo "You must be in the root project directory to run this."
--
To view, visit https://gerrit.wikimedia.org/r/209554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If434950389a7e827a7cee2186df50be132a6a257
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle <bgers...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
