Fix issues with previous PR

oreillymedia · Mar 22, 2019 · 67f8e6a · 67f8e6a
1 parent 45f999f
commit 67f8e6a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 24 deletions.
diff --git a/Example/AutomaticViewController.swift b/Example/AutomaticViewController.swift
@@ -26,7 +26,7 @@ class AutomaticViewController: UIViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        dataSource.execute()
+        dataSource.startListening()
     }
 
 

diff --git a/Flapjack/Core/DataSource.swift b/Flapjack/Core/DataSource.swift
@@ -87,7 +87,8 @@ public protocol DataSource {
 /**
  This stub implementation of `DataSource` makes it relatively easy to build your own by only having to implement a few
  short properties/functions, especially if you're managing a non-grouped set of objects. Simply implement `allObjects`
- and `execute()`, make sure you call `onChange` when the data set changes, and everything else should hinge on that.
+ and `startListening()`, make sure you call `onChange` when the data set changes, and everything else should hinge on
+ that.
  */
 public extension DataSource {
     /// If not implemented, this returns the `count` of `allObjects`.

diff --git a/Flapjack/CoreData/SingleCoreDataSource.swift b/Flapjack/CoreData/SingleCoreDataSource.swift
@@ -145,7 +145,7 @@ public class SingleCoreDataSource<T: NSManagedObject & DataObject>: NSObject, Si
 
         // Store our newly-minted context, and refetch.
         self.context = newContext
-        execute()
+        startListening()
     }
 
     @objc

diff --git a/Tests/CoreData/CoreDataSourceTests.swift b/Tests/CoreData/CoreDataSourceTests.swift
@@ -56,7 +56,7 @@ class CoreDataSourceTests: XCTestCase {
 
     func testObjectsArePopulatedAfterExecution() {
         let dataSource = CoreDataSource<MockEntity>(dataAccess: dataAccess)
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertEqual(dataSource.numberOfObjects, 5)
         XCTAssertEqual(dataSource.allObjects.count, 5)
         XCTAssertEqual(dataSource.numberOfSections, 1)
@@ -88,7 +88,7 @@ class CoreDataSourceTests: XCTestCase {
             XCTAssertEqual(items.count, 2)
             XCTAssertEqual(sections.count, 0)
         }
-        dataSource.execute()
+        dataSource.startListening()
         _ = dataAccess.mainContext.create(MockEntity.self, attributes: ["someProperty": "someValue alpha"])
         dataAccess.mainContext.destroy(object: entityOne)
         dataAccess.mainContext.persist()
@@ -100,7 +100,7 @@ class CoreDataSourceTests: XCTestCase {
 
     func testFilteredFetchOnlyReturnsThoseMatching() {
         let dataSource = CoreDataSource<MockEntity>(dataAccess: dataAccess, attributes: ["someProperty": "someValue alpha"])
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertEqual(dataSource.numberOfObjects, 2)
         XCTAssertEqual(dataSource.allObjects.count, 2)
         XCTAssertTrue(dataSource.allObjects.contains(entityOne))
@@ -111,7 +111,7 @@ class CoreDataSourceTests: XCTestCase {
 
     func testFilteredAutomaticallyUpdatesAllObjectsOnChange() {
         let dataSource = CoreDataSource<MockEntity>(dataAccess: dataAccess, attributes: ["someProperty": "someValue alpha"])
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertEqual(dataSource.numberOfObjects, 2)
         XCTAssertEqual(dataSource.allObjects.count, 2)
 
@@ -123,7 +123,7 @@ class CoreDataSourceTests: XCTestCase {
 
     func testFilteredAutomaticallyUpdatesAllObjectsOnDestroy() {
         let dataSource = CoreDataSource<MockEntity>(dataAccess: dataAccess, attributes: ["someProperty": "someValue alpha"])
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertEqual(dataSource.numberOfObjects, 2)
         XCTAssertEqual(dataSource.allObjects.count, 2)
         dataAccess.mainContext.destroy(object: entityOne)
@@ -134,7 +134,7 @@ class CoreDataSourceTests: XCTestCase {
 
     func testFilteredAutomaticallyIncludesNewMatchingObjects() {
         let dataSource = CoreDataSource<MockEntity>(dataAccess: dataAccess, attributes: ["someProperty": "someValue alpha"])
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertEqual(dataSource.numberOfObjects, 2)
         XCTAssertEqual(dataSource.allObjects.count, 2)
 
@@ -150,15 +150,15 @@ class CoreDataSourceTests: XCTestCase {
 
     func testSortedReturnsObjectsInProperOrder() {
         let dataSource = CoreDataSource<MockEntity>(dataAccess: dataAccess, sorters: [SortDescriptor("someProperty", ascending: false)])
-        dataSource.execute()
+        dataSource.startListening()
         // entityOne and entityTwo could be in either position 1 or 2
         XCTAssertEqual(dataSource.allObjects.first, entityFour)
         XCTAssertEqual(dataSource.allObjects.last, entityFive)
     }
 
     func testSortedReturnsObjectsInProperOrderEvenWithNewItemsOrChanges() {
         let dataSource = CoreDataSource<MockEntity>(dataAccess: dataAccess, sorters: [SortDescriptor("someProperty", ascending: false)])
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertEqual(dataSource.allObjects.first, entityFour)
         XCTAssertEqual(dataSource.allObjects.last, entityFive)
 
@@ -184,7 +184,7 @@ class CoreDataSourceTests: XCTestCase {
             XCTAssertEqual(sections.count, 3)
         }
 
-        dataSource.execute()
+        dataSource.startListening()
 
         XCTAssertEqual(dataSource.numberOfObjects, 5)
         XCTAssertEqual(dataSource.numberOfSections, 4)
@@ -207,7 +207,7 @@ class CoreDataSourceTests: XCTestCase {
 
     func testLimitedOnlyReturnsThoseFallingInUnderTheLimit() {
         let dataSource = CoreDataSource<MockEntity>(dataAccess: dataAccess, sorters: [SortDescriptor("someProperty", ascending: false)], limit: 2)
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertEqual(dataSource.numberOfObjects, 2)
         XCTAssertEqual(dataSource.allObjects.count, 2)
         XCTAssertFalse(dataSource.allObjects.contains(entityOne))
@@ -219,7 +219,7 @@ class CoreDataSourceTests: XCTestCase {
 
     func testLimitedAutomaticallyUpdatesAllObjectsOnChange() {
         let dataSource = CoreDataSource<MockEntity>(dataAccess: dataAccess, sorters: [SortDescriptor("someProperty", ascending: false)], limit: 2)
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertEqual(dataSource.numberOfObjects, 2)
         XCTAssertEqual(dataSource.allObjects.count, 2)
 

diff --git a/Tests/CoreData/SingleCoreDataSourceTests.swift b/Tests/CoreData/SingleCoreDataSourceTests.swift
@@ -46,11 +46,11 @@ class SingleCoreDataSourceTests: XCTestCase {
 
     func testExecutionFetchesRightAway() {
         XCTAssertNil(dataSource.object)
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertEqual(dataSource.object, entity)
     }
 
-    func testCoreDataNotificationNotPickedUpBeforeExecute() {
+    func testCoreDataNotificationNotPickedUpBeforestartListening() {
         let expect = expectation(description: "did change block")
         expect.isInverted = true
         dataSource.onChange = { object in
@@ -68,7 +68,7 @@ class SingleCoreDataSourceTests: XCTestCase {
         dataSource.onChange = { object in
             expect.fulfill()
         }
-        dataSource.execute()
+        dataSource.startListening()
         waitForExpectations(timeout: 0.5) { XCTAssertNil($0) }
     }
 
@@ -78,7 +78,7 @@ class SingleCoreDataSourceTests: XCTestCase {
         dataSource.onChange = { object in
             expect.fulfill()
         }
-        dataSource.execute()
+        dataSource.startListening()
         entity.someProperty = "some new value"
         dataAccess.mainContext.persist()
         waitForExpectations(timeout: 0.5) { XCTAssertNil($0) }
@@ -90,7 +90,7 @@ class SingleCoreDataSourceTests: XCTestCase {
         dataSource.onChange = { object in
             expect.fulfill()
         }
-        dataSource.execute()
+        dataSource.startListening()
         entity.someProperty = "some new value"
         dataAccess.mainContext.processPendingChanges()
         waitForExpectations(timeout: 0.5) { XCTAssertNil($0) }
@@ -105,7 +105,7 @@ class SingleCoreDataSourceTests: XCTestCase {
         dataSource.onChange = { object in
             expect.fulfill()
         }
-        dataSource.execute()
+        dataSource.startListening()
         entity.someProperty = "some new value"
         otherEntity.someProperty = "other other value"
         dataAccess.mainContext.persist()
@@ -116,7 +116,7 @@ class SingleCoreDataSourceTests: XCTestCase {
         dataAccess.mainContext.destroy(object: entity)
         dataAccess.mainContext.persist()
 
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertNil(dataSource.object)
     }
 
@@ -126,7 +126,7 @@ class SingleCoreDataSourceTests: XCTestCase {
         dataSource.onChange = { object in
             expect.fulfill()
         }
-        dataSource.execute()
+        dataSource.startListening()
         dataAccess.mainContext.destroy(object: entity)
         waitForExpectations(timeout: 0.5) { XCTAssertNil($0) }
         XCTAssertNil(dataSource.object)
@@ -141,7 +141,7 @@ class SingleCoreDataSourceTests: XCTestCase {
         dataSource.onChange = { object in
             expect.fulfill()
         }
-        dataSource.execute()
+        dataSource.startListening()
         XCTAssertNil(dataSource.object)
 
         let newEntity = dataAccess.mainContext.create(MockEntity.self, attributes: attributes)
@@ -159,7 +159,7 @@ class SingleCoreDataSourceTests: XCTestCase {
         dataSource.onChange = { object in
             expect.fulfill()
         }
-        dataSource.execute()
+        dataSource.startListening()
 
         entity.someProperty = "some new value"
         newEntity.someProperty = attributes["someProperty"]