Changeset 11798 for lang/objective-c

Timestamp:

05/18/08 00:07:27 (6 months ago)

Author:

mootoh

Message:

small refactoring.

Location:

lang/objective-c/HatebuCoreData

Files:

• BookmarkTest.m (modified) (3 diffs)
• UTManagedObjectContext.h (modified) (2 diffs)
• UTManagedObjectContext.m (modified) (2 diffs)

lang/objective-c/HatebuCoreData/BookmarkTest.m

@@ -15 +15 @@
 -(void) setUp {
   context_ = [NSManagedObjectContext inMemoryMOCForTesting];
-
   STAssertNotNil(context_, @"context loaded");
-}
-
--(void) tearDown {
 }
 
@@ -31 +27 @@
 }
 
-#if 0
 -(void) testSetValue {
   NSEntityDescription *entity = [NSEntityDescription
@@ -61 +56 @@
 #endif // 0
 }
-#endif // 0
 
 @end

lang/objective-c/HatebuCoreData/UTManagedObjectContext.h

@@ -9 +9 @@
 #import <Cocoa/Cocoa.h>
 
-
 @interface NSManagedObjectContext (UnitTest)
 
@@ -15 +14 @@
 
 @end
+// vim:set ft=objc:

lang/objective-c/HatebuCoreData/UTManagedObjectContext.m

@@ -6 +6 @@
 //  Copyright 2008 deadbeaf.org. All rights reserved.
 //
-// This code is posted by Bill Garrison to CocoaDev ML:
-//   http://lists.apple.com/archives/Cocoa-dev/2008/Mar/msg00777.html
+//  This code is posted originally by Bill Garrison to CocoaDev ML:
+//    http://lists.apple.com/archives/Cocoa-dev/2008/Mar/msg00777.html
 //
 #import "UTManagedObjectContext.h"
@@ -15 +15 @@
 
 // Configure a MOC backed by an in-memory store based on all bundled model files.
-
-+ (NSManagedObjectContext *) inMemoryMOCForTesting {    
-    NSString *modelStr = [NSBundle
-      pathForResource:@"HatebuCoreData_DataModel"
-      ofType:@"mom"
-      inDirectory:[[NSBundle bundleForClass:[BookmarkTest class]] bundlePath]];
-
++ (NSManagedObjectContext *) inMemoryMOCForTesting {
         // Set up a persistent store coordinator with an in-memory store.
-        
-        //NSManagedObjectModel* model = [NSManagedObjectModel mergedModelFromBundles:nil];
+  NSURL *url = [NSURL fileURLWithPath:
+    [NSBundle pathForResource:@"HatebuCoreData_DataModel" ofType:@"mom"
+      inDirectory:[[NSBundle bundleForClass:[BookmarkTest class]] bundlePath]]];
         NSManagedObjectModel *model = [[NSManagedObjectModel alloc]
-    initWithContentsOfURL:[NSURL fileURLWithPath:modelStr]];
-
+    initWithContentsOfURL:url];
   NSAssert(model != nil, @"model should not be nil");
   NSAssert([model entities] != nil, @"entities should not be nil");
-  NSLog(@"NSManagedObjectModel(UnitTest).inMemoryMOCForTesting : %d", [[model entities] count]);
         
-        NSPersistentStoreCoordinator *coordinator = [[[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model] autorelease];
-        if (coordinator == nil) {
-                NSLog(@"Can't get instance of an NSPersistentStoreCoordinator.");
-                return nil;
-        }
+        NSPersistentStoreCoordinator *coordinator = [[[NSPersistentStoreCoordinator alloc]
+    initWithManagedObjectModel:model] autorelease];
+  NSAssert(coordinator != nil, @"Can't get instance of an NSPersistentStoreCoordinator.");
         
         // Add an in-memory persistent store to the coordinator.
-        
         NSError *addStoreError = nil;
-        [coordinator addPersistentStoreWithType:NSInMemoryStoreType configuration:nil URL:nil options:nil error:&addStoreError];
-        if (addStoreError) {
-                NSLog(@"Error setting up in-memory store unit test: ", addStoreError);
-                return nil;
-        }
+        [coordinator addPersistentStoreWithType:NSInMemoryStoreType
+    configuration:nil URL:nil options:nil error:&addStoreError];
+  NSAssert(nil == addStoreError, @"Error setting up in-memory store unit test: ");
         
         // Now we can set up the managed object context and assign it to persistent store coordinator.
-        
         NSManagedObjectContext *moc = [[[NSManagedObjectContext alloc] init] autorelease];
         [moc setPersistentStoreCoordinator: coordinator];
-        NSAssert( moc != nil, @"Can't set up managed object context for unit test.");
+        NSAssert(moc != nil, @"Can't set up managed object context for unit test.");
         
         return moc;