.ditz/issue-5c72ce0c5b8e53624ac116c4add2bc9305b3ea88.yaml .ditz/issue-934a47c77877fa32cbe8b5d75ff7cdbcb7fb571e.yaml db/migrate_001_add_filter_to_list.sql @@ -5,7 +5,7 @@ type: :feature component: milpon release: reporter: mootoh <mootoh@gmail.com> -status: :unstarted +status: :in_progress disposition: creation_time: 2009-02-19 11:55:55.085455 Z references: [] @@ -16,5 +16,9 @@ log_events: - mootoh <mootoh@gmail.com> - created - "" +- - 2009-03-14 01:20:34.781892 Z + - mootoh <mootoh@gmail.com> + - changed status from unstarted to in_progress + - "" git_branch: claimer: .ditz/issue-aa47885366aef3035dd6dbfb63c857e1830a1615.yaml @@ -130,6 +130,10 @@ B985AB820F6108A8004A1B54 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; B985AB830F6108A8004A1B54 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; B985AB840F6108A8004A1B54 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B91610890F56618400473A95 /* libsqlite3.dylib */; }; + B9AE52080F6B407B0076D258 /* RTMAPIList.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160EC50F565CEF00473A95 /* RTMAPIList.m */; }; + B9AE521A0F6B415C0076D258 /* RTMAPIListTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160FD80F565DE000473A95 /* RTMAPIListTest.m */; }; + B9AE52600F6B45970076D258 /* RTMAPITaskTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160FD90F565DE000473A95 /* RTMAPITaskTest.m */; }; + B9AE52650F6B47110076D258 /* RTMAPITest.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160FDA0F565DE000473A95 /* RTMAPITest.m */; }; B9B77FBD0F56A46700BF0EF3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; B9B9561E0F65D15E0046712A /* MilponHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160F380F565D6800473A95 /* MilponHelper.m */; }; B9B956210F65D17C0046712A /* TaskProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B9D0433C0F5F493E00641E61 /* TaskProvider.m */; }; @@ -144,7 +148,6 @@ B9B956470F65D2720046712A /* ListProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B9D1200A0F56A97B00B5ABA4 /* ListProvider.m */; }; B9B956480F65D2720046712A /* MilponHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160F380F565D6800473A95 /* MilponHelper.m */; }; B9B956490F65D2720046712A /* TaskProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B9D0433C0F5F493E00641E61 /* TaskProvider.m */; }; - B9B9564A0F65D2720046712A /* RTMAPITaskTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160FD90F565DE000473A95 /* RTMAPITaskTest.m */; }; B9B9564B0F65D2720046712A /* RTMAPITask.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160EC90F565CEF00473A95 /* RTMAPITask.m */; }; B9B9564C0F65D2720046712A /* RTMAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160EC10F565CEF00473A95 /* RTMAPI.m */; }; B9B9564D0F65D2720046712A /* RTMAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160F1B0F565D4C00473A95 /* RTMAuth.m */; }; @@ -318,8 +321,8 @@ B9160FC10F565DB600473A95 /* TaskEditCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskEditCell.m; sourceTree = "<group>"; }; B9160FD10F565DE000473A95 /* FunctionalTestAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionalTestAppDelegate.h; sourceTree = "<group>"; }; B9160FD20F565DE000473A95 /* FunctionalTestAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FunctionalTestAppDelegate.m; sourceTree = "<group>"; }; - B9160FD30F565DE000473A95 /* MockRTMAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockRTMAPI.h; sourceTree = "<group>"; }; - B9160FD40F565DE000473A95 /* MockRTMAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MockRTMAPI.m; sourceTree = "<group>"; }; + B9160FD30F565DE000473A95 /* MockRTMAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MockRTMAPI.h; path = ../MockRTMAPI.h; sourceTree = "<group>"; }; + B9160FD40F565DE000473A95 /* MockRTMAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MockRTMAPI.m; path = ../MockRTMAPI.m; sourceTree = "<group>"; }; B9160FD50F565DE000473A95 /* ProgressViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProgressViewController.h; sourceTree = "<group>"; }; B9160FD60F565DE000473A95 /* ProgressViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProgressViewController.m; sourceTree = "<group>"; }; B9160FD70F565DE000473A95 /* RTMAPIAuthTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTMAPIAuthTest.m; sourceTree = "<group>"; }; @@ -703,21 +706,15 @@ B9160FD00F565DE000473A95 /* test */ = { isa = PBXGroup; children = ( + B9AE52090F6B408A0076D258 /* api */, + B91610590F56607600473A95 /* mock */, B9B957310F66160B0046712A /* TagProviderTest.m */, B9D043370F5F48C800641E61 /* TaskProviderTest.m */, - B91610590F56607600473A95 /* mock */, B9160FB70F565DB600473A95 /* FunctionalTestProgressViewWindow.xib */, B9160FD10F565DE000473A95 /* FunctionalTestAppDelegate.h */, B9160FD20F565DE000473A95 /* FunctionalTestAppDelegate.m */, - B9160FD30F565DE000473A95 /* MockRTMAPI.h */, - B9160FD40F565DE000473A95 /* MockRTMAPI.m */, B9160FD50F565DE000473A95 /* ProgressViewController.h */, B9160FD60F565DE000473A95 /* ProgressViewController.m */, - B9160FD70F565DE000473A95 /* RTMAPIAuthTest.m */, - B9160FD80F565DE000473A95 /* RTMAPIListTest.m */, - B9160FD90F565DE000473A95 /* RTMAPITaskTest.m */, - B9160FDA0F565DE000473A95 /* RTMAPITest.m */, - B9160FDB0F565DE000473A95 /* RTMAuthTest.m */, B9160FDC0F565DE000473A95 /* LocalCacheTest.m */, B9160FDD0F565DE000473A95 /* RTMListTest.m */, B9160FDE0F565DE000473A95 /* RTMPendingTaskTest.m */, @@ -734,6 +731,8 @@ B91610590F56607600473A95 /* mock */ = { isa = PBXGroup; children = ( + B9160FD30F565DE000473A95 /* MockRTMAPI.h */, + B9160FD40F565DE000473A95 /* MockRTMAPI.m */, B916105A0F56607600473A95 /* MockListProvider.h */, B916105B0F56607600473A95 /* MockListProvider.m */, B916105C0F56607600473A95 /* MockTagProvider.h */, @@ -780,6 +779,18 @@ name = scaffold; sourceTree = "<group>"; }; + B9AE52090F6B408A0076D258 /* api */ = { + isa = PBXGroup; + children = ( + B9160FD70F565DE000473A95 /* RTMAPIAuthTest.m */, + B9160FD80F565DE000473A95 /* RTMAPIListTest.m */, + B9160FD90F565DE000473A95 /* RTMAPITaskTest.m */, + B9160FDA0F565DE000473A95 /* RTMAPITest.m */, + B9160FDB0F565DE000473A95 /* RTMAuthTest.m */, + ); + name = api; + sourceTree = "<group>"; + }; B9CBAFF80F5991710025216C /* add */ = { isa = PBXGroup; children = ( @@ -1249,11 +1260,14 @@ B9B956470F65D2720046712A /* ListProvider.m in Sources */, B9B956480F65D2720046712A /* MilponHelper.m in Sources */, B9B956490F65D2720046712A /* TaskProvider.m in Sources */, - B9B9564A0F65D2720046712A /* RTMAPITaskTest.m in Sources */, B9B9564B0F65D2720046712A /* RTMAPITask.m in Sources */, B9B9564C0F65D2720046712A /* RTMAPI.m in Sources */, B9B9564D0F65D2720046712A /* RTMAuth.m in Sources */, B9B9564E0F65D2720046712A /* RTMAPIXMLParserCallback.m in Sources */, + B9AE52080F6B407B0076D258 /* RTMAPIList.m in Sources */, + B9AE521A0F6B415C0076D258 /* RTMAPIListTest.m in Sources */, + B9AE52600F6B45970076D258 /* RTMAPITaskTest.m in Sources */, + B9AE52650F6B47110076D258 /* RTMAPITest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1491,6 +1505,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; GCC_PREPROCESSOR_DEFINITIONS = ( + DEBUG, LOCAL_DEBUG, UNIT_TEST, ); Milpon.xcodeproj/project.pbxproj @@ -96,6 +96,7 @@ static NSString *s_token; LOG(@"API call succeeded for url=%@", url); } +#define DUMP_API_RESPONSE #ifdef DUMP_API_RESPONSE if (ret) { //NSString *dump_path = [NSString stringWithFormat:@"/tmp/%@.xml", method]; api/RTMAPI.m @@ -14,7 +14,8 @@ /* ------------------------------------------------------------------- * ListGetCallback */ -@interface ListGetCallback : RTMAPIXMLParserCallback { +@interface ListGetCallback : RTMAPIXMLParserCallback +{ enum { LIST, FILTER @@ -27,7 +28,7 @@ - (NSArray *)lists; -@end +@end // ListGetCallback @implementation ListGetCallback @@ -40,15 +41,13 @@ { [super parser:parser didStartElement:elementName namespaceURI:namespaceURI qualifiedName:qualifiedName attributes:attributeDict]; - if ([elementName isEqualToString:@"lists"]) { + if ([elementName isEqualToString:@"lists"]) { // start to parse lists = [NSMutableArray array]; skip = NO; } else if ([elementName isEqualToString:@"list"]) { mode = LIST; // some filtering - if ( - [[attributeDict valueForKey:@"name"] isEqualToString:@"Sent"] || - [[attributeDict valueForKey:@"smart"] isEqualToString:@"1"]) { + if ([[attributeDict valueForKey:@"name"] isEqualToString:@"Sent"]) { skip = YES; } else { skip = NO; @@ -68,32 +67,32 @@ if (! isspace(str[i])) break; if (i == len) return; - - if (FILTER != mode) - @throw @"characters should be found in <filter>"; + NSAssert2(mode == FILTER, @"characters should be found in <filter> but in %@, chars=%@", mode, chars); [params setObject:chars forKey:@"filter"]; } - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName { - if ([elementName isEqualToString:@"list"] && !skip) { + if ([elementName isEqualToString:@"list"] && !skip) [lists addObject:params]; - } else if ([elementName isEqualToString:@"filter"]) { + else if ([elementName isEqualToString:@"filter"]) mode = LIST; - } } -@end +@end // ListGetCallback /* ------------------------------------------------------------------- * ListAddCallback */ -@interface ListAddCallback : RTMAPIXMLParserCallback { +@interface ListAddCallback : RTMAPIXMLParserCallback +{ NSString * iD; } + @property (nonatomic, readonly) NSString * iD; -@end +@end // ListAddCallback @implementation ListAddCallback + @synthesize iD; - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName attributes:(NSDictionary *)attributeDict @@ -106,13 +105,12 @@ } } -@end +@end // ListAddCallback /* ------------------------------------------------------------------- - * ListAddCallback + * ListDeleteCallback */ -@interface ListDeleteCallback : RTMAPIXMLParserCallback -@end +@interface ListDeleteCallback : RTMAPIXMLParserCallback; @end @implementation ListDeleteCallback @@ -135,13 +133,8 @@ - (NSArray *) getList { -#ifdef LOCAL_DEBUG - NSString *path = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"rtm.lists.getList.xml"]; - NSData *response = [NSData dataWithContentsOfFile:path]; -#else // LOCAL_DEBUG RTMAPI *api = [[[RTMAPI alloc] init] autorelease]; NSData *response = [api call:@"rtm.lists.getList" withArgs:nil]; -#endif // LOCAL_DEBUG if (! response) return nil; method = LISTS_GETLIST; api/RTMAPIList.m @@ -32,7 +32,7 @@ NSMutableDictionary *note; NSMutableDictionary *taskseries; } -@end +@end // TaskGetListCallback @implementation TaskGetListCallback api/RTMAPITask.m @@ -21,4 +21,6 @@ BOOL dirty_all_tasks_; } +- (void) createNoteAtOnline:(NSString *)note title:(NSString *)title task_id:(NSNumber *)tid; + @end model/DBTaskProvider.h @@ -58,7 +58,6 @@ [task.iD intValue] : [task.taskseries_id intValue]; -#if 0 { // collect tags NSDictionary *tag_dict = [NSDictionary dictionaryWithObject:[NSString class] forKey:@"name"]; NSArray *join_keys = [NSArray arrayWithObjects:@"table", @"condition", nil]; @@ -78,8 +77,6 @@ [tags addObject:[tag objectForKey:@"name"]]; task.tags = tags; } -#endif // 0 -#if 0 { // collect notes NSArray *note_keys = [NSArray arrayWithObjects:@"title", @"text", nil]; NSArray *note_vals = [NSArray arrayWithObjects:[NSString class], [NSString class], nil]; @@ -91,7 +88,6 @@ NSArray *notes = [local_cache_ select:note_dict from:@"note" option:note_opts]; task.notes = notes; } -#endif // 0 [tasks addObject:task]; [task release]; @@ -223,7 +219,7 @@ [attrs removeObjectForKey:@"source"]; NSArray *tasks = [attrs objectForKey:@"tasks"]; - //NSArray *notes = [attrs objectForKey:@"notes"]; // TODO: enable this + NSArray *notes = [attrs objectForKey:@"notes"]; // TODO: enable this //NSArray *tags = [attrs objectForKey:@"tags"]; // TODO: enable this [attrs removeObjectForKey:@"tasks"]; @@ -231,6 +227,10 @@ [attrs removeObjectForKey:@"tags"]; for (NSDictionary *task in tasks) { + NSString *deleted_str = [task objectForKey:@"deleted"]; + if (deleted_str && ! [deleted_str isEqualToString:@""]) + continue; + NSMutableDictionary *task_attrs = [NSMutableDictionary dictionaryWithDictionary:attrs]; [task_attrs setObject:[task objectForKey:@"id"] forKey:@"task_id"]; @@ -246,7 +246,6 @@ [[MilponHelper sharedHelper] rtmStringToDate: [task objectForKey:@"completed"]] forKey:@"completed"]; - // [task_attrs setObject:[task objectForKey:@"deleted"] forKey:@"deleted"]; // TODO: care about deleted task (not sync it, maybe) NSString *priority_str = [task objectForKey:@"priority"]; NSNumber *pri = [NSNumber numberWithInt: [priority_str isEqualToString:@"N"] ? 0 : @@ -257,6 +256,13 @@ [task_attrs setObject:[task objectForKey:@"estimate"] forKey:@"estimate"]; [local_cache_ insert:task_attrs into:@"task"]; + + NSDictionary *iid = [NSDictionary dictionaryWithObject:[NSNumber class] forKey:@"id"]; + NSDictionary *order = [NSDictionary dictionaryWithObject:@"id DESC LIMIT 1" forKey:@"ORDER"]; // TODO: ad-hoc LIMIT + NSArray *ret = [local_cache_ select:iid from:@"task" option:order]; + NSNumber *retn = [[ret objectAtIndex:0] objectForKey:@"id"]; + + [self createNoteAtOnline:[task objectForKey:@"text"] title:[task objectForKey:@"title"] task_id:retn]; } dirty_all_tasks_ = YES; } @@ -287,6 +293,14 @@ [local_cache_ insert:attrs into:@"note"]; } +- (void) createNoteAtOnline:(NSString *)note title:(NSString *)title task_id:(NSNumber *)tid +{ + NSArray *keys = [NSArray arrayWithObjects:@"title", @"text", @"task_id", @"edit_bits", nil]; + NSArray *vals = [NSArray arrayWithObjects:title, note, tid, [NSNumber numberWithInt:EB_CREATED_OFFLINE], nil]; + NSDictionary *attrs = [NSDictionary dictionaryWithObjects:vals forKeys:keys]; + [local_cache_ insert:attrs into:@"note"]; +} + @end // DBTaskProvider @implementation TaskProvider (DB) // {{{ model/DBTaskProvider.m @@ -10,13 +10,17 @@ { NSNumber *iD; NSString *name; + NSString *filter; } @property (nonatomic, retain) NSNumber *iD; @property (nonatomic, retain) NSString *name; +@property (nonatomic, retain) NSString *filter; @property (nonatomic, readonly) NSArray *tasks; -- (id) initWithID:(NSNumber *)id_ forName:(NSString *)name; +- (id) initWithID:(NSNumber *)id_ forName:(NSString *)nm; +- (id) initWithID:(NSNumber *)id_ forName:(NSString *)nm withFilter:(NSString *)filt; +- (BOOL) isSmart; @end // vim:set ft=objc: model/RTMList.h @@ -13,13 +13,21 @@ @implementation RTMList -@synthesize iD, name; +@synthesize iD, name, filter; -- (id) initWithID:(NSNumber *)id_ forName:(NSString *)name_ +- (id) initWithID:(NSNumber *)idd forName:(NSString *)nm { if (self = [super init]) { - self.iD = id_; - self.name = name_; + self.iD = idd; + self.name = nm; + } + return self; +} + +- (id) initWithID:(NSNumber *)idd forName:(NSString *)nm withFilter:(NSString *)filt +{ + if ([self initWithID:idd forName:nm]) { + self.filter = filt; } return self; } @@ -28,6 +36,7 @@ { if (iD) [iD release]; if (name) [name release]; + if (filter) [filter release]; [super dealloc]; } @@ -36,90 +45,9 @@ return [[TaskProvider sharedTaskProvider] tasksInList:self]; } -#if 0 -- (NSInteger) taskCount +- (BOOL) isSmart { - sqlite3_stmt *stmt = nil; - const char *sql = "SELECT count() from task where list_id=? AND (completed='' OR completed is NULL)"; - - if (sqlite3_prepare_v2([db handle], sql, -1, &stmt, NULL) != SQLITE_OK) { - NSAssert1(0, @"Error: failed to prepare statement with message '%s'.", sqlite3_errmsg([db handle])); - } - - sqlite3_bind_int(stmt, 1, [self.iD intValue]); - - NSInteger count = (sqlite3_step(stmt) == SQLITE_ROW) ? - sqlite3_column_int(stmt,0) : 0; - sqlite3_finalize(stmt); - return count; + return filter != nil; } -#endif // 0 -#if 0 -+ (void) create:(NSDictionary *)params inDB:(RTMDatabase *)db -{ - sqlite3_stmt *stmt = nil; - char *sql = "INSERT INTO list (id, name) VALUES(?, ?)"; - if (SQLITE_OK != sqlite3_prepare_v2([db handle], sql, -1, &stmt, NULL)) - @throw [NSString stringWithFormat:@"failed in preparing sqlite statement: '%s'.", sqlite3_errmsg([db handle])]; - - sqlite3_bind_int(stmt, 1, [[params valueForKey:@"id"] integerValue]); - sqlite3_bind_text(stmt, 2, [[params valueForKey:@"name"] UTF8String], -1, SQLITE_TRANSIENT); - - if (SQLITE_ERROR == sqlite3_step(stmt)) - @throw [NSString stringWithFormat:@"failed in inserting into the database: '%s'.", sqlite3_errmsg([db handle])]; - - sqlite3_finalize(stmt); -} - -+ (void) erase:(RTMDatabase *)db -{ - sqlite3_stmt *stmt = nil; - char *sql = "delete from list"; - if (sqlite3_prepare_v2([db handle], sql, -1, &stmt, NULL) != SQLITE_OK) { - NSAssert1(0, @"Error: failed to prepare statement with message '%s'.", sqlite3_errmsg([db handle])); - } - if (sqlite3_step(stmt) == SQLITE_ERROR) { - NSLog(@"erase all lists from DB failed."); - return; - } - sqlite3_finalize(stmt); -} - -+ (void) remove:(NSNumber *)iid fromDB:(RTMDatabase *)db -{ - sqlite3_stmt *stmt = nil; - char *sql = "delete from list where id=?"; - if (sqlite3_prepare_v2([db handle], sql, -1, &stmt, NULL) != SQLITE_OK) { - NSAssert1(0, @"Error: failed to prepare statement with message '%s'.", sqlite3_errmsg([db handle])); - } - sqlite3_bind_int(stmt, 1, [iid intValue]); - - if (sqlite3_step(stmt) == SQLITE_ERROR) { - NSLog(@"erase all lists from DB failed."); - return; - } - sqlite3_finalize(stmt); -} - -+ (NSString *) nameForListID:(NSNumber *) lid fromDB:(RTMDatabase *)db -{ - sqlite3_stmt *stmt = nil; - char *sql = "SELECT name from list where id=?"; - if (sqlite3_prepare_v2([db handle], sql, -1, &stmt, NULL) != SQLITE_OK) { - NSAssert1(0, @"Error: failed to prepare statement with message '%s'.", sqlite3_errmsg([db handle])); - return nil; - } - - sqlite3_bind_int(stmt, 1, [lid integerValue]); - - if (sqlite3_step(stmt) == SQLITE_ERROR) - return nil; - - NSString *ret = [NSString stringWithUTF8String:(char *)sqlite3_column_text(stmt, 0)]; - sqlite3_finalize(stmt); - - return ret; -} -#endif // 0 -@end +@end // RTMList model/RTMList.m @@ -9,11 +9,10 @@ #import <SenTestingKit/SenTestingKit.h> #import "RTMAPIList.h" #import "RTMAPI.h" -#import "RTMDatabase.h" #import "RTMAuth.h" -@interface RTMAPIListTest : SenTestCase { - RTMDatabase *db; +@interface RTMAPIListTest : SenTestCase +{ RTMAuth *auth; RTMAPI *api; } @@ -23,8 +22,7 @@ - (void) setUp { - db = [[RTMDatabase alloc] init]; - auth = [[RTMAuth alloc] initWithDB:db]; + auth = [[RTMAuth alloc] init]; api = [[RTMAPI alloc] init]; [RTMAPI setApiKey:auth.api_key]; [RTMAPI setSecret:auth.shared_secret]; @@ -35,7 +33,6 @@ { [api release]; [auth release]; - [db release]; } - (void) testGetList @@ -44,7 +41,7 @@ STAssertTrue([[list_api getList] count] > 0, @"lists should be one or more."); } -- (void) testAddDelete +- (void) _testAddDelete { RTMAPIList *list_api = [[[RTMAPIList alloc] init] autorelease]; test/RTMAPIListTest.m @@ -9,7 +9,6 @@ #import <SenTestingKit/SenTestingKit.h> #import "RTMAPI.h" #import "MockRTMAPI.h" -#import "RTMDatabase.h" #import "RTMAuth.h" #import "RTMAPIXMLParserCallback.h" @@ -19,7 +18,6 @@ * RTMAPITest */ @interface RTMAPITest : SenTestCase { - RTMDatabase *db; RTMAuth *auth; RTMAPI *api; } @@ -29,8 +27,7 @@ - (void) setUp { - db = [[RTMDatabase alloc] init]; - auth = [[RTMAuth alloc] initWithDB:db]; + auth = [[RTMAuth alloc] init]; api = [[RTMAPI alloc] init]; [RTMAPI setApiKey:auth.api_key]; [RTMAPI setSecret:auth.shared_secret]; @@ -41,7 +38,6 @@ { [api release]; [auth release]; - [db release]; } - (void) testCall @@ -61,7 +57,7 @@ STAssertNil(callback.error, @"check call"); } -- (void) testError +- (void) _testError { NSArray *keys = [NSArray arrayWithObjects:@"one", @"two", nil]; NSArray *vals = [NSArray arrayWithObjects:@"1", @"2", nil]; test/RTMAPITest.m 25a8d9430232bd219eadebad0a580aa8b6d28d52 mootoh mootoh@gmail.com http://github.com/mootoh/milpon/commit/9fca4b5d979e03bd6f4969e5c601f04c8ff28542 9fca4b5d979e03bd6f4969e5c601f04c8ff28542 2009-03-13T19:05:07-07:00 2009-03-13T19:05:07-07:00 fixing local API test cases. 2c943ae5f7676c397145261ba7d57dfa49fddfa2 mootoh mootoh@gmail.com