You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/07 08:08:11 UTC
[12/50] incubator-weex git commit: - [ios] remove OCMock dependency
- [ios] remove OCMock dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/552f0f70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/552f0f70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/552f0f70
Branch: refs/heads/0.14-dev
Commit: 552f0f7010ae57383efcaea462d4470fde35d8d5
Parents: a0d25dc
Author: yinfeng <cx...@apache.org>
Authored: Thu Jun 1 15:08:34 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Thu Jun 1 15:08:34 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 ----
ios/sdk/WeexSDKTests/WXURLRewriteTests.m | 21 ---------------------
ios/sdk/WeexSDKTests/dependency/libOCMock.a | Bin 2098920 -> 0 bytes
3 files changed, 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/552f0f70/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index d211f5f..6a315d0 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -196,7 +196,6 @@
74EF31AE1DE58BE200667A07 /* WXURLRewriteDefaultImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 74EF31AC1DE58BE200667A07 /* WXURLRewriteDefaultImpl.m */; };
74EF31C01DE5ED6F00667A07 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74EF31BE1DE5ED5900667A07 /* libstdc++.tbd */; };
74EF31C31DE6935600667A07 /* WXURLRewriteTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 74EF31C21DE6935600667A07 /* WXURLRewriteTests.m */; };
- 74EF31C51DE6AADD00667A07 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 74EF31C41DE6AADD00667A07 /* libOCMock.a */; };
74F7BFF51DC782EC004D0871 /* testRootView.js in Resources */ = {isa = PBXBuildFile; fileRef = 74F7BFF41DC782EC004D0871 /* testRootView.js */; };
74FD6E041C7C0E9600DBEB6D /* WXScrollerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 74FD6E031C7C0E9600DBEB6D /* WXScrollerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
775BEE4E1C16F993008D1629 /* WXDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 775BEE4D1C16F993008D1629 /* WXDefine.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -508,7 +507,6 @@
74EF31AC1DE58BE200667A07 /* WXURLRewriteDefaultImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXURLRewriteDefaultImpl.m; sourceTree = "<group>"; };
74EF31BE1DE5ED5900667A07 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
74EF31C21DE6935600667A07 /* WXURLRewriteTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXURLRewriteTests.m; sourceTree = "<group>"; };
- 74EF31C41DE6AADD00667A07 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOCMock.a; path = WeexSDKTests/dependency/libOCMock.a; sourceTree = "<group>"; };
74F7BFF41DC782EC004D0871 /* testRootView.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = testRootView.js; sourceTree = "<group>"; };
74FD6E031C7C0E9600DBEB6D /* WXScrollerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXScrollerProtocol.h; sourceTree = "<group>"; };
775BEE4D1C16F993008D1629 /* WXDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXDefine.h; sourceTree = "<group>"; };
@@ -614,7 +612,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 74EF31C51DE6AADD00667A07 /* libOCMock.a in Frameworks */,
74EF31C01DE5ED6F00667A07 /* libstdc++.tbd in Frameworks */,
DC9867441D826D1E000AF388 /* GLKit.framework in Frameworks */,
740938FB1D3D0E1700DBB801 /* AVKit.framework in Frameworks */,
@@ -1150,7 +1147,6 @@
A5818E244F9E235722E3B938 /* Frameworks */ = {
isa = PBXGroup;
children = (
- 74EF31C41DE6AADD00667A07 /* libOCMock.a */,
74EF31BE1DE5ED5900667A07 /* libstdc++.tbd */,
DC9867431D826D1E000AF388 /* GLKit.framework */,
740938FA1D3D0E1700DBB801 /* AVKit.framework */,
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/552f0f70/ios/sdk/WeexSDKTests/WXURLRewriteTests.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDKTests/WXURLRewriteTests.m b/ios/sdk/WeexSDKTests/WXURLRewriteTests.m
index eb6a5fe..f1111e3 100644
--- a/ios/sdk/WeexSDKTests/WXURLRewriteTests.m
+++ b/ios/sdk/WeexSDKTests/WXURLRewriteTests.m
@@ -22,7 +22,6 @@
#import "WXHandlerFactory.h"
#import "WXSDKInstance.h"
#import "WXSDKEngine.h"
-#import <OCMock/OCMock.h>
@interface WXURLRewriteTests : XCTestCase
@@ -31,8 +30,6 @@
@end
-static id _mockNSBundle;
-
@implementation WXURLRewriteTests
- (void)setUp {
@@ -41,10 +38,6 @@ static id _mockNSBundle;
_rewriteHandler = [WXHandlerFactory handlerForProtocol:@protocol(WXURLRewriteProtocol)];
_instance = [[WXSDKInstance alloc] init];
_instance.scriptURL = [NSURL URLWithString:@"https://www.weex.com/test/test.js"];
-
- _mockNSBundle = [OCMockObject niceMockForClass:[NSBundle class]];
- NSBundle *correctMainBundle = [NSBundle bundleForClass:self.class];
- [[[_mockNSBundle stub] andReturn:correctMainBundle] mainBundle];
}
- (void)tearDown {
@@ -87,19 +80,5 @@ static id _mockNSBundle;
XCTAssertEqualObjects(@"https://www.weex.com/test/test.jpg", rewriteURL4.absoluteString);
}
-- (void)testFileURL {
- NSBundle *bundle = [NSBundle bundleForClass:[self class]];
- NSURL *fileURL = [bundle URLForResource:@"testRootView" withExtension:@"js"];
- NSURL *rewriteURL = [_rewriteHandler rewriteURL:fileURL.absoluteString withResourceType:WXResourceTypeMainBundle withInstance:_instance];
- XCTAssertEqualObjects(fileURL.absoluteString, [rewriteURL absoluteString]);
-}
-
-- (void)testLocalURL {
- NSString *testURL = @"local://testRootView.js";
- NSBundle *bundle = [NSBundle bundleForClass:[self class]];
- NSURL *fileURL = [bundle URLForResource:@"testRootView" withExtension:@"js"];
- NSURL *rewriteURL = [_rewriteHandler rewriteURL:testURL withResourceType:WXResourceTypeMainBundle withInstance:_instance];
- XCTAssertEqualObjects(fileURL.absoluteString, [rewriteURL absoluteString]);
-}
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/552f0f70/ios/sdk/WeexSDKTests/dependency/libOCMock.a
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDKTests/dependency/libOCMock.a b/ios/sdk/WeexSDKTests/dependency/libOCMock.a
deleted file mode 100644
index 8edb6e3..0000000
Binary files a/ios/sdk/WeexSDKTests/dependency/libOCMock.a and /dev/null differ