kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-01-12 17:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Normalized the bundle identifier for Logic and Application Tests to 'org.restkit.tests'

Browse Source
This commit is contained in:
Blake Watters
2012-04-06 09:50:19 -04:00
parent b18abc04ed
commit 515a8dfcfb
9 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Code/Testing/RKTestFixture.h
View File

@@ -45,6 +45,14 @@
*/
+ (void)setFixtureBundle:(NSBundle *)bundle;
/**
Returns the full path to the specified fixture file on within the fixture bundle.
@param fixtureName The name of the fixture file.
@return The full path to the specified fixture file or nil if it cannot be located.
*/
+ (NSString *)pathForFixture:(NSString *)fixtureName;
#if TARGET_OS_IPHONE
/**
Creates and returns an image object by loading the image data from the fixture identified by the specified file name.

4
Code/Testing/RKTestFixture.m
View File

@@ -37,6 +37,10 @@ static NSBundle *fixtureBundle = nil;
fixtureBundle = bundle;
}
+ (NSString *)pathForFixture:(NSString *)fixtureName {
return [[self fixtureBundle] pathForResource:fixtureName ofType:nil];
}
#if TARGET_OS_IPHONE
+ (UIImage *)imageWithContentsOfFixture:(NSString *)fixtureName {
return [[self fixtureBundle] imageWithContentsOfResource:fixtureName withExtension:nil];

2
Resources/PLISTs/RestKitFrameworkTests-Info.plist
View File

@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>org.restkit.unit-tests</string>
<string>org.restkit.tests</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>

2
Resources/PLISTs/RestKitTests-Info.plist
View File

@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>org.restkit.unit-tests</string>
<string>org.restkit.tests</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>

2
Tests/Application/RKApplicationTests/Tests/RKApplicationTestsTests-Info.plist
View File

@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>org.restkit.${PRODUCT_NAME:rfc1034identifier}</string>
<string>org.restkit.tests</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>

3
Tests/Logic/Network/RKParamsAttachmentTest.m
View File

@@ -51,8 +51,7 @@
}
- (void)testShouldReturnAnMD5ForFiles {
NSBundle *testBundle = [NSBundle bundleWithIdentifier:@"org.restkit.unit-tests"];
NSString *filePath = [testBundle pathForResource:@"blake" ofType:@"png"];
NSString *filePath = [RKTestFixture pathForFixture:@"blake.png"];
RKParamsAttachment *attachment = [[[RKParamsAttachment alloc] initWithName:@"foo" file:filePath] autorelease];
assertThat([attachment MD5], is(equalTo(@"db6cb9d879b58e7e15a595632af345cd")));
}

12
Tests/Logic/Network/RKParamsTest.m
View File

@@ -49,9 +49,7 @@
[params setValue:@"two" forParam:@"value"];
[params setValue:@"three" forParam:@"value"];
[params setValue:@"four" forParam:@"value"];
NSBundle *testBundle = [NSBundle bundleWithIdentifier:@"org.restkit.unit-tests"];
NSString *imagePath = [testBundle pathForResource:@"blake" ofType:@"png"];
NSData *data = [NSData dataWithContentsOfFile:imagePath];
NSData *data = [RKTestFixture dataWithContentsOfFixture:@"blake.png"];
[params setData:data MIMEType:@"image/png" forParam:@"file"];
RKTestResponseLoader* responseLoader = [RKTestResponseLoader responseLoader];
[client post:@"/upload" params:params delegate:responseLoader];
@@ -65,9 +63,7 @@
NSNumber* idTema = [NSNumber numberWithInt:1234];
NSString* titulo = @"whatever";
NSString* texto = @"more text";
NSBundle *testBundle = [NSBundle bundleWithIdentifier:@"org.restkit.unit-tests"];
NSString *imagePath = [testBundle pathForResource:@"blake" ofType:@"png"];
NSData *data = [NSData dataWithContentsOfFile:imagePath];
NSData *data = [RKTestFixture dataWithContentsOfFixture:@"blake.png"];
NSNumber* cel = [NSNumber numberWithFloat:1.232442];
NSNumber* lon = [NSNumber numberWithFloat:18231.232442];;
NSNumber* lat = [NSNumber numberWithFloat:13213123.232442];;
@@ -108,9 +104,7 @@
[params setValue:@"two" forParam:@"value"];
[params setValue:@"three" forParam:@"value"];
[params setValue:@"four" forParam:@"value"];
NSBundle *testBundle = [NSBundle bundleWithIdentifier:@"org.restkit.unit-tests"];
NSString *imagePath = [testBundle pathForResource:@"blake" ofType:@"png"];
NSData *data = [NSData dataWithContentsOfFile:imagePath];
NSData *data = [RKTestFixture dataWithContentsOfFixture:@"blake.png"];
[params setData:data MIMEType:@"image/png" forParam:@"file"];
RKRequest *request = [client requestWithResourcePath:@"/upload"];
[request setMethod:RKRequestMethodPOST];

3
Tests/Logic/Network/RKRequestTest.m
View File

@@ -59,8 +59,7 @@
NSURL* URL = [NSURL URLWithString:URLString];
RKRequest* request = [[RKRequest alloc] initWithURL:URL];
RKParams* params = [[RKParams params] retain];
NSBundle *testBundle = [NSBundle bundleWithIdentifier:@"org.restkit.unit-tests"];
NSString* filePath = [testBundle pathForResource:@"blake" ofType:@"png"];
NSString* filePath = [RKTestFixture pathForFixture:@"blake.png"];
[params setFile:filePath forParam:@"file"];
[params setValue:@"this is the value" forParam:@"test"];
request.method = RKRequestMethodPOST;

5
Tests/RKTestEnvironment.m
View File

@@ -38,8 +38,9 @@ void RKTestClearCacheDirectory(void) {
+ (void)initialize
{
// Configure fixture bundle
NSBundle *fixtureBundle = [NSBundle bundleWithIdentifier:@"org.restkit.unit-tests"];
// Configure fixture bundle. The 'org.restkit.tests' identifier is shared between
// the logic and application test bundles
NSBundle *fixtureBundle = [NSBundle bundleWithIdentifier:@"org.restkit.tests"];
[RKTestFixture setFixtureBundle:fixtureBundle];
// Ensure the required directories exist