Skip to content

Commit eb35cc6

Browse files
marcuswestinmarcuswestin
committed
Move automated tests into Tests/ folder
1 parent b3a5da5 commit eb35cc6

File tree

11 files changed

+29
-119
lines changed

11 files changed

+29
-119
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ before_script:
33
- brew update
44
- brew upgrade xctool || true
55
script:
6-
- xctool -project WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge -configuration Release -sdk iphonesimulator test
6+
- xctool -project Tests/WebViewJavascriptBridge.xcodeproj -scheme WebViewJavascriptBridge -configuration Release -sdk iphonesimulator test

‎Default-568h@2x.png renamed to ‎Tests/Default-568h@2x.png

File renamed without changes.

‎WebViewJavascriptBridge.xcodeproj/project.pbxproj renamed to ‎Tests/WebViewJavascriptBridge.xcodeproj/project.pbxproj

Lines changed: 28 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
/* Begin PBXBuildFile section */
1010
2C35E9761C5A7F8E0093FB29 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2C35E9751C5A7F8E0093FB29 /* Default-568h@2x.png */; };
11-
2C35E9821C5A7FC30093FB29 /* WebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C35E97C1C5A7FC30093FB29 /* WebViewJavascriptBridge.m */; };
12-
2C35E9831C5A7FC30093FB29 /* WebViewJavascriptBridgeBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C35E97E1C5A7FC30093FB29 /* WebViewJavascriptBridgeBase.m */; };
13-
2C35E9841C5A7FC30093FB29 /* WKWebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C35E9801C5A7FC30093FB29 /* WKWebViewJavascriptBridge.m */; };
14-
2C3E7C591C5A8ECA00A1E322 /* WebViewJavascriptBridge_JS.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C3E7C581C5A8ECA00A1E322 /* WebViewJavascriptBridge_JS.m */; };
15-
3D0FE4761AE2886500BB4104 /* libWebViewJavascriptBridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0FE46A1AE2886400BB4104 /* libWebViewJavascriptBridge.a */; };
11+
2C3E7C631C5A928700A1E322 /* WebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C3E7C5C1C5A928700A1E322 /* WebViewJavascriptBridge.m */; };
12+
2C3E7C641C5A928700A1E322 /* WebViewJavascriptBridge_JS.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C3E7C5E1C5A928700A1E322 /* WebViewJavascriptBridge_JS.m */; };
13+
2C3E7C651C5A928700A1E322 /* WebViewJavascriptBridgeBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C3E7C601C5A928700A1E322 /* WebViewJavascriptBridgeBase.m */; };
14+
2C3E7C661C5A928700A1E322 /* WKWebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C3E7C621C5A928700A1E322 /* WKWebViewJavascriptBridge.m */; };
1615
3D99867E1AE2A3B2001DDA2C /* echo.html in Resources */ = {isa = PBXBuildFile; fileRef = 3D99867D1AE2A3B2001DDA2C /* echo.html */; };
1716
3D9E5F2F1AE288E5009D1C36 /* BridgeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D9E5F2E1AE288E5009D1C36 /* BridgeTests.m */; };
1817
3DCCF7DB1AE28C2900CE7C51 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DCCF7DA1AE28C2900CE7C51 /* main.m */; };
@@ -21,13 +20,6 @@
2120
/* End PBXBuildFile section */
2221

2322
/* Begin PBXContainerItemProxy section */
24-
3D0FE4771AE2886500BB4104 /* PBXContainerItemProxy */ = {
25-
isa = PBXContainerItemProxy;
26-
containerPortal = 3D0FE4621AE2886400BB4104 /* Project object */;
27-
proxyType = 1;
28-
remoteGlobalIDString = 3D0FE4691AE2886400BB4104;
29-
remoteInfo = WebViewJavascriptBridge;
30-
};
3123
3DCCF7FC1AE28C3B00CE7C51 /* PBXContainerItemProxy */ = {
3224
isa = PBXContainerItemProxy;
3325
containerPortal = 3D0FE4621AE2886400BB4104 /* Project object */;
@@ -37,29 +29,16 @@
3729
};
3830
/* End PBXContainerItemProxy section */
3931

40-
/* Begin PBXCopyFilesBuildPhase section */
41-
3D0FE4681AE2886400BB4104 /* CopyFiles */ = {
42-
isa = PBXCopyFilesBuildPhase;
43-
buildActionMask = 2147483647;
44-
dstPath = "include/$(PRODUCT_NAME)";
45-
dstSubfolderSpec = 16;
46-
files = (
47-
);
48-
runOnlyForDeploymentPostprocessing = 0;
49-
};
50-
/* End PBXCopyFilesBuildPhase section */
51-
5232
/* Begin PBXFileReference section */
5333
2C35E9751C5A7F8E0093FB29 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
54-
2C35E97A1C5A7FC30093FB29 /* WebViewJavascriptBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridge.h; sourceTree = "<group>"; };
55-
2C35E97C1C5A7FC30093FB29 /* WebViewJavascriptBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridge.m; sourceTree = "<group>"; };
56-
2C35E97D1C5A7FC30093FB29 /* WebViewJavascriptBridgeBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridgeBase.h; sourceTree = "<group>"; };
57-
2C35E97E1C5A7FC30093FB29 /* WebViewJavascriptBridgeBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridgeBase.m; sourceTree = "<group>"; };
58-
2C35E97F1C5A7FC30093FB29 /* WKWebViewJavascriptBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewJavascriptBridge.h; sourceTree = "<group>"; };
59-
2C35E9801C5A7FC30093FB29 /* WKWebViewJavascriptBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WKWebViewJavascriptBridge.m; sourceTree = "<group>"; };
60-
2C3E7C571C5A8ECA00A1E322 /* WebViewJavascriptBridge_JS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridge_JS.h; sourceTree = "<group>"; };
61-
2C3E7C581C5A8ECA00A1E322 /* WebViewJavascriptBridge_JS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridge_JS.m; sourceTree = "<group>"; };
62-
3D0FE46A1AE2886400BB4104 /* libWebViewJavascriptBridge.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWebViewJavascriptBridge.a; sourceTree = BUILT_PRODUCTS_DIR; };
34+
2C3E7C5B1C5A928700A1E322 /* WebViewJavascriptBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridge.h; sourceTree = "<group>"; };
35+
2C3E7C5C1C5A928700A1E322 /* WebViewJavascriptBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridge.m; sourceTree = "<group>"; };
36+
2C3E7C5D1C5A928700A1E322 /* WebViewJavascriptBridge_JS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridge_JS.h; sourceTree = "<group>"; };
37+
2C3E7C5E1C5A928700A1E322 /* WebViewJavascriptBridge_JS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridge_JS.m; sourceTree = "<group>"; };
38+
2C3E7C5F1C5A928700A1E322 /* WebViewJavascriptBridgeBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridgeBase.h; sourceTree = "<group>"; };
39+
2C3E7C601C5A928700A1E322 /* WebViewJavascriptBridgeBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridgeBase.m; sourceTree = "<group>"; };
40+
2C3E7C611C5A928700A1E322 /* WKWebViewJavascriptBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewJavascriptBridge.h; sourceTree = "<group>"; };
41+
2C3E7C621C5A928700A1E322 /* WKWebViewJavascriptBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WKWebViewJavascriptBridge.m; sourceTree = "<group>"; };
6342
3D0FE4751AE2886500BB4104 /* WebViewJavascriptBridgeTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WebViewJavascriptBridgeTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6443
3D0FE47B1AE2886500BB4104 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6544
3D99867D1AE2A3B2001DDA2C /* echo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = echo.html; path = WebViewJavascriptBridgeTests/echo.html; sourceTree = SOURCE_ROOT; };
@@ -74,18 +53,10 @@
7453
/* End PBXFileReference section */
7554

7655
/* Begin PBXFrameworksBuildPhase section */
77-
3D0FE4671AE2886400BB4104 /* Frameworks */ = {
78-
isa = PBXFrameworksBuildPhase;
79-
buildActionMask = 2147483647;
80-
files = (
81-
);
82-
runOnlyForDeploymentPostprocessing = 0;
83-
};
8456
3D0FE4721AE2886500BB4104 /* Frameworks */ = {
8557
isa = PBXFrameworksBuildPhase;
8658
buildActionMask = 2147483647;
8759
files = (
88-
3D0FE4761AE2886500BB4104 /* libWebViewJavascriptBridge.a in Frameworks */,
8960
);
9061
runOnlyForDeploymentPostprocessing = 0;
9162
};
@@ -100,26 +71,27 @@
10071
/* End PBXFrameworksBuildPhase section */
10172

10273
/* Begin PBXGroup section */
103-
2C35E9791C5A7FC30093FB29 /* WebViewJavascriptBridge */ = {
74+
2C3E7C5A1C5A928700A1E322 /* WebViewJavascriptBridge */ = {
10475
isa = PBXGroup;
10576
children = (
106-
2C3E7C571C5A8ECA00A1E322 /* WebViewJavascriptBridge_JS.h */,
107-
2C3E7C581C5A8ECA00A1E322 /* WebViewJavascriptBridge_JS.m */,
108-
2C35E97A1C5A7FC30093FB29 /* WebViewJavascriptBridge.h */,
109-
2C35E97C1C5A7FC30093FB29 /* WebViewJavascriptBridge.m */,
110-
2C35E97D1C5A7FC30093FB29 /* WebViewJavascriptBridgeBase.h */,
111-
2C35E97E1C5A7FC30093FB29 /* WebViewJavascriptBridgeBase.m */,
112-
2C35E97F1C5A7FC30093FB29 /* WKWebViewJavascriptBridge.h */,
113-
2C35E9801C5A7FC30093FB29 /* WKWebViewJavascriptBridge.m */,
77+
2C3E7C5B1C5A928700A1E322 /* WebViewJavascriptBridge.h */,
78+
2C3E7C5C1C5A928700A1E322 /* WebViewJavascriptBridge.m */,
79+
2C3E7C5D1C5A928700A1E322 /* WebViewJavascriptBridge_JS.h */,
80+
2C3E7C5E1C5A928700A1E322 /* WebViewJavascriptBridge_JS.m */,
81+
2C3E7C5F1C5A928700A1E322 /* WebViewJavascriptBridgeBase.h */,
82+
2C3E7C601C5A928700A1E322 /* WebViewJavascriptBridgeBase.m */,
83+
2C3E7C611C5A928700A1E322 /* WKWebViewJavascriptBridge.h */,
84+
2C3E7C621C5A928700A1E322 /* WKWebViewJavascriptBridge.m */,
11485
);
115-
path = WebViewJavascriptBridge;
86+
name = WebViewJavascriptBridge;
87+
path = ../WebViewJavascriptBridge;
11688
sourceTree = "<group>";
11789
};
11890
3D0FE4611AE2886400BB4104 = {
11991
isa = PBXGroup;
12092
children = (
12193
2C35E9751C5A7F8E0093FB29 /* Default-568h@2x.png */,
122-
2C35E9791C5A7FC30093FB29 /* WebViewJavascriptBridge */,
94+
2C3E7C5A1C5A928700A1E322 /* WebViewJavascriptBridge */,
12395
3D0FE4791AE2886500BB4104 /* WebViewJavascriptBridgeTests */,
12496
3DCCF7D71AE28C2900CE7C51 /* WebViewJavascriptBridgeTestHost */,
12597
3D0FE46B1AE2886400BB4104 /* Products */,
@@ -129,7 +101,6 @@
129101
3D0FE46B1AE2886400BB4104 /* Products */ = {
130102
isa = PBXGroup;
131103
children = (
132-
3D0FE46A1AE2886400BB4104 /* libWebViewJavascriptBridge.a */,
133104
3D0FE4751AE2886500BB4104 /* WebViewJavascriptBridgeTests.xctest */,
134105
3DCCF7D61AE28C2900CE7C51 /* WebViewJavascriptBridgeTestHost.app */,
135106
);
@@ -186,23 +157,6 @@
186157
/* End PBXGroup section */
187158

188159
/* Begin PBXNativeTarget section */
189-
3D0FE4691AE2886400BB4104 /* WebViewJavascriptBridge */ = {
190-
isa = PBXNativeTarget;
191-
buildConfigurationList = 3D0FE47E1AE2886500BB4104 /* Build configuration list for PBXNativeTarget "WebViewJavascriptBridge" */;
192-
buildPhases = (
193-
3D0FE4661AE2886400BB4104 /* Sources */,
194-
3D0FE4671AE2886400BB4104 /* Frameworks */,
195-
3D0FE4681AE2886400BB4104 /* CopyFiles */,
196-
);
197-
buildRules = (
198-
);
199-
dependencies = (
200-
);
201-
name = WebViewJavascriptBridge;
202-
productName = WebViewJavascriptBridge;
203-
productReference = 3D0FE46A1AE2886400BB4104 /* libWebViewJavascriptBridge.a */;
204-
productType = "com.apple.product-type.library.static";
205-
};
206160
3D0FE4741AE2886500BB4104 /* WebViewJavascriptBridgeTests */ = {
207161
isa = PBXNativeTarget;
208162
buildConfigurationList = 3D0FE4811AE2886500BB4104 /* Build configuration list for PBXNativeTarget "WebViewJavascriptBridgeTests" */;
@@ -214,7 +168,6 @@
214168
buildRules = (
215169
);
216170
dependencies = (
217-
3D0FE4781AE2886500BB4104 /* PBXTargetDependency */,
218171
3DCCF7FD1AE28C3B00CE7C51 /* PBXTargetDependency */,
219172
);
220173
name = WebViewJavascriptBridgeTests;
@@ -248,9 +201,6 @@
248201
LastUpgradeCheck = 0720;
249202
ORGANIZATIONNAME = marcuswestin;
250203
TargetAttributes = {
251-
3D0FE4691AE2886400BB4104 = {
252-
CreatedOnToolsVersion = 6.3;
253-
};
254204
3D0FE4741AE2886500BB4104 = {
255205
CreatedOnToolsVersion = 6.3;
256206
TestTargetID = 3DCCF7D51AE28C2900CE7C51;
@@ -273,7 +223,6 @@
273223
projectDirPath = "";
274224
projectRoot = "";
275225
targets = (
276-
3D0FE4691AE2886400BB4104 /* WebViewJavascriptBridge */,
277226
3D0FE4741AE2886500BB4104 /* WebViewJavascriptBridgeTests */,
278227
3DCCF7D51AE28C2900CE7C51 /* WebViewJavascriptBridgeTestHost */,
279228
);
@@ -300,22 +249,15 @@
300249
/* End PBXResourcesBuildPhase section */
301250

302251
/* Begin PBXSourcesBuildPhase section */
303-
3D0FE4661AE2886400BB4104 /* Sources */ = {
304-
isa = PBXSourcesBuildPhase;
305-
buildActionMask = 2147483647;
306-
files = (
307-
);
308-
runOnlyForDeploymentPostprocessing = 0;
309-
};
310252
3D0FE4711AE2886500BB4104 /* Sources */ = {
311253
isa = PBXSourcesBuildPhase;
312254
buildActionMask = 2147483647;
313255
files = (
256+
2C3E7C651C5A928700A1E322 /* WebViewJavascriptBridgeBase.m in Sources */,
257+
2C3E7C661C5A928700A1E322 /* WKWebViewJavascriptBridge.m in Sources */,
314258
3D9E5F2F1AE288E5009D1C36 /* BridgeTests.m in Sources */,
315-
2C35E9841C5A7FC30093FB29 /* WKWebViewJavascriptBridge.m in Sources */,
316-
2C35E9831C5A7FC30093FB29 /* WebViewJavascriptBridgeBase.m in Sources */,
317-
2C35E9821C5A7FC30093FB29 /* WebViewJavascriptBridge.m in Sources */,
318-
2C3E7C591C5A8ECA00A1E322 /* WebViewJavascriptBridge_JS.m in Sources */,
259+
2C3E7C631C5A928700A1E322 /* WebViewJavascriptBridge.m in Sources */,
260+
2C3E7C641C5A928700A1E322 /* WebViewJavascriptBridge_JS.m in Sources */,
319261
);
320262
runOnlyForDeploymentPostprocessing = 0;
321263
};
@@ -331,11 +273,6 @@
331273
/* End PBXSourcesBuildPhase section */
332274

333275
/* Begin PBXTargetDependency section */
334-
3D0FE4781AE2886500BB4104 /* PBXTargetDependency */ = {
335-
isa = PBXTargetDependency;
336-
target = 3D0FE4691AE2886400BB4104 /* WebViewJavascriptBridge */;
337-
targetProxy = 3D0FE4771AE2886500BB4104 /* PBXContainerItemProxy */;
338-
};
339276
3DCCF7FD1AE28C3B00CE7C51 /* PBXTargetDependency */ = {
340277
isa = PBXTargetDependency;
341278
target = 3DCCF7D51AE28C2900CE7C51 /* WebViewJavascriptBridgeTestHost */;
@@ -423,24 +360,6 @@
423360
};
424361
name = Release;
425362
};
426-
3D0FE47F1AE2886500BB4104 /* Debug */ = {
427-
isa = XCBuildConfiguration;
428-
buildSettings = {
429-
OTHER_LDFLAGS = "-ObjC";
430-
PRODUCT_NAME = "$(TARGET_NAME)";
431-
SKIP_INSTALL = YES;
432-
};
433-
name = Debug;
434-
};
435-
3D0FE4801AE2886500BB4104 /* Release */ = {
436-
isa = XCBuildConfiguration;
437-
buildSettings = {
438-
OTHER_LDFLAGS = "-ObjC";
439-
PRODUCT_NAME = "$(TARGET_NAME)";
440-
SKIP_INSTALL = YES;
441-
};
442-
name = Release;
443-
};
444363
3D0FE4821AE2886500BB4104 /* Debug */ = {
445364
isa = XCBuildConfiguration;
446365
buildSettings = {
@@ -515,15 +434,6 @@
515434
defaultConfigurationIsVisible = 0;
516435
defaultConfigurationName = Release;
517436
};
518-
3D0FE47E1AE2886500BB4104 /* Build configuration list for PBXNativeTarget "WebViewJavascriptBridge" */ = {
519-
isa = XCConfigurationList;
520-
buildConfigurations = (
521-
3D0FE47F1AE2886500BB4104 /* Debug */,
522-
3D0FE4801AE2886500BB4104 /* Release */,
523-
);
524-
defaultConfigurationIsVisible = 0;
525-
defaultConfigurationName = Release;
526-
};
527437
3D0FE4811AE2886500BB4104 /* Build configuration list for PBXNativeTarget "WebViewJavascriptBridgeTests" */ = {
528438
isa = XCConfigurationList;
529439
buildConfigurations = (

‎WebViewJavascriptBridge.xcodeproj/xcshareddata/xcschemes/WebViewJavascriptBridge.xcscheme renamed to ‎Tests/WebViewJavascriptBridge.xcodeproj/xcshareddata/xcschemes/WebViewJavascriptBridge.xcscheme

File renamed without changes.

‎WebViewJavascriptBridgeTestHost/AppDelegate.h renamed to ‎Tests/WebViewJavascriptBridgeTestHost/AppDelegate.h

File renamed without changes.

‎WebViewJavascriptBridgeTestHost/AppDelegate.m renamed to ‎Tests/WebViewJavascriptBridgeTestHost/AppDelegate.m

File renamed without changes.

‎WebViewJavascriptBridgeTestHost/Info.plist renamed to ‎Tests/WebViewJavascriptBridgeTestHost/Info.plist

File renamed without changes.

‎WebViewJavascriptBridgeTestHost/main.m renamed to ‎Tests/WebViewJavascriptBridgeTestHost/main.m

File renamed without changes.

‎WebViewJavascriptBridgeTests/BridgeTests.m renamed to ‎Tests/WebViewJavascriptBridgeTests/BridgeTests.m

File renamed without changes.

‎WebViewJavascriptBridgeTests/Info.plist renamed to ‎Tests/WebViewJavascriptBridgeTests/Info.plist

File renamed without changes.

0 commit comments

Comments
 (0)