Skip to content

Commit c2cda65

Browse files
slembckeslembcke
committed
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
2 parents 4bbcd4c + 7908afc commit c2cda65

File tree

63 files changed

+5364
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+5364
-21
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ url=https://github.com/slembcke/Chipmunk2D.git
55
path = external/ObjectAL
66
url = https://github.com/spritebuilder/ObjectAL-for-Cocos2D.git
77
branch = apportable
8+
[submodule "external/SSZipArchive"]
9+
path = external/SSZipArchive
10+
url = https://github.com/spritebuilder/ssziparchive.git

‎UnitTests/CCEffectTests.m

Lines changed: 293 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,293 @@
1+
//
2+
// CCEffectTests.m
3+
// cocos2d-tests-ios
4+
//
5+
// Created by Thayer J Andrews on 9/26/14.
6+
// Copyright (c) 2014 Cocos2d. All rights reserved.
7+
//
8+
9+
#import <XCTest/XCTest.h>
10+
#import "cocos2d.h"
11+
#import "CCEffectUtils.h"
12+
13+
@interface CCEffectTests : XCTestCase
14+
@end
15+
16+
@implementation CCEffectTests
17+
18+
-(void)testNodeAncestry
19+
{
20+
CCSprite *s1 = [CCSprite spriteWithImageNamed:@"f1.png"];
21+
CCSprite *s2 = [CCSprite spriteWithImageNamed:@"f1.png"];
22+
23+
BOOL commonAncestor = NO;
24+
25+
CCEffectUtilsTransformFromNodeToNode(s1, s2, &commonAncestor);
26+
XCTAssertFalse(commonAncestor, @"Common ancestor found where there is none.");
27+
28+
CCEffectUtilsTransformFromNodeToNode(s2, s1, &commonAncestor);
29+
XCTAssertFalse(commonAncestor, @"Common ancestor found where there is none.");
30+
}
31+
32+
-(void)testSameNode
33+
{
34+
CCSprite *s1 = [CCSprite spriteWithImageNamed:@"f1.png"];
35+
36+
BOOL commonAncestor = NO;
37+
GLKMatrix4 transform;
38+
39+
transform = CCEffectUtilsTransformFromNodeToNode(s1, s1, &commonAncestor);
40+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
41+
42+
XCTAssertEqual(transform.m00, 1.0f, @"Unexpected transform value.");
43+
XCTAssertEqual(transform.m01, 0.0f, @"Unexpected transform value.");
44+
XCTAssertEqual(transform.m02, 0.0f, @"Unexpected transform value.");
45+
XCTAssertEqual(transform.m03, 0.0f, @"Unexpected transform value.");
46+
47+
XCTAssertEqual(transform.m10, 0.0f, @"Unexpected transform value.");
48+
XCTAssertEqual(transform.m11, 1.0f, @"Unexpected transform value.");
49+
XCTAssertEqual(transform.m12, 0.0f, @"Unexpected transform value.");
50+
XCTAssertEqual(transform.m13, 0.0f, @"Unexpected transform value.");
51+
52+
XCTAssertEqual(transform.m20, 0.0f, @"Unexpected transform value.");
53+
XCTAssertEqual(transform.m21, 0.0f, @"Unexpected transform value.");
54+
XCTAssertEqual(transform.m22, 1.0f, @"Unexpected transform value.");
55+
XCTAssertEqual(transform.m23, 0.0f, @"Unexpected transform value.");
56+
57+
XCTAssertEqual(transform.m30, 0.0f, @"Unexpected transform value.");
58+
XCTAssertEqual(transform.m31, 0.0f, @"Unexpected transform value.");
59+
XCTAssertEqual(transform.m32, 0.0f, @"Unexpected transform value.");
60+
XCTAssertEqual(transform.m33, 1.0f, @"Unexpected transform value.");
61+
}
62+
63+
-(void)testSiblingTransforms
64+
{
65+
CCSprite *root = [CCSprite spriteWithImageNamed:@"f1.png"];
66+
root.name = @"root";
67+
root.positionType = CCPositionTypePoints;
68+
root.position = ccp(0.0f, 0.0f);
69+
root.anchorPoint = ccp(0.0f, 0.0f);
70+
71+
CCSprite *s1 = [CCSprite spriteWithImageNamed:@"f1.png"];
72+
s1.name = @"s1";
73+
s1.positionType = CCPositionTypePoints;
74+
s1.position = ccp(10.0f, 10.0f);
75+
s1.anchorPoint = ccp(0.0f, 0.0f);
76+
77+
CCSprite *s2 = [CCSprite spriteWithImageNamed:@"f1.png"];
78+
s2.name = @"s2";
79+
s2.positionType = CCPositionTypePoints;
80+
s2.position = ccp(100.0f, 100.0f);
81+
s2.anchorPoint = ccp(0.0f, 0.0f);
82+
83+
CCSprite *s3 = [CCSprite spriteWithImageNamed:@"f1.png"];
84+
s3.name = @"s3";
85+
s3.positionType = CCPositionTypePoints;
86+
s3.position = ccp(1000.0f, 1000.0f);
87+
s3.anchorPoint = ccp(0.0f, 0.0f);
88+
89+
BOOL commonAncestor = NO;
90+
GLKMatrix4 transform;
91+
92+
93+
94+
// Test this hierarchy:
95+
//
96+
// root
97+
// \
98+
// s1
99+
// / \
100+
// s2 s3
101+
//
102+
[root addChild:s1];
103+
[s1 addChild:s2];
104+
[s1 addChild:s3];
105+
transform = CCEffectUtilsTransformFromNodeToNode(s1, s2, &commonAncestor);
106+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
107+
XCTAssertEqual(transform.m30, -100.0f, @"");
108+
XCTAssertEqual(transform.m31, -100.0f, @"");
109+
110+
transform = CCEffectUtilsTransformFromNodeToNode(s2, s1, &commonAncestor);
111+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
112+
XCTAssertEqual(transform.m30, 100.0f, @"");
113+
XCTAssertEqual(transform.m31, 100.0f, @"");
114+
115+
transform = CCEffectUtilsTransformFromNodeToNode(s2, s3, &commonAncestor);
116+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
117+
XCTAssertEqual(transform.m30, -900.0f, @"");
118+
XCTAssertEqual(transform.m31, -900.0f, @"");
119+
120+
transform = CCEffectUtilsTransformFromNodeToNode(s3, s2, &commonAncestor);
121+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
122+
XCTAssertEqual(transform.m30, 900.0f, @"");
123+
XCTAssertEqual(transform.m31, 900.0f, @"");
124+
125+
transform = CCEffectUtilsTransformFromNodeToNode(s1, s3, &commonAncestor);
126+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
127+
XCTAssertEqual(transform.m30, -1000.0f, @"");
128+
XCTAssertEqual(transform.m31, -1000.0f, @"");
129+
130+
transform = CCEffectUtilsTransformFromNodeToNode(s3, s1, &commonAncestor);
131+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
132+
XCTAssertEqual(transform.m30, 1000.0f, @"");
133+
XCTAssertEqual(transform.m31, 1000.0f, @"");
134+
135+
136+
// Test this hierarchy:
137+
//
138+
// s1
139+
// / \
140+
// s2 s3
141+
//
142+
[root removeChild:s1];
143+
transform = CCEffectUtilsTransformFromNodeToNode(s1, s2, &commonAncestor);
144+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
145+
XCTAssertEqual(transform.m30, -100.0f, @"");
146+
XCTAssertEqual(transform.m31, -100.0f, @"");
147+
148+
transform = CCEffectUtilsTransformFromNodeToNode(s2, s1, &commonAncestor);
149+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
150+
XCTAssertEqual(transform.m30, 100.0f, @"");
151+
XCTAssertEqual(transform.m31, 100.0f, @"");
152+
153+
transform = CCEffectUtilsTransformFromNodeToNode(s2, s3, &commonAncestor);
154+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
155+
XCTAssertEqual(transform.m30, -900.0f, @"");
156+
XCTAssertEqual(transform.m31, -900.0f, @"");
157+
158+
transform = CCEffectUtilsTransformFromNodeToNode(s3, s2, &commonAncestor);
159+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
160+
XCTAssertEqual(transform.m30, 900.0f, @"");
161+
XCTAssertEqual(transform.m31, 900.0f, @"");
162+
163+
transform = CCEffectUtilsTransformFromNodeToNode(s1, s3, &commonAncestor);
164+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
165+
XCTAssertEqual(transform.m30, -1000.0f, @"");
166+
XCTAssertEqual(transform.m31, -1000.0f, @"");
167+
168+
transform = CCEffectUtilsTransformFromNodeToNode(s3, s1, &commonAncestor);
169+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
170+
XCTAssertEqual(transform.m30, 1000.0f, @"");
171+
XCTAssertEqual(transform.m31, 1000.0f, @"");
172+
173+
[s1 removeChild:s2];
174+
[s1 removeChild:s3];
175+
}
176+
177+
- (void)testAncestorTransforms
178+
{
179+
CCSprite *root = [CCSprite spriteWithImageNamed:@"f1.png"];
180+
root.name = @"root";
181+
root.positionType = CCPositionTypePoints;
182+
root.position = ccp(0.0f, 0.0f);
183+
root.anchorPoint = ccp(0.0f, 0.0f);
184+
185+
CCSprite *s1 = [CCSprite spriteWithImageNamed:@"f1.png"];
186+
s1.name = @"s1";
187+
s1.positionType = CCPositionTypePoints;
188+
s1.position = ccp(10.0f, 10.0f);
189+
s1.anchorPoint = ccp(0.0f, 0.0f);
190+
191+
CCSprite *s2 = [CCSprite spriteWithImageNamed:@"f1.png"];
192+
s2.name = @"s2";
193+
s2.positionType = CCPositionTypePoints;
194+
s2.position = ccp(100.0f, 100.0f);
195+
s2.anchorPoint = ccp(0.0f, 0.0f);
196+
197+
CCSprite *s3 = [CCSprite spriteWithImageNamed:@"f1.png"];
198+
s3.name = @"s3";
199+
s3.positionType = CCPositionTypePoints;
200+
s3.position = ccp(1000.0f, 1000.0f);
201+
s3.anchorPoint = ccp(0.0f, 0.0f);
202+
203+
BOOL commonAncestor = NO;
204+
GLKMatrix4 transform;
205+
206+
207+
// Test this hierarchy:
208+
//
209+
// root
210+
// \
211+
// s1
212+
// \
213+
// s2
214+
// \
215+
// s3
216+
//
217+
[root addChild:s1];
218+
[s1 addChild:s2];
219+
[s2 addChild:s3];
220+
transform = CCEffectUtilsTransformFromNodeToNode(s1, s2, &commonAncestor);
221+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
222+
XCTAssertEqual(transform.m30, -100.0f, @"");
223+
XCTAssertEqual(transform.m31, -100.0f, @"");
224+
225+
transform = CCEffectUtilsTransformFromNodeToNode(s2, s1, &commonAncestor);
226+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
227+
XCTAssertEqual(transform.m30, 100.0f, @"");
228+
XCTAssertEqual(transform.m31, 100.0f, @"");
229+
230+
transform = CCEffectUtilsTransformFromNodeToNode(s2, s3, &commonAncestor);
231+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
232+
XCTAssertEqual(transform.m30, -1000.0f, @"");
233+
XCTAssertEqual(transform.m31, -1000.0f, @"");
234+
235+
transform = CCEffectUtilsTransformFromNodeToNode(s3, s2, &commonAncestor);
236+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
237+
XCTAssertEqual(transform.m30, 1000.0f, @"");
238+
XCTAssertEqual(transform.m31, 1000.0f, @"");
239+
240+
transform = CCEffectUtilsTransformFromNodeToNode(s1, s3, &commonAncestor);
241+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
242+
XCTAssertEqual(transform.m30, -1100.0f, @"");
243+
XCTAssertEqual(transform.m31, -1100.0f, @"");
244+
245+
transform = CCEffectUtilsTransformFromNodeToNode(s3, s1, &commonAncestor);
246+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
247+
XCTAssertEqual(transform.m30, 1100.0f, @"");
248+
XCTAssertEqual(transform.m31, 1100.0f, @"");
249+
250+
251+
// Test this hierarchy:
252+
//
253+
// s1
254+
// \
255+
// s2
256+
// \
257+
// s3
258+
//
259+
[root removeChild:s1];
260+
transform = CCEffectUtilsTransformFromNodeToNode(s1, s2, &commonAncestor);
261+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
262+
XCTAssertEqual(transform.m30, -100.0f, @"");
263+
XCTAssertEqual(transform.m31, -100.0f, @"");
264+
265+
transform = CCEffectUtilsTransformFromNodeToNode(s2, s1, &commonAncestor);
266+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
267+
XCTAssertEqual(transform.m30, 100.0f, @"");
268+
XCTAssertEqual(transform.m31, 100.0f, @"");
269+
270+
transform = CCEffectUtilsTransformFromNodeToNode(s2, s3, &commonAncestor);
271+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
272+
XCTAssertEqual(transform.m30, -1000.0f, @"");
273+
XCTAssertEqual(transform.m31, -1000.0f, @"");
274+
275+
transform = CCEffectUtilsTransformFromNodeToNode(s3, s2, &commonAncestor);
276+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
277+
XCTAssertEqual(transform.m30, 1000.0f, @"");
278+
XCTAssertEqual(transform.m31, 1000.0f, @"");
279+
280+
transform = CCEffectUtilsTransformFromNodeToNode(s1, s3, &commonAncestor);
281+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
282+
XCTAssertEqual(transform.m30, -1100.0f, @"");
283+
XCTAssertEqual(transform.m31, -1100.0f, @"");
284+
285+
transform = CCEffectUtilsTransformFromNodeToNode(s3, s1, &commonAncestor);
286+
XCTAssertTrue(commonAncestor, @"No common ancestor found where there is one.");
287+
XCTAssertEqual(transform.m30, 1100.0f, @"");
288+
XCTAssertEqual(transform.m31, 1100.0f, @"");
289+
[s1 removeChild:s2];
290+
[s2 removeChild:s3];
291+
}
292+
293+
@end

‎UnitTests/CCPackageCocos2dEnablerTests.m

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
//
2+
// CCPackageCocos2dEnablerTests.m
3+
// cocos2d-tests-ios
4+
//
5+
// Created by Nicky Weber on 23.09.14.
6+
// Copyright (c) 2014 Cocos2d. All rights reserved.
7+
//
8+
9+
#import <XCTest/XCTest.h>
10+
#import "CCPackageCocos2dEnabler.h"
11+
#import "CCPackage.h"
12+
#import "CCFileUtils.h"
13+
#import "CCSprite.h"
14+
#import "CCBReader.h"
15+
#import "AppDelegate.h"
16+
#import "CCPackage_private.h"
17+
18+
@interface CCPackageCocos2dEnablerTests : XCTestCase
19+
20+
@property (nonatomic, strong) CCPackage *package;
21+
@property (nonatomic, copy) NSURL *installURL;
22+
23+
@end
24+
25+
26+
@implementation CCPackageCocos2dEnablerTests
27+
28+
- (void)setUp
29+
{
30+
[super setUp];
31+
[(AppController *)[UIApplication sharedApplication].delegate configureCocos2d];
32+
33+
self.package = [[CCPackage alloc] initWithName:@"Foo"
34+
resolution:@"phonehd"
35+
os:@"iOS"
36+
remoteURL:[NSURL URLWithString:@"http://foo.fake/Foo-iOS-phonehd.zip"]];
37+
38+
NSString *pathToPackage = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Resources-shared/Packages/testpackage-iOS-phonehd_unzipped"];
39+
self.installURL = [[NSURL fileURLWithPath:pathToPackage] URLByAppendingPathComponent:@"testpackage-iOS-phonehd"];
40+
_package.installURL = _installURL;
41+
}
42+
43+
44+
#pragma mark - Tests
45+
46+
- (void)testEnablePackage
47+
{
48+
CCPackageCocos2dEnabler *packageEnabler = [[CCPackageCocos2dEnabler alloc] init];
49+
[packageEnabler enablePackages:@[_package]];
50+
51+
XCTAssertTrue([self isPackageInSearchPath]);
52+
XCTAssertEqual(_package.status, CCPackageStatusInstalledEnabled);
53+
54+
CCSprite *sprite = [CCSprite spriteWithImageNamed:@"boredSmiley.png"];
55+
XCTAssertNotNil(sprite);
56+
}
57+
58+
- (void)testDisablePackage
59+
{
60+
[self testEnablePackage];
61+
62+
CCPackageCocos2dEnabler *packageEnabler = [[CCPackageCocos2dEnabler alloc] init];
63+
[packageEnabler disablePackages:@[_package]];
64+
65+
XCTAssertEqual(_package.status, CCPackageStatusInstalledDisabled);
66+
67+
XCTAssertFalse([self isPackageInSearchPath]);
68+
69+
// Can't use [CCSprite spriteWithImageNamed:@"boredSmiley.png"], assertion exception is screwing up test result
70+
CGFloat *scale;
71+
NSString *path = [[CCFileUtils sharedFileUtils] fullPathForFilename:@"boredSmiley.png" contentScale:&scale];
72+
XCTAssertNil(path);
73+
}
74+
75+
76+
#pragma mark - Helper
77+
78+
- (BOOL)isPackageInSearchPath
79+
{
80+
for (NSString *aSearchPath in [CCFileUtils sharedFileUtils].searchPath)
81+
{
82+
if ([aSearchPath isEqualToString:_package.installURL.path])
83+
{
84+
return YES;
85+
}
86+
}
87+
return NO;
88+
}
89+
90+
@end

0 commit comments

Comments
 (0)