Skip to content

Commit 6992c2f

Browse files
committed
Cleaned up main() for unit test target
1 parent 44c4713 commit 6992c2f

3 files changed

Lines changed: 42 additions & 86 deletions

File tree

GAJavaScript.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2DC139A613B3AC5E0026D4D5 /* GHUnitIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DC139A513B3AC5D0026D4D5 /* GHUnitIOS.framework */; };
2222
2DC139F013B3CF4A0026D4D5 /* UIView+GAViewStyling.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DC139EE13B3CF4A0026D4D5 /* UIView+GAViewStyling.h */; settings = {ATTRIBUTES = (Public, ); }; };
2323
2DC139F113B3CF4A0026D4D5 /* UIView+GAViewStyling.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DC139EF13B3CF4A0026D4D5 /* UIView+GAViewStyling.m */; };
24-
493383BB12B433F000FBE23C /* GHUnitIOSTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 493383BA12B433F000FBE23C /* GHUnitIOSTestMain.m */; };
24+
493383BB12B433F000FBE23C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 493383BA12B433F000FBE23C /* main.m */; };
2525
4933848612B4373600FBE23C /* TScriptObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4933848512B4373600FBE23C /* TScriptObject.m */; };
2626
4933848C12B437CD00FBE23C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4933848B12B437CD00FBE23C /* CoreGraphics.framework */; };
2727
493385BA12B5559B00FBE23C /* libGAJavaScript.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* libGAJavaScript.a */; };
@@ -73,7 +73,7 @@
7373
2DC139EF13B3CF4A0026D4D5 /* UIView+GAViewStyling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIView+GAViewStyling.m"; path = "Classes/ViewStyling/UIView+GAViewStyling.m"; sourceTree = "<group>"; };
7474
4933839E12B4338200FBE23C /* GAJavaScriptTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GAJavaScriptTests.app; sourceTree = BUILT_PRODUCTS_DIR; };
7575
493383A012B4338200FBE23C /* GAJavaScriptTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GAJavaScriptTests-Info.plist"; sourceTree = "<group>"; };
76-
493383BA12B433F000FBE23C /* GHUnitIOSTestMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GHUnitIOSTestMain.m; path = Tests/GHUnitIOSTestMain.m; sourceTree = "<group>"; };
76+
493383BA12B433F000FBE23C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Tests/main.m; sourceTree = "<group>"; };
7777
4933848412B4373600FBE23C /* TScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TScriptObject.h; path = Tests/TScriptObject.h; sourceTree = "<group>"; };
7878
4933848512B4373600FBE23C /* TScriptObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TScriptObject.m; path = Tests/TScriptObject.m; sourceTree = "<group>"; };
7979
4933848B12B437CD00FBE23C /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -205,7 +205,7 @@
205205
32C88DFF0371C24200C91783 /* Other Sources */ = {
206206
isa = PBXGroup;
207207
children = (
208-
493383BA12B433F000FBE23C /* GHUnitIOSTestMain.m */,
208+
493383BA12B433F000FBE23C /* main.m */,
209209
AA747D9E0F9514B9006C5449 /* GAJavaScript_Prefix.pch */,
210210
49F51D8212B6BDFD00F91142 /* ga-js-runtime.js */,
211211
);
@@ -334,7 +334,7 @@
334334
isa = PBXSourcesBuildPhase;
335335
buildActionMask = 2147483647;
336336
files = (
337-
493383BB12B433F000FBE23C /* GHUnitIOSTestMain.m in Sources */,
337+
493383BB12B433F000FBE23C /* main.m in Sources */,
338338
4933848612B4373600FBE23C /* TScriptObject.m in Sources */,
339339
4933871412B58C9E00FBE23C /* TWebView.m in Sources */,
340340
4983385F13782DFC0006B26A /* ApplicationDelegate.m in Sources */,

Tests/GHUnitIOSTestMain.m

Lines changed: 0 additions & 82 deletions
This file was deleted.

Tests/main.m

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
Copyright (c) 2010-2011 Andrew Goodale. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without modification, are
5+
permitted provided that the following conditions are met:
6+
7+
1. Redistributions of source code must retain the above copyright notice, this list of
8+
conditions and the following disclaimer.
9+
10+
2. Redistributions in binary form must reproduce the above copyright notice, this list
11+
of conditions and the following disclaimer in the documentation and/or other materials
12+
provided with the distribution.
13+
14+
THIS SOFTWARE IS PROVIDED BY ANDREW GOODALE "AS IS" AND ANY EXPRESS OR IMPLIED
15+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
16+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
17+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
20+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
21+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
22+
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23+
24+
The views and conclusions contained in the software and documentation are those of the
25+
authors and should not be interpreted as representing official policies, either expressed
26+
or implied, of Andrew Goodale.
27+
*/
28+
29+
#import <UIKit/UIKit.h>
30+
31+
32+
int main(int argc, char *argv[])
33+
{
34+
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
35+
int retVal = UIApplicationMain(argc, argv, nil, @"ApplicationDelegate");
36+
[pool release];
37+
return retVal;
38+
}

0 commit comments

Comments
 (0)