@@ -7,10 +7,21 @@ // #import <SenTestingKit/SenTestingKit.h> +#import "Person.h" @interface ActiveObjectTestCase : SenTestCase { } + +- (void)setup; +- (void)teardown; +- (Person *)newPerson; +- (void)comparePerson:(Person *)person1 withPerson:(Person *)person2; +- (void)testSaveAndFind; +- (void)testCount; +- (void)testRemove; + + @end ActiveObjectTestCase.h @@ -11,19 +11,196 @@ @implementation ActiveObjectTestCase +- (void)setup { + [Person openDatabase]; +} + +- (void)teardown { + [Person closeDatabase]; +} + + +- (Person *)newPerson { + Person *person = [[[Person alloc] init] autorelease]; + person.birthdate = [[NSDate alloc]init]; + int random = [person.birthdate timeIntervalSince1970]; + person.age = random % 30; + person.rank = random % 20; + person.votes = random % 10; + person.sex = 'M'; + person.name = [NSString stringWithFormat:@"Joe #%d", random % 1000]; + person.income = random % 3000; + person.active = TRUE; + person.flags = random % 30 + 0.5; + person.rating = [NSNumber numberWithInt:20.5]; + return person; +} + +- (void)comparePerson:(Person *)person1 withPerson:(Person *)person2 { + if (person1.age != person2.age) { + NSLog(@"unexpected age %d", person2.age); + } + + if ([person1.birthdate timeIntervalSince1970] != [person2.birthdate timeIntervalSince1970]) { + NSLog(@"unexpected birthdate %@ --- %d / %d", person1.birthdate, [person1.birthdate timeIntervalSince1970], [person2.birthdate timeIntervalSince1970]); + } + + if (person1.rank != person2.rank) { + NSLog(@"unexpected age %d", person2.rank); + } + if (person1.votes != person2.votes) { + NSLog(@"unexpected votes %d", person2.votes); + } + if (person1.sex != person2.sex) { + NSLog(@"unexpected sex %c", person2.sex); + } + if (![person1.name isEqualToString: person2.name]) { + NSLog(@"unexpected name %@", person2.name); + } + if (person1.income != person2.income) { + NSLog(@"unexpected votes %f", person2.income); + } + if (person1.active != person2.active) { + NSLog(@"unexpected active %d", person2.active); + } + if (person1.flags != person2.flags) { + NSLog(@"unexpected flags %f", person2.flags); + } + if ([person1.rating intValue] != [person2.rating intValue]) { + NSLog(@"unexpected rating %@", person2.rating); + } +} + + +- (void)testSaveAndFind { + /* + [Person removeAll]; + + Person *person1 = [self newPerson]; + [person1 save]; + + Person *person2 = (Person *) [Person findByPrimaryKey:person1.objectId]; + [self comparePerson:person1 withPerson:person2]; + */ +} + + +- (void)testUpdateAndFind { + /* + [Person removeAll]; + + Person *person = [self newPerson]; + [person save]; + + int count = [Person countAll]; + if (count != 1) { + NSLog(@"unexpected count %d", count); + } + + NSNumber *oldId = person.objectId; + + [person save]; + if (person.objectId != oldId) { + NSLog(@"unexpected object id %@", person.objectId); + } + count = [Person countAll]; + if (count != 1) { + NSLog(@"unexpected count %d", count); + } + */ +} + + + +- (void)testSaveAndFindAll { + /* + [Person removeAll]; + + Person *person1 = [self newPerson]; + [person1 save]; + + Person *person2 = [self newPerson]; + [person2 save]; + + Person *person3 = [self newPerson]; + [person3 save]; + + NSArray* persons = [Person findAll]; + if ([persons count] != 3) { + NSLog(@"count not 3 %d", [persons count]); + } + + if (![persons containsObject:person1]) { + NSLog(@"count not 3 %d", [persons count]); + } + + if (![persons containsObject:person2]) { + NSLog(@"count not 3 %d", [persons count]); + } + + if (![persons containsObject:person3]) { + NSLog(@"count not 3 %d", [persons count]); + } + */ +} + + +- (void)testCount { + /* + [Person removeAll]; + + Person *person1 = [self newPerson]; + [person1 save]; + + Person *person2 = [self newPerson]; + [person2 save]; + + NSDictionary *criteria = [NSDictionary dictionaryWithObjectsAndKeys:person1.objectId, @"objectId", nil]; + int count = [Person countWithCriteria:criteria]; + if (count != 1) { + NSLog(@"unexpected count %d", count); + } + count = [Person countAll]; + if (count != 2) { + NSLog(@"unexpected count %d", count); + } + */ +} + -- (void)testTestFramework -{ - NSString *string1 = @"test"; - NSString *string2 = @"test"; - STAssertEquals(string1, - string2, - @"FAILURE"); - NSUInteger uint_1 = 4; - NSUInteger uint_2 = 4; - STAssertEquals(uint_1, - uint_2, - @"FAILURE"); +- (void)testRemove { + /* + [Person removeAll]; + + Person *person1 = [self newPerson]; + [person1 save]; + + int count = [Person countAll]; + if (count != 1) { + NSLog(@"unexpected count %d", count); + } + + + NSLog(@"find all %@\n\n", [Person findAll]); + + Person *person2 = (Person *) [Person findByPrimaryKey:person1.objectId]; + + count = [Person removeWithCriteria: [[[NSDictionary alloc] initWithObjectsAndKeys:person1.objectId, @"objectId", nil] autorelease]]; + if (count != 1) { + NSLog(@"unexpected count %d", count); + } + + @try { + person2 = (Person *) [Person findByPrimaryKey:person1.objectId]; + if (person2 != nil) { + NSLog(@"unexpected person %@", person2); + } + } + @catch (NSException *e) { + } + @finally { + } + */ } ActiveObjectTestCase.m @@ -18,15 +18,14 @@ 8F5D31860FE42BF40078D92A /* IntrospectHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D317D0FE42BF40078D92A /* IntrospectHelper.m */; }; 8F5D31870FE42BF40078D92A /* SqliteHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F5D317E0FE42BF40078D92A /* SqliteHelper.h */; }; 8F5D31880FE42BF40078D92A /* SqliteHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D317F0FE42BF40078D92A /* SqliteHelper.m */; }; - 8F5D31E70FE432910078D92A /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F5D31E60FE432910078D92A /* SenTestingKit.framework */; }; - 8F5D31E80FE432910078D92A /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F5D31E60FE432910078D92A /* SenTestingKit.framework */; }; - 8F5D32980FE44AA90078D92A /* ActiveObjectTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D32810FE43E820078D92A /* ActiveObjectTest.m */; }; - 8F5D32990FE44AAA0078D92A /* ActiveObjectTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D32810FE43E820078D92A /* ActiveObjectTest.m */; }; - 8F5D329B0FE44AC10078D92A /* Person.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D327E0FE43E3E0078D92A /* Person.m */; }; - 8F5D329C0FE44AC20078D92A /* Person.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D327E0FE43E3E0078D92A /* Person.m */; }; - 8F5D329E0FE44AD60078D92A /* ActiveObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D317B0FE42BF40078D92A /* ActiveObject.m */; }; - 8F5D329F0FE44ADF0078D92A /* IntrospectHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D317D0FE42BF40078D92A /* IntrospectHelper.m */; }; - 8F5D32A00FE44AE40078D92A /* SqliteHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D317F0FE42BF40078D92A /* SqliteHelper.m */; }; + F7B3AC780FEAF8B400171A94 /* Person.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D327E0FE43E3E0078D92A /* Person.m */; }; + F7B3AC790FEAF8C100171A94 /* ActiveObjectTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D32810FE43E820078D92A /* ActiveObjectTest.m */; }; + F7B3AC7B0FEAF8ED00171A94 /* ActiveObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D317B0FE42BF40078D92A /* ActiveObject.m */; }; + F7B3AC7C0FEAF8F900171A94 /* IntrospectHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D317D0FE42BF40078D92A /* IntrospectHelper.m */; }; + F7B3AC7D0FEAF90000171A94 /* SqliteHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F5D317F0FE42BF40078D92A /* SqliteHelper.m */; }; + F7B3AC7F0FEAF91300171A94 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F5D31E60FE432910078D92A /* SenTestingKit.framework */; }; + F7B3AC800FEAF91700171A94 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F5D31750FE42B9B0078D92A /* libsqlite3.0.dylib */; }; + F7B3AC810FEAF91B00171A94 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F5D31710FE42AE70078D92A /* Foundation.framework */; }; F7D33F8D0FE9F42900F315AC /* ActiveObjectTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D33F8C0FE9F42900F315AC /* ActiveObjectTestCase.m */; }; /* End PBXBuildFile section */ @@ -42,7 +41,7 @@ isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; - remoteGlobalIDString = F7D33F700FE9F11A00F315AC /* Test Suite */; + remoteGlobalIDString = F7D33F700FE9F11A00F315AC; remoteInfo = "Test Suite"; }; /* End PBXContainerItemProxy section */ @@ -79,7 +78,6 @@ files = ( 8F5D31720FE42AE70078D92A /* Foundation.framework in Frameworks */, 8F5D31760FE42B9B0078D92A /* libsqlite3.0.dylib in Frameworks */, - 8F5D31E70FE432910078D92A /* SenTestingKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -89,7 +87,6 @@ files = ( 8F5D31730FE42AE70078D92A /* Foundation.framework in Frameworks */, 8F5D31770FE42B9B0078D92A /* libsqlite3.0.dylib in Frameworks */, - 8F5D31E80FE432910078D92A /* SenTestingKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -97,6 +94,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + F7B3AC7F0FEAF91300171A94 /* SenTestingKit.framework in Frameworks */, + F7B3AC800FEAF91700171A94 /* libsqlite3.0.dylib in Frameworks */, + F7B3AC810FEAF91B00171A94 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -308,11 +308,6 @@ buildActionMask = 2147483647; files = ( 1D60589B0D05DD56006BFB54 /* main.m in Sources */, - 8F5D32990FE44AAA0078D92A /* ActiveObjectTest.m in Sources */, - 8F5D329C0FE44AC20078D92A /* Person.m in Sources */, - 8F5D329E0FE44AD60078D92A /* ActiveObject.m in Sources */, - 8F5D329F0FE44ADF0078D92A /* IntrospectHelper.m in Sources */, - 8F5D32A00FE44AE40078D92A /* SqliteHelper.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -323,8 +318,6 @@ 8F5D31840FE42BF40078D92A /* ActiveObject.m in Sources */, 8F5D31860FE42BF40078D92A /* IntrospectHelper.m in Sources */, 8F5D31880FE42BF40078D92A /* SqliteHelper.m in Sources */, - 8F5D32980FE44AA90078D92A /* ActiveObjectTest.m in Sources */, - 8F5D329B0FE44AC10078D92A /* Person.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -333,6 +326,11 @@ buildActionMask = 2147483647; files = ( F7D33F8D0FE9F42900F315AC /* ActiveObjectTestCase.m in Sources */, + F7B3AC780FEAF8B400171A94 /* Person.m in Sources */, + F7B3AC790FEAF8C100171A94 /* ActiveObjectTest.m in Sources */, + F7B3AC7B0FEAF8ED00171A94 /* ActiveObject.m in Sources */, + F7B3AC7C0FEAF8F900171A94 /* IntrospectHelper.m in Sources */, + F7B3AC7D0FEAF90000171A94 /* SqliteHelper.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -452,7 +450,10 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_LIBRARY_DIR)/Frameworks", + "\"$(SDKROOT)$(DEVELOPER_FRAMEWORKS_DIR)\"", + ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -480,7 +481,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_LIBRARY_DIR)/Frameworks", + "\"$(SDKROOT)$(DEVELOPER_FRAMEWORKS_DIR)\"", + ); GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; OCActiveObjects.xcodeproj/project.pbxproj build/OCActiveObjects.build/OCActiveObjects.pbxindex/categories.pbxbtree build/OCActiveObjects.build/OCActiveObjects.pbxindex/cdecls.pbxbtree build/OCActiveObjects.build/OCActiveObjects.pbxindex/decls.pbxbtree build/OCActiveObjects.build/OCActiveObjects.pbxindex/files.pbxbtree build/OCActiveObjects.build/OCActiveObjects.pbxindex/imports.pbxbtree build/OCActiveObjects.build/OCActiveObjects.pbxindex/pbxindex.header build/OCActiveObjects.build/OCActiveObjects.pbxindex/protocols.pbxbtree build/OCActiveObjects.build/OCActiveObjects.pbxindex/refs.pbxbtree build/OCActiveObjects.build/OCActiveObjects.pbxindex/strings.pbxstrings/control build/OCActiveObjects.build/OCActiveObjects.pbxindex/strings.pbxstrings/strings build/OCActiveObjects.build/OCActiveObjects.pbxindex/subclasses.pbxbtree build/OCActiveObjects.build/OCActiveObjects.pbxindex/symbols0.pbxsymbols @@ -12,6 +12,7 @@ int main(int argc, char *argv[]) { NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + /* ActiveObjectTest *test = [[[ActiveObjectTest alloc] init] autorelease]; [test setup]; [test testSaveAndFind]; @@ -24,6 +25,7 @@ int main(int argc, char *argv[]) { [test setup]; [test testRemove]; [test teardown]; + */ NSLog(@"ALL DONE"); [pool release]; return 0; main.m 25ecf77f628e6c315cb0223dbccf9b129ebcc5e9 Shahzad Bhatti bhatti@plexobject.com http://github.com/bhatti/OCActiveObjects/commit/739f14a0b5924cdefe6634355013a18ffbf6f6fd 739f14a0b5924cdefe6634355013a18ffbf6f6fd 2009-06-18T15:39:51-07:00 2009-06-18T15:39:51-07:00 added test case ed4f5126af42b2f085b6503b595c64c6bfef20e6 Shahzad Bhatti bhatti@plexobject.com