Fix: changes are reflected in tests

MobileOrg · Jul 15, 2017 · db2317b · db2317b
1 parent d658acb
commit db2317b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/MobileOrgTests/NodeTests.m b/MobileOrgTests/NodeTests.m
@@ -48,7 +48,12 @@ - (BOOL)shouldRunOnMainThread {
 
 - (void)setUp {
     // Run at start of all tests in the class
-  self.model_ = [NSManagedObjectModel mergedModelFromBundles:nil];
+
+
+  NSString *path = [[NSBundle mainBundle] pathForResource:@"MobileOrg2" ofType:@"momd"];
+  NSURL *momURL = [NSURL fileURLWithPath:path];
+  self.model_ = [[NSManagedObjectModel alloc] initWithContentsOfURL:momURL];
+
   self.coordinator_ = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model_];
   self.context_ = [[NSManagedObjectContext alloc] initWithConcurrencyType: NSMainQueueConcurrencyType];
   [context_ setPersistentStoreCoordinator:coordinator_];

diff --git a/MobileOrgTests/OrgfileParserTests.swift b/MobileOrgTests/OrgfileParserTests.swift
@@ -181,9 +181,12 @@ class OrgfileParserTests: XCTestCase {
 
 
   func setUpInMemoryManagedObjectContext() -> NSManagedObjectContext {
-    let managedObjectModel = NSManagedObjectModel.mergedModel(from: [Bundle.main])!
 
-    let persistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: managedObjectModel)
+    let path = Bundle.main.path(forResource: "MobileOrg2", ofType: "momd")
+    let momURL = URL.init(fileURLWithPath: path!)
+    let managedObjectModel = NSManagedObjectModel.init(contentsOf: momURL)
+
+    let persistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: managedObjectModel!)
     try! persistentStoreCoordinator.addPersistentStore(ofType: NSInMemoryStoreType, configurationName: nil, at: nil, options: nil)
 
     let managedObjectContext = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)

diff --git a/MobileOrgTests/WebDavTests.swift b/MobileOrgTests/WebDavTests.swift
@@ -77,11 +77,12 @@ class WebDavTests: XCTestCase {
                                       fetchRequest.predicate = NSPredicate (format: "heading == %@", "Seamless integration of Cloud services")
 
                                       let nodes = try self.moc!.fetch(fetchRequest)
+                                      print(nodes.count)
 
                                       // Make local changes and sync again
                                       let tagEditController = TagEditController(node: nodes.first!)
 
-                                      tagEditController?.newTagString = "Test456"
+                                      tagEditController?.recentTagString = "Test456"
                                       tagEditController?.commitNewTag()
 
                                       Save()
@@ -116,7 +117,7 @@ class WebDavTests: XCTestCase {
                                       // Make local changes and sync again
                                       let tagEditController = TagEditController(node: nodes.first!)
 
-                                      tagEditController?.newTagString = ""
+                                      tagEditController?.recentTagString = ""
                                       tagEditController?.commitNewTag()
 
                                       Save()
@@ -132,9 +133,11 @@ class WebDavTests: XCTestCase {
   }
 
   func setUpInMemoryManagedObjectContext() -> NSManagedObjectContext {
-    let managedObjectModel = NSManagedObjectModel.mergedModel(from: [Bundle.main])!
-
-    let persistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: managedObjectModel)
+    let path = Bundle.main.path(forResource: "MobileOrg2", ofType: "momd")
+    let momURL = URL.init(fileURLWithPath: path!)
+    let managedObjectModel = NSManagedObjectModel.init(contentsOf: momURL)
+
+    let persistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: managedObjectModel!)
     try! persistentStoreCoordinator.addPersistentStore(ofType: NSInMemoryStoreType, configurationName: nil, at: nil, options: nil)
 
     let managedObjectContext = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)