Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Unified Diff: webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm

Issue 2697603002: Move iOS tests to XCTest from gtest. (Closed)
Patch Set: fix nits Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModelTests.mm ('k') | webrtc/webrtc.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
diff --git a/webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModelTests.mm b/webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
similarity index 51%
rename from webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModelTests.mm
rename to webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
index 45a10451d228847d5e758976806fa21390a05663..eee18db69c4cfb4dc6780ab2ad0b9b8d89aa39e1 100644
--- a/webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModelTests.mm
+++ b/webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModel_xctest.mm
@@ -10,33 +10,21 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
+
+#import "WebRTC/RTCMediaConstraints.h"
+
#import "ARDSettingsModel+Private.h"
#import "ARDSettingsStore.h"
-#import "WebRTC/RTCMediaConstraints.h"
-#include "webrtc/base/gunit.h"
-@interface ARDSettingsModelTests : NSObject {
+@interface ARDSettingsModelTests : XCTestCase {
ARDSettingsModel *_model;
}
-
-- (void)testStoringInavlidConstraintReturnsNo;
-- (void)testDefaultMediaFromStore;
-- (void)testWidthConstraintFromStore;
-- (void)testHeightConstraintFromStore;
-
@end
@implementation ARDSettingsModelTests
-- (instancetype)init {
- self = [super init];
- if (self) {
- _model = [[ARDSettingsModel alloc] init];
- }
- return self;
-}
-
- (id)setupMockStoreWithMediaConstraintString:(NSString *)constraintString {
id storeMock = [OCMockObject mockForClass:[ARDSettingsStore class]];
[([[storeMock stub] andReturn:constraintString]) videoResolutionConstraints];
@@ -47,113 +35,50 @@
return storeMock;
}
+- (void)setUp {
+ _model = [[ARDSettingsModel alloc] init];
+}
+
- (void)testDefaultMediaFromStore {
- // given
id storeMock = [self setupMockStoreWithMediaConstraintString:nil];
-
[[storeMock expect] setVideoResolutionConstraints:@"640x480"];
- // when
NSString *string = [_model currentVideoResoultionConstraintFromStore];
- // then
- EXPECT_TRUE([string isEqualToString:@"640x480"]);
+ XCTAssertEqualObjects(string, @"640x480");
[storeMock verify];
}
-- (void)testStoringInavlidConstraintReturnsNo {
- // given
- id storeMock = [self setupMockStoreWithMediaConstraintString:@"960x480"];
-
- // when
- BOOL result = [_model storeVideoResoultionConstraint:@"960x480"];
-
- // then
- EXPECT_FALSE(result);
+- (void)testStoringInvalidConstraintReturnsNo {
+ __unused id storeMock = [self setupMockStoreWithMediaConstraintString:@"960x480"];
+ XCTAssertFalse([_model storeVideoResoultionConstraint:@"960x480"]);
}
- (void)testWidthConstraintFromStore {
- // given
[self setupMockStoreWithMediaConstraintString:@"1270x480"];
-
- // when
NSString *width = [_model currentVideoResolutionWidthFromStore];
- // then
- EXPECT_TRUE([width isEqualToString:@"1270"]);
+ XCTAssertEqualObjects(width, @"1270");
}
- (void)testHeightConstraintFromStore {
- // given
[self setupMockStoreWithMediaConstraintString:@"960x540"];
- // when
NSString *height = [_model currentVideoResolutionHeightFromStore];
- // then
- EXPECT_TRUE([height isEqualToString:@"540"]);
+ XCTAssertEqualObjects(height, @"540");
}
- (void)testConstraintComponentIsNilWhenInvalidConstraintString {
- // given
[self setupMockStoreWithMediaConstraintString:@"invalid"];
-
- // when
NSString *width = [_model currentVideoResolutionWidthFromStore];
- // then
- EXPECT_TRUE(width == nil);
+ XCTAssertNil(width);
}
- (void)testConstraintsDictionaryIsNilWhenInvalidConstraintString {
- // given
[self setupMockStoreWithMediaConstraintString:@"invalid"];
-
- // when
NSDictionary *constraintsDictionary = [_model currentMediaConstraintFromStoreAsRTCDictionary];
- // then
- EXPECT_TRUE(constraintsDictionary == nil);
+ XCTAssertNil(constraintsDictionary);
}
@end
-
-class ARDSettingsModelTest : public ::testing::Test {
- protected:
- ARDSettingsModelTests *test;
- ARDSettingsModelTest() { test = [[ARDSettingsModelTests alloc] init]; }
-};
-
-TEST_F(ARDSettingsModelTest, DefaultMediaFromStore) {
- @autoreleasepool {
- [test testDefaultMediaFromStore];
- }
-}
-
-TEST_F(ARDSettingsModelTest, StoringInvalidConstraintsReturnsNo) {
- @autoreleasepool {
- [test testStoringInavlidConstraintReturnsNo];
- }
-}
-
-TEST_F(ARDSettingsModelTest, WidthConstraintFromStore) {
- @autoreleasepool {
- [test testWidthConstraintFromStore];
- }
-}
-
-TEST_F(ARDSettingsModelTest, HeightConstraintFromStore) {
- @autoreleasepool {
- [test testHeightConstraintFromStore];
- }
-}
-
-TEST_F(ARDSettingsModelTest, ConstratintIsNil) {
- @autoreleasepool {
- [test testConstraintComponentIsNilWhenInvalidConstraintString];
- }
-}
-
-TEST_F(ARDSettingsModelTest, DictionaryIsNil) {
- @autoreleasepool {
- [test testConstraintsDictionaryIsNilWhenInvalidConstraintString];
- }
-}
« no previous file with comments | « webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModelTests.mm ('k') | webrtc/webrtc.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698