Rename *ListSelectorDataSource to *ListSelectorCommand and update unit tests.

jaclync · jaclync · commit f1790acecf10 · 2020-04-27T16:15:25.000+08:00
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/Edit Price/ProductPriceSettingsViewController.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/Edit Price/ProductPriceSettingsViewController.swift
@@ -229,7 +229,7 @@ extension ProductPriceSettingsViewController: UITableViewDelegate {
             viewModel.handleSaleEndDateChange(nil)
             refreshViewContent()
         case .taxStatus:
-            let command = ProductTaxStatusListSelectorDataSource(selected: viewModel.taxStatus)
+            let command = ProductTaxStatusListSelectorCommand(selected: viewModel.taxStatus)
             let listSelectorViewController = ListSelectorViewController(command: command) { [weak self] selected in
                                                                             if let selected = selected {
                                                                                 self?.viewModel.handleTaxStatusChange(selected)
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/Inventory Settings/ProductInventorySettingsViewController.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/Inventory Settings/ProductInventorySettingsViewController.swift
@@ -316,14 +316,14 @@ extension ProductInventorySettingsViewController: UITableViewDelegate {
 
         switch rowAtIndexPath(indexPath) {
         case .stockStatus:
-            let command = ProductStockStatusListSelectorDataSource(selected: stockStatus)
+            let command = ProductStockStatusListSelectorCommand(selected: stockStatus)
             let listSelectorViewController = ListSelectorViewController(command: command) { [weak self] selected in
                                                                             self?.stockStatus = selected
                                                                             self?.tableView.reloadData()
             }
             navigationController?.pushViewController(listSelectorViewController, animated: true)
         case .backorders:
-            let command = ProductBackordersSettingListSelectorDataSource(selected: backordersSetting)
+            let command = ProductBackordersSettingListSelectorCommand(selected: backordersSetting)
             let listSelectorViewController = ListSelectorViewController(command: command) { [weak self] selected in
                                                                             self?.backordersSetting = selected
                                                                             self?.tableView.reloadData()
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/List Selector Data Source/ProductBackordersSettingListSelectorCommand.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/List Selector Data Source/ProductBackordersSettingListSelectorCommand.swift
@@ -3,7 +3,7 @@ import Yosemite
 
 /// `ListSelectorCommand` for selecting a Product Backorders Setting.
 ///
-final class ProductBackordersSettingListSelectorDataSource: ListSelectorCommand {
+final class ProductBackordersSettingListSelectorCommand: ListSelectorCommand {
     typealias Model = ProductBackordersSetting
     typealias Cell = BasicTableViewCell
 
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/List Selector Data Source/ProductStockStatusListSelectorCommand.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/List Selector Data Source/ProductStockStatusListSelectorCommand.swift
@@ -3,7 +3,7 @@ import Yosemite
 
 /// `ListSelectorCommand` for selecting a Product Stock Status.
 ///
-final class ProductStockStatusListSelectorDataSource: ListSelectorCommand {
+final class ProductStockStatusListSelectorCommand: ListSelectorCommand {
     typealias Model = ProductStockStatus
     typealias Cell = BasicTableViewCell
 
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/List Selector Data Source/ProductTaxStatusListSelectorCommand.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/List Selector Data Source/ProductTaxStatusListSelectorCommand.swift
@@ -3,7 +3,7 @@ import Yosemite
 
 /// `ListSelectorCommand` for selecting a Product Tax Status.
 ///
-final class ProductTaxStatusListSelectorDataSource: ListSelectorCommand {
+final class ProductTaxStatusListSelectorCommand: ListSelectorCommand {
     typealias Model = ProductTaxStatus
     typealias Cell = BasicTableViewCell
 
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/List Selector Data Source/ProductStatusSettingListSelectorCommand.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/List Selector Data Source/ProductStatusSettingListSelectorCommand.swift
@@ -3,7 +3,7 @@ import Yosemite
 
 /// `ListSelectorCommand` for selecting a Product Status Setting.
 ///
-final class ProductStatusSettingListSelectorDataSource: ListSelectorCommand {
+final class ProductStatusSettingListSelectorCommand: ListSelectorCommand {
     typealias Model = ProductStatus
     typealias Cell = BasicTableViewCell
 
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/ProductSettingsRows.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/ProductSettingsRows.swift
@@ -44,7 +44,7 @@ enum ProductSettingsRows {
         }
 
         func handleTap(sourceViewController: UIViewController, onCompletion: @escaping (ProductSettings) -> Void) {
-            let command = ProductStatusSettingListSelectorDataSource(selected: settings.status)
+            let command = ProductStatusSettingListSelectorCommand(selected: settings.status)
 
             let listSelectorViewController = ListSelectorViewController(command: command) { selected in
 
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductBackordersSettingListSelectorCommandTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductBackordersSettingListSelectorCommandTests.swift
@@ -3,34 +3,35 @@ import XCTest
 @testable import WooCommerce
 @testable import Yosemite
 
-final class ProductBackordersSettingListSelectorDataSourceTests: XCTestCase {
+final class ProductBackordersSettingListSelectorCommandTests: XCTestCase {
 
     func testSelectedSetting() {
         let expectedSetting = ProductBackordersSetting.notAllowed
         let product = MockProduct().product(backordersSetting: expectedSetting)
-        var dataSource = ProductBackordersSettingListSelectorDataSource(selected: product.backordersSetting)
-        XCTAssertEqual(dataSource.selected, expectedSetting)
+        let command = ProductBackordersSettingListSelectorCommand(selected: product.backordersSetting)
+        let viewController = ListSelectorViewController(command: command, onDismiss: { _ in })
+        XCTAssertEqual(command.selected, expectedSetting)
 
         let newSetting = ProductBackordersSetting.allowedAndNotifyCustomer
-        dataSource.handleSelectedChange(selected: newSetting)
-        XCTAssertEqual(dataSource.selected, newSetting)
+        command.handleSelectedChange(selected: newSetting, viewController: viewController)
+        XCTAssertEqual(command.selected, newSetting)
     }
 
     func testSettingListData() {
-        let dataSource = ProductBackordersSettingListSelectorDataSource(selected: nil)
-        XCTAssertEqual(dataSource.data.count, 3)
+        let command = ProductBackordersSettingListSelectorCommand(selected: nil)
+        XCTAssertEqual(command.data.count, 3)
     }
 
     func testCellConfiguration() {
         let product = MockProduct().product()
-        let dataSource = ProductBackordersSettingListSelectorDataSource(selected: product.backordersSetting)
+        let command = ProductBackordersSettingListSelectorCommand(selected: product.backordersSetting)
         let nib = Bundle.main.loadNibNamed(BasicTableViewCell.classNameWithoutNamespaces, owner: self, options: nil)
         guard let cell = nib?.first as? BasicTableViewCell else {
             XCTFail()
             return
         }
 
-        dataSource.configureCell(cell: cell, model: product.backordersSetting)
+        command.configureCell(cell: cell, model: product.backordersSetting)
 
         XCTAssertEqual(cell.textLabel?.text, product.backordersSetting.description)
     }
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductStatusSettingListSelectorCommandTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductStatusSettingListSelectorCommandTests.swift
@@ -0,0 +1,39 @@
+import XCTest
+
+@testable import WooCommerce
+@testable import Yosemite
+
+final class ProductStatusSettingListSelectorCommandTests: XCTestCase {
+
+    func testSelectedSetting() {
+        let expectedSetting = ProductStatus.publish
+        let product = MockProduct().product(status: expectedSetting)
+        let command = ProductStatusSettingListSelectorCommand(selected: product.productStatus)
+        let viewController = ListSelectorViewController(command: command, onDismiss: { _ in })
+        XCTAssertEqual(command.selected, expectedSetting)
+
+        let newSetting = ProductStatus.pending
+        command.handleSelectedChange(selected: newSetting, viewController: viewController)
+        XCTAssertEqual(command.selected, newSetting)
+    }
+
+    func testSettingListData() {
+        let command = ProductStatusSettingListSelectorCommand(selected: nil)
+        XCTAssertEqual(command.data.count, 4)
+    }
+
+    func testCellConfiguration() {
+        let product = MockProduct().product()
+        let command = ProductStatusSettingListSelectorCommand(selected: product.productStatus)
+        let nib = Bundle.main.loadNibNamed(BasicTableViewCell.classNameWithoutNamespaces, owner: self, options: nil)
+        guard let cell = nib?.first as? BasicTableViewCell else {
+            XCTFail()
+            return
+        }
+
+        command.configureCell(cell: cell, model: product.productStatus)
+
+        XCTAssertEqual(cell.textLabel?.text, product.productStatus.description)
+    }
+
+}
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductStatusSettingListSelectorDataSourceTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductStatusSettingListSelectorDataSourceTests.swift
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductStockStatusListSelectorCommandTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductStockStatusListSelectorCommandTests.swift
@@ -3,36 +3,37 @@ import XCTest
 @testable import WooCommerce
 @testable import Yosemite
 
-final class ProductStockStatusListSelectorDataSourceTests: XCTestCase {
+final class ProductStockStatusListSelectorCommandTests: XCTestCase {
 
     func testSelectedStatus() {
         let expectedStockStatus = ProductStockStatus.outOfStock
         let product = MockProduct().product(stockStatus: expectedStockStatus)
-        var dataSource = ProductStockStatusListSelectorDataSource(selected: product.productStockStatus)
-        XCTAssertEqual(dataSource.selected, expectedStockStatus)
+        let command = ProductStockStatusListSelectorCommand(selected: product.productStockStatus)
+        let viewController = ListSelectorViewController(command: command, onDismiss: { _ in })
+        XCTAssertEqual(command.selected, expectedStockStatus)
 
         let newStockStatus = ProductStockStatus.inStock
-        dataSource.handleSelectedChange(selected: newStockStatus)
-        XCTAssertEqual(dataSource.selected, newStockStatus)
+        command.handleSelectedChange(selected: newStockStatus, viewController: viewController)
+        XCTAssertEqual(command.selected, newStockStatus)
     }
 
     func testStockStatusListData() {
         let product = MockProduct().product()
-        let dataSource = ProductStockStatusListSelectorDataSource(selected: product.productStockStatus)
-        XCTAssertEqual(dataSource.data.count, 3)
+        let command = ProductStockStatusListSelectorCommand(selected: product.productStockStatus)
+        XCTAssertEqual(command.data.count, 3)
     }
 
     func testCellConfiguration() {
         let product = MockProduct().product()
-        let dataSource = ProductStockStatusListSelectorDataSource(selected: product.productStockStatus)
+        let command = ProductStockStatusListSelectorCommand(selected: product.productStockStatus)
         let nib = Bundle.main.loadNibNamed(BasicTableViewCell.classNameWithoutNamespaces, owner: self, options: nil)
         guard let cell = nib?.first as? BasicTableViewCell else {
             XCTFail()
             return
         }
 
         let status = ProductStockStatus.onBackOrder
-        dataSource.configureCell(cell: cell, model: status)
+        command.configureCell(cell: cell, model: status)
 
         XCTAssertEqual(cell.textLabel?.text, status.description)
     }
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductTaxStatusListSelectorCommandTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductTaxStatusListSelectorCommandTests.swift
@@ -0,0 +1,38 @@
+import XCTest
+
+@testable import WooCommerce
+@testable import Yosemite
+
+final class ProductTaxStatusListSelectorCommandTests: XCTestCase {
+
+    func testSelectedTaxStatus() {
+
+        let taxStatus = ProductTaxStatus.taxable
+        let command = ProductTaxStatusListSelectorCommand(selected: taxStatus)
+        let viewController = ListSelectorViewController(command: command, onDismiss: { _ in })
+        XCTAssertEqual(command.selected, taxStatus)
+
+        let newTaxStatus = ProductTaxStatus.shipping
+        command.handleSelectedChange(selected: newTaxStatus, viewController: viewController)
+        XCTAssertEqual(command.selected, newTaxStatus)
+
+        // Select the same data twice should not clear the selected data.
+        command.handleSelectedChange(selected: newTaxStatus, viewController: ProductTaxStatusListSelectorCommand.ViewController(coder: NSCoder())!)
+        XCTAssertNotNil(command.selected)
+    }
+
+    func testCellConfiguration() {
+        let taxStatus = ProductTaxStatus.taxable
+        let command = ProductTaxStatusListSelectorCommand(selected: taxStatus)
+        let nib = Bundle.main.loadNibNamed(BasicTableViewCell.classNameWithoutNamespaces, owner: self, options: nil)
+        guard let cell = nib?.first as? BasicTableViewCell else {
+            XCTFail()
+            return
+        }
+
+        command.configureCell(cell: cell, model: taxStatus)
+
+        XCTAssertEqual(cell.textLabel?.text, taxStatus.description)
+    }
+
+}
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductTaxStatusListSelectorDataSourceTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/ListSelector/ProductTaxStatusListSelectorDataSourceTests.swift

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ enum ProductSettingsRows {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func handleTap(sourceViewController: UIViewController, onCompletion: @escaping (ProductSettings) -> Void) {`
`47`		`- let command = ProductStatusSettingListSelectorDataSource(selected: settings.status)`
	`47`	`+ let command = ProductStatusSettingListSelectorCommand(selected: settings.status)`
`48`	`48`
`49`	`49`	`let listSelectorViewController = ListSelectorViewController(command: command) { selected in`
`50`	`50`