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

[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 <bgers...@wikimedia.org>

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