Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209529
Change subject: fix parsing test
......................................................................
fix parsing test
Change-Id: Ib2e35990c8f0c55e938c0c5a93c99883521d1dd5
---
M Wikipedia.xcodeproj/project.pbxproj
A WikipediaUnitTests/MWKArticle_ShareSnippetTests.m
M WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
D WikipediaUnitTests/WMFShareSnippetTests.m
4 files changed, 52 insertions(+), 59 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/29/209529/1
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 2fdbf1c..eaa3407 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -290,7 +290,7 @@
BCC185D81A9E5628005378F8 /* UILabel+WMFStyling.m in Sources */
= {isa = PBXBuildFile; fileRef = BCC185D71A9E5628005378F8 /*
UILabel+WMFStyling.m */; };
BCC185E01A9EC836005378F8 /* UIButton+FrameUtils.m in Sources */
= {isa = PBXBuildFile; fileRef = BCC185DF1A9EC836005378F8 /*
UIButton+FrameUtils.m */; };
BCC185E81A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m in Sources */ = {isa =
PBXBuildFile; fileRef = BCC185E71A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m */; };
- BCC9B2681AFA615000FF9593 /* WMFShareSnippetTests.m in Sources
*/ = {isa = PBXBuildFile; fileRef = BCC9B2671AFA615000FF9593 /*
WMFShareSnippetTests.m */; };
+ BCC9B2681AFA615000FF9593 /* MWKArticle_ShareSnippetTests.m in
Sources */ = {isa = PBXBuildFile; fileRef = BCC9B2671AFA615000FF9593 /*
MWKArticle_ShareSnippetTests.m */; };
BCC9B26B1AFA61DB00FF9593 /* MWKArticle+ShareSnippet.m in
Sources */ = {isa = PBXBuildFile; fileRef = BCC9B26A1AFA61DB00FF9593 /*
MWKArticle+ShareSnippet.m */; };
BCCED2D01AE03BE20094EB7E /* MWKSectionListTests.m in Sources */
= {isa = PBXBuildFile; fileRef = BCCED2CF1AE03BE20094EB7E /*
MWKSectionListTests.m */; };
BCDB75C41AB0E8300005593F /* WMFSubstringUtilsTests.m in Sources
*/ = {isa = PBXBuildFile; fileRef = BCDB75C31AB0E8300005593F /*
WMFSubstringUtilsTests.m */; };
@@ -896,7 +896,7 @@
BCC185DF1A9EC836005378F8 /* UIButton+FrameUtils.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= "UIButton+FrameUtils.m"; sourceTree = "<group>"; };
BCC185E61A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.h */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"UICollectionViewFlowLayout+AttributeUtils.h"; sourceTree = "<group>"; };
BCC185E71A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path =
"UICollectionViewFlowLayout+AttributeUtils.m"; sourceTree = "<group>"; };
- BCC9B2671AFA615000FF9593 /* WMFShareSnippetTests.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WMFShareSnippetTests.m; sourceTree = "<group>"; };
+ BCC9B2671AFA615000FF9593 /* MWKArticle_ShareSnippetTests.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = MWKArticle_ShareSnippetTests.m; sourceTree =
"<group>"; };
BCC9B2691AFA61DB00FF9593 /* MWKArticle+ShareSnippet.h */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= "MWKArticle+ShareSnippet.h"; sourceTree = "<group>"; };
BCC9B26A1AFA61DB00FF9593 /* MWKArticle+ShareSnippet.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = "MWKArticle+ShareSnippet.m"; sourceTree = "<group>"; };
BCCED2CF1AE03BE20094EB7E /* MWKSectionListTests.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= MWKSectionListTests.m; sourceTree = "<group>"; };
@@ -2069,7 +2069,7 @@
0EBC56951AD5B22800E82CDD /*
BITHockeyManagerWMFExtensionsTests.m */,
BCCED2CF1AE03BE20094EB7E /*
MWKSectionListTests.m */,
BC49B3631AEECFD8009F55BE /*
ArticleLoadingTests.m */,
- BCC9B2671AFA615000FF9593 /*
WMFShareSnippetTests.m */,
+ BCC9B2671AFA615000FF9593 /*
MWKArticle_ShareSnippetTests.m */,
BC92A7721AFA88D3003C4212 /*
MWKSection+WMFSharingTests.m */,
);
path = WikipediaUnitTests;
@@ -2920,7 +2920,7 @@
0EBC56961AD5B22800E82CDD /*
BITHockeyManagerWMFExtensionsTests.m in Sources */,
BC0FED6A1AAA0268002488D7 /*
MWKDataStorePathTests.m in Sources */,
BC0FED761AAA026C002488D7 /*
NSString+WMFHTMLParsingTests.m in Sources */,
- BCC9B2681AFA615000FF9593 /*
WMFShareSnippetTests.m in Sources */,
+ BCC9B2681AFA615000FF9593 /*
MWKArticle_ShareSnippetTests.m in Sources */,
BCA676571AC05FE200A16160 /*
XCTestCase+WMFBundleConvenience.m in Sources */,
BC0FED671AAA0268002488D7 /* MWKTitleTests.m in
Sources */,
BC0FED631AAA0263002488D7 /* MWKTestCase.m in
Sources */,
diff --git a/WikipediaUnitTests/MWKArticle_ShareSnippetTests.m
b/WikipediaUnitTests/MWKArticle_ShareSnippetTests.m
new file mode 100644
index 0000000..59635da
--- /dev/null
+++ b/WikipediaUnitTests/MWKArticle_ShareSnippetTests.m
@@ -0,0 +1,48 @@
+//
+// WMFShareSnippetTests.m
+// Wikipedia
+//
+// Created by Brian Gerstle on 5/6/15.
+// Copyright (c) 2015 Wikimedia Foundation. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+#import "WMFTestFixtureUtilities.h"
+#import "MWKTitle.h"
+#import "MWKSite.h"
+#import "MWKArticle+ShareSnippet.h"
+
+#define HC_SHORTHAND 1
+#import <OCHamcrest/OCHamcrest.h>
+
+@interface MWKArticle_ShareSnippetTests : XCTestCase
+@property MWKArticle* article;
+@end
+
+@implementation MWKArticle_ShareSnippetTests
+
+- (void)setUp {
+ [super setUp];
+ NSDictionary* obamaMobileViewJSON = [[self wmf_bundle]
wmf_jsonFromContentsOfFile:@"Obama"];
+ MWKTitle* dummyTitle =
+ [MWKTitle titleWithString:@"foo" site:[MWKSite
siteWithDomain:@"wikipedia.org" language:@"en"]];
+ self.article = [[MWKArticle alloc] initWithTitle:dummyTitle dataStore:nil
dict:obamaMobileViewJSON[@"mobileview"]];
+}
+
+- (void)tearDown {
+ // Put teardown code here. This method is called after the invocation of
each test method in the class.
+ [super tearDown];
+}
+
+- (void)testExpectedSnippetForObamaArticle {
+ assertThat(self.article.shareSnippet, is(@"Barack Hussein Obama II is the
44th and current President of the United States, and the first African American
to hold the office. Born in Honolulu, Hawaii, Obama is a graduate of Columbia
University and Harvard Law School, where he served as president of the Harvard
Law Review. He was a community organizer in Chicago before earning his law
degree. He worked as a civil rights attorney and taught constitutional law at
the University of Chicago Law School from 1992 to 2004. He served three terms
representing the 13th District in the Illinois Senate from 1997 to 2004,
running unsuccessfully for the United States House of Representatives in
2000."));
+}
+
+- (void)testPerformanceExample {
+ [self measureBlock:^{
+ [self.article shareSnippet];
+ }];
+}
+
+@end
diff --git a/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
b/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
index 2f54237..d411c69 100644
--- a/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
+++ b/WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
@@ -21,13 +21,6 @@
@implementation NSString_WMFHTMLParsingTests
-//- (void)testHillaryRodhamClintonHTML {
-// NSString* hillaryHTML =
-// [[NSString alloc] initWithData:[[self wmf_bundle]
wmf_dataFromContentsOfFile:@"HillaryRodhamClinton" ofType:@"html"]
-// encoding:NSUTF8StringEncoding];
-// assertThat(hillaryHTML.wmf_shareSnippetFromHTML, is(@"Hillary Diane
Rodham Clinton is a former United States Secretary of State in the
administration of President Barack Obama from 2009 to 2013; a former United
States Senator representing New York from 2001 to 2009; and, as the wife of
President Bill Clinton, was First Lady of the United State"));
-//}
-
- (void)testSnippetFromTextWithCitaiton {
assertThat([@"March 2011.[9][10] It was the first spacecraft to orbit
Mercury.[7]" wmf_shareSnippetFromText],
is(@"March 2011. It was the first spacecraft to orbit
Mercury."));
diff --git a/WikipediaUnitTests/WMFShareSnippetTests.m
b/WikipediaUnitTests/WMFShareSnippetTests.m
deleted file mode 100644
index dea11a1..0000000
--- a/WikipediaUnitTests/WMFShareSnippetTests.m
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// WMFShareSnippetTests.m
-// Wikipedia
-//
-// Created by Brian Gerstle on 5/6/15.
-// Copyright (c) 2015 Wikimedia Foundation. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <XCTest/XCTest.h>
-#import "WMFTestFixtureUtilities.h"
-#import "MWKTitle.h"
-#import "MWKSite.h"
-#import "MWKArticle+ShareSnippet.h"
-
-#define HC_SHORTHAND 1
-#import <OCHamcrest/OCHamcrest.h>
-
-@interface WMFShareSnippetTests : XCTestCase
-@property MWKArticle* article;
-@end
-
-@implementation WMFShareSnippetTests
-
-- (void)setUp {
- [super setUp];
- NSDictionary* obamaMobileViewJSON = [[self wmf_bundle]
wmf_jsonFromContentsOfFile:@"Obama"];
- MWKTitle* dummyTitle =
- [MWKTitle titleWithString:@"foo" site:[MWKSite
siteWithDomain:@"wikipedia.org" language:@"en"]];
- self.article = [[MWKArticle alloc] initWithTitle:dummyTitle dataStore:nil
dict:obamaMobileViewJSON[@"mobileview"]];
-}
-
-- (void)tearDown {
- // Put teardown code here. This method is called after the invocation of
each test method in the class.
- [super tearDown];
-}
-
-- (void)testExpectedSnippetForObamaArticle {
- assertThat(self.article.shareSnippet, is(@"Obama was born on August 4,
1961, at Kapiʻolani Maternity & Gynecological Hospital in Honolulu, Hawaii, and
would become the first President to have been born in Hawaii. His mother,
Stanley Ann Dunham, was born in Wichita, Kansas, and was of mostly English
ancestry. His fa"));
-}
-
-- (void)testPerformanceExample {
- [self measureBlock:^{
- [self.article shareSnippet];
- }];
-}
-
-@end
--
To view, visit https://gerrit.wikimedia.org/r/209529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2e35990c8f0c55e938c0c5a93c99883521d1dd5
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
