[MediaWiki-commits] [Gerrit] refactor MWKTestCase and fix linting errors - change (apps...wikipedia)

2015-04-22 Thread Mhurd (Code Review) 
Mhurd has submitted this change and it was merged.

Change subject: refactor MWKTestCase and fix linting errors
..


refactor MWKTestCase and fix linting errors

Change-Id: Ia1040459bb3051ac875af46d3a71e4d9af216cb7
---
M MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m
M MediaWikiKit/MediaWikiKitTests/MWKTestCase.m
M Wikipedia.xcodeproj/project.pbxproj
M Wikipedia/mw-bridge/CommunicationBridge.m
A WikipediaUnitTests/Utilities/WMFTestFixtureUtilities.h
M WikipediaUnitTests/WMFArticleImageInjectionTests.m
6 files changed, 20 insertions(+), 19 deletions(-)

Approvals:
  Mhurd: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m 
b/MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m
index f3c10ee..08c61a2 100644
--- a/MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m
+++ b/MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m
@@ -7,6 +7,7 @@
 //
 
 #import "MWKArticleStoreTestCase.h"
+#import "MWKDataStore+TemporaryDataStore.h"
 
 @implementation MWKArticleStoreTestCase
 
@@ -19,17 +20,13 @@
 self.json1= [self loadJSON:@"section1-end"];
 self.jsonAnon = [self loadJSON:@"organization-anon"];
 
-NSString* documentsFolder = 
[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, 
YES) firstObject];
-self.basePath = [documentsFolder 
stringByAppendingPathComponent:@"unit-test-data"];
-
-self.dataStore = [[MWKDataStore alloc] initWithBasePath:self.basePath];
+self.dataStore = [MWKDataStore temporaryDataStore];
 self.article   = [self.dataStore articleWithTitle:self.title];
 }
 
 - (void)tearDown {
+[self.dataStore removeFolderAtBasePath];
 [super tearDown];
-
-[[NSFileManager defaultManager] removeItemAtPath:self.basePath error:nil];
 }
 
 @end
diff --git a/MediaWikiKit/MediaWikiKitTests/MWKTestCase.m 
b/MediaWikiKit/MediaWikiKitTests/MWKTestCase.m
index 1c23c1d..7620200 100644
--- a/MediaWikiKit/MediaWikiKitTests/MWKTestCase.m
+++ b/MediaWikiKit/MediaWikiKitTests/MWKTestCase.m
@@ -7,21 +7,16 @@
 //
 
 #import "MWKTestCase.h"
+#import "WMFTestFixtureUtilities.h"
 
 @implementation MWKTestCase
 
 - (NSData*)loadDataFile:(NSString*)name ofType:(NSString*)extension {
-NSString* path = [[NSBundle bundleForClass:[self class]] 
pathForResource:name ofType:extension];
-return [NSData dataWithContentsOfFile:path];
+return [[self wmf_bundle] wmf_dataFromContentsOfFile:name 
ofType:extension];
 }
 
 - (id)loadJSON:(NSString*)name {
-NSData* data   = [self loadDataFile:name ofType:@"json"];
-NSError* err   = nil;
-id dictOrArray = [NSJSONSerialization JSONObjectWithData:data options:0 
error:&err];
-assert(err == nil);
-assert(dictOrArray);
-return dictOrArray;
+return [[self wmf_bundle] wmf_jsonFromContentsOfFile:name];
 }
 
 @end
diff --git a/Wikipedia.xcodeproj/project.pbxproj 
b/Wikipedia.xcodeproj/project.pbxproj
index 53cb5f6..feb2cbd 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -735,6 +735,7 @@
BC23759D1AB8928600B0BAA8 /* WMFDateFormatterTests.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= WMFDateFormatterTests.m; sourceTree = ""; };
BC2375BA1ABB121C00B0BAA8 /* Obama.json */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = 
Obama.json; sourceTree = ""; };
BC2375C01ABB14CC00B0BAA8 /* WMFArticleImageInjectionTests.m */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = WMFArticleImageInjectionTests.m; sourceTree = 
""; };
+   BC282E271AE7FBB1005A5277 /* WMFTestFixtureUtilities.h */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
WMFTestFixtureUtilities.h; sourceTree = ""; };
BC2CBB8C1AA10F400079A313 /* UIView+WMFFrameUtils.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
"UIView+WMFFrameUtils.h"; sourceTree = ""; };
BC2CBB8D1AA10F400079A313 /* UIView+WMFFrameUtils.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= "UIView+WMFFrameUtils.m"; sourceTree = ""; };
BC31B2511AB1D9DC008138CA /* WMFImageInfoControllerTests.m */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = WMFImageInfoControllerTests.m; sourceTree = 
""; };
@@ -2087,6 +2088,7 @@
BCA6764F1AC05FE200A16160 /* Utilities */ = {
isa = PBXGroup;
children = (
+   BC282E271AE7FBB1005A5277 /* 
WMFTestFixtureUtilities.h */,
BC7ACB621AB34C9C00791497 /* WMFAsyncTestCase.h 
*/,
BC7ACB631AB34C9C00791497 /* WMFAsyncTestCas

[MediaWiki-commits] [Gerrit] refactor MWKTestCase and fix linting errors - change (apps...wikipedia)

2015-04-22 Thread Bgerstle (Code Review) 
Bgerstle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/205874

Change subject: refactor MWKTestCase and fix linting errors
..

refactor MWKTestCase and fix linting errors

Change-Id: Ia1040459bb3051ac875af46d3a71e4d9af216cb7
---
M MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m
M MediaWikiKit/MediaWikiKitTests/MWKTestCase.m
M Wikipedia/mw-bridge/CommunicationBridge.m
3 files changed, 8 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/74/205874/1

diff --git a/MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m 
b/MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m
index f3c10ee..08c61a2 100644
--- a/MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m
+++ b/MediaWikiKit/MediaWikiKitTests/MWKArticleStoreTestCase.m
@@ -7,6 +7,7 @@
 //
 
 #import "MWKArticleStoreTestCase.h"
+#import "MWKDataStore+TemporaryDataStore.h"
 
 @implementation MWKArticleStoreTestCase
 
@@ -19,17 +20,13 @@
 self.json1= [self loadJSON:@"section1-end"];
 self.jsonAnon = [self loadJSON:@"organization-anon"];
 
-NSString* documentsFolder = 
[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, 
YES) firstObject];
-self.basePath = [documentsFolder 
stringByAppendingPathComponent:@"unit-test-data"];
-
-self.dataStore = [[MWKDataStore alloc] initWithBasePath:self.basePath];
+self.dataStore = [MWKDataStore temporaryDataStore];
 self.article   = [self.dataStore articleWithTitle:self.title];
 }
 
 - (void)tearDown {
+[self.dataStore removeFolderAtBasePath];
 [super tearDown];
-
-[[NSFileManager defaultManager] removeItemAtPath:self.basePath error:nil];
 }
 
 @end
diff --git a/MediaWikiKit/MediaWikiKitTests/MWKTestCase.m 
b/MediaWikiKit/MediaWikiKitTests/MWKTestCase.m
index 1c23c1d..a2c2558 100644
--- a/MediaWikiKit/MediaWikiKitTests/MWKTestCase.m
+++ b/MediaWikiKit/MediaWikiKitTests/MWKTestCase.m
@@ -7,21 +7,17 @@
 //
 
 #import "MWKTestCase.h"
+#import "NSBundle+TestAssets.h"
+#import "XCTestCase+WMFBundleConvenience.h"
 
 @implementation MWKTestCase
 
 - (NSData*)loadDataFile:(NSString*)name ofType:(NSString*)extension {
-NSString* path = [[NSBundle bundleForClass:[self class]] 
pathForResource:name ofType:extension];
-return [NSData dataWithContentsOfFile:path];
+return [[self wmf_bundle] wmf_dataFromContentsOfFile:name 
ofType:extension];
 }
 
 - (id)loadJSON:(NSString*)name {
-NSData* data   = [self loadDataFile:name ofType:@"json"];
-NSError* err   = nil;
-id dictOrArray = [NSJSONSerialization JSONObjectWithData:data options:0 
error:&err];
-assert(err == nil);
-assert(dictOrArray);
-return dictOrArray;
+return [[self wmf_bundle] wmf_jsonFromContentsOfFile:name];
 }
 
 @end
diff --git a/Wikipedia/mw-bridge/CommunicationBridge.m 
b/Wikipedia/mw-bridge/CommunicationBridge.m
index fa7e200..72bbeba 100644
--- a/Wikipedia/mw-bridge/CommunicationBridge.m
+++ b/Wikipedia/mw-bridge/CommunicationBridge.m
@@ -111,7 +111,6 @@
 }
 
 - (BOOL)webView:(UIWebView*)webView 
shouldStartLoadWithRequest:(NSURLRequest*)request 
navigationType:(UIWebViewNavigationType)navigationType {
-
 if ([self isBridgeURL:request.URL]) {
 NSDictionary* message = [self extractBridgePayload:request.URL];
 NSString* messageType = message[@"type"];
@@ -139,8 +138,7 @@
 [self disableQueueingAndRemoveQueuedMessages];
 }
 
--(void)disableQueueingAndRemoveQueuedMessages {
-
+- (void)disableQueueingAndRemoveQueuedMessages {
 self.shouldQueueMessages = NO;
 [self.queuedMessages removeAllObjects];
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/205874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1040459bb3051ac875af46d3a71e4d9af216cb7
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits