Checked in, problem with in memory stores.

blackgold9 · blackgold9 · commit 75adcf55bff0 · 2012-09-07T15:49:50.000-07:00
diff --git a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m
@@ -77,6 +77,9 @@ + (void)MR_makeContext:(NSManagedObjectContext *)sourceContext mergeChangesToCon
                                                       object:sourceContext
                                                        queue:nil
                                                   usingBlock:^(NSNotification *note) {
+                                                      NSAssert(note.object != nil, nil);
+                                                      NSAssert(targetContext!= nil, nil);
+                                                      
                                                       [targetContext performBlock:^{
                                                           [targetContext mergeChangesFromContextDidSaveNotification:note];
                                                       }];
diff --git a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
@@ -82,7 +82,7 @@ - (void) MR_saveErrorHandler:(void (^)(NSError *))errorCallback;
     
     if (self == [[self class] MR_defaultContext])
     {
-        [[[self class] MR_rootSavingContext] MR_saveInBackgroundErrorHandler:errorCallback];
+        [[[self class] MR_rootSavingContext] MR_saveErrorHandler:errorCallback];
     }
 }
 
diff --git a/Project Files/Unit Tests/MagicalDataImportTestCase.m b/Project Files/Unit Tests/MagicalDataImportTestCase.m
@@ -15,6 +15,7 @@ @implementation MagicalDataImportTestCase
 
 - (void) setUp
 {
+    NSLog(@"Setting up");
     [MagicalRecord setDefaultModelNamed:@"TestModel.momd"];
     [MagicalRecord setupCoreDataStackWithInMemoryStore];
     //[MagicalRecord setupCoreDataStack];
@@ -29,6 +30,7 @@ - (void) setUp
 
 - (void) tearDown
 {
+    NSLog(@"Tearing down");
     [MagicalRecord cleanUp];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ - (void) MR_saveErrorHandler:(void (^)(NSError *))errorCallback;`
`82`	`82`
`83`	`83`	`if (self == [[self class] MR_defaultContext])`
`84`	`84`	`{`
`85`		`- [[[self class] MR_rootSavingContext] MR_saveInBackgroundErrorHandler:errorCallback];`
	`85`	`+ [[[self class] MR_rootSavingContext] MR_saveErrorHandler:errorCallback];`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ @implementation MagicalDataImportTestCase`
`15`	`15`
`16`	`16`	`- (void) setUp`
`17`	`17`	`{`
	`18`	`+ NSLog(@"Setting up");`
`18`	`19`	`[MagicalRecord setDefaultModelNamed:@"TestModel.momd"];`
`19`	`20`	`[MagicalRecord setupCoreDataStackWithInMemoryStore];`
`20`	`21`	`//[MagicalRecord setupCoreDataStack];`
`@@ -29,6 +30,7 @@ - (void) setUp`
`29`	`30`
`30`	`31`	`- (void) tearDown`
`31`	`32`	`{`
	`33`	`+ NSLog(@"Tearing down");`
`32`	`34`	`[MagicalRecord cleanUp];`
`33`	`35`	`}`
`34`	`36`