Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/210095
Change subject: fix for missing file ...................................................................... fix for missing file Change-Id: Ie0f15812e141c9095b27bb3de36e37530efafdca --- M Wikipedia.xcodeproj/project.pbxproj M WikipediaUnitTests/MWKArticle+WMFSharingTests.m D WikipediaUnitTests/MWKArticle_ShareSnippetTests.m 3 files changed, 8 insertions(+), 52 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/95/210095/1 diff --git a/Wikipedia.xcodeproj/project.pbxproj b/Wikipedia.xcodeproj/project.pbxproj index 33754c2..dcad244 100644 --- a/Wikipedia.xcodeproj/project.pbxproj +++ b/Wikipedia.xcodeproj/project.pbxproj @@ -293,7 +293,6 @@ 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 /* MWKArticle_ShareSnippetTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC9B2671AFA615000FF9593 /* MWKArticle_ShareSnippetTests.m */; }; BCCED2D01AE03BE20094EB7E /* MWKSectionListTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BCCED2CF1AE03BE20094EB7E /* MWKSectionListTests.m */; }; BCDB75C41AB0E8300005593F /* WMFSubstringUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BCDB75C31AB0E8300005593F /* WMFSubstringUtilsTests.m */; }; BCE912BA1ACC5E6900B74B42 /* NSIndexSet+BKReduce.m in Sources */ = {isa = PBXBuildFile; fileRef = BCE912B91ACC5E6900B74B42 /* NSIndexSet+BKReduce.m */; }; @@ -902,7 +901,6 @@ 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 /* MWKArticle_ShareSnippetTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWKArticle_ShareSnippetTests.m; sourceTree = "<group>"; }; BCCED2CF1AE03BE20094EB7E /* MWKSectionListTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWKSectionListTests.m; sourceTree = "<group>"; }; BCCED2D21AE041BD0094EB7E /* MWKSectionList_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWKSectionList_Private.h; sourceTree = "<group>"; }; BCDB75BC1AB0D3DE0005593F /* WMFImageInfoController_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WMFImageInfoController_Private.h; path = "Image Gallery/WMFImageInfoController_Private.h"; sourceTree = "<group>"; }; @@ -2074,7 +2072,6 @@ 0EBC56951AD5B22800E82CDD /* BITHockeyManagerWMFExtensionsTests.m */, BCCED2CF1AE03BE20094EB7E /* MWKSectionListTests.m */, BC49B3631AEECFD8009F55BE /* ArticleLoadingTests.m */, - BCC9B2671AFA615000FF9593 /* MWKArticle_ShareSnippetTests.m */, BC92A7721AFA88D3003C4212 /* MWKSection+WMFSharingTests.m */, BCAFC5CF1AFD5E7D004615BA /* MWKArticle+WMFSharingTests.m */, ); @@ -2936,7 +2933,6 @@ 0EBC56961AD5B22800E82CDD /* BITHockeyManagerWMFExtensionsTests.m in Sources */, BC0FED6A1AAA0268002488D7 /* MWKDataStorePathTests.m in Sources */, BC0FED761AAA026C002488D7 /* NSString+WMFHTMLParsingTests.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+WMFSharingTests.m b/WikipediaUnitTests/MWKArticle+WMFSharingTests.m index 5584a49..745bb02 100644 --- a/WikipediaUnitTests/MWKArticle+WMFSharingTests.m +++ b/WikipediaUnitTests/MWKArticle+WMFSharingTests.m @@ -40,4 +40,12 @@ assertThat(self.article.shareSnippet, is(@"Gary Cooper was an American film actor known for his natural, authentic, and understated acting style. He was a movie star from the end of the silent film era through the end of the golden age of Classical Hollywood. Cooper began his career as a film extra and stunt rider and soon established himself as a Western hero in films such as The Virginian. He played the lead in adventure films and dramas such as A Farewell to Arms and The Lives of a Bengal Lancer, and extended his range of performances to include roles in most major film genres. He portrayed champions of the common man in films such as Mr. Deeds Goes to Town, Meet John Doe, Sergeant York, The Pride of the Yankees, and For Whom the Bell Tolls. In his later years, he delivered award-winning performances in High Noon and Friendly Persuasion. Cooper received three Academy Awards and appeared on the Motion Picture Herald exhibitors poll of top ten film personalities every year from 1936 to 1958. His screen persona embodied the American folk hero. Ongoing: Nepal earthquake – Yemeni Civil WarRecent deaths: Ruth Rendell – Maya Plisetskaya")); } +- (void)testExpectedSnippetForObamaArticle { + 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"]]; + 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.")); +} + @end diff --git a/WikipediaUnitTests/MWKArticle_ShareSnippetTests.m b/WikipediaUnitTests/MWKArticle_ShareSnippetTests.m deleted file mode 100644 index 7c80200..0000000 --- a/WikipediaUnitTests/MWKArticle_ShareSnippetTests.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 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 -- To view, visit https://gerrit.wikimedia.org/r/210095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0f15812e141c9095b27bb3de36e37530efafdca 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