Merge pull request #144 from woocommerce/issue/tableviewcell-extension

jleandroperez · web-flow · commit 816f91610142 · 2018-07-11T20:23:41.000Z
UITableViewCell: Default reuseIdentifier
diff --git a/WooCommerce/Classes/Authentication/Epilogue/EmptyStoresTableViewCell.swift b/WooCommerce/Classes/Authentication/Epilogue/EmptyStoresTableViewCell.swift
@@ -6,10 +6,6 @@ import UIKit
 ///
 class EmptyStoresTableViewCell: UITableViewCell {
 
-    /// UITableView's Reuse Identifier.
-    ///
-    static let reuseIdentifier = EmptyStoresTableViewCell.classNameWithoutNamespaces
-
     /// LegendLabel: To be displayed below the ImageView.
     ///
     @IBOutlet private var legendLabel: UILabel! {
diff --git a/WooCommerce/Classes/Extensions/UITableViewCell+Helpers.swift b/WooCommerce/Classes/Extensions/UITableViewCell+Helpers.swift
@@ -0,0 +1,14 @@
+import Foundation
+import UIKit
+
+
+/// UITableViewCell Helpers
+///
+extension UITableViewCell {
+
+    /// Returns a reuseIdentifier that matches the receiver's classname (non namespaced).
+    ///
+    class var reuseIdentifier: String {
+        return classNameWithoutNamespaces
+    }
+}
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/BillingDetailsTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/BillingDetailsTableViewCell.swift
@@ -4,7 +4,6 @@ class BillingDetailsTableViewCell: UITableViewCell {
     private var button = UIButton(type: .custom)
     @objc var didTapButton: (() -> Void)?
 
-    static let reuseIdentifier = "BillingDetailsTableViewCell"
 
     override func awakeFromNib() {
         super.awakeFromNib()
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/CustomerInfoTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/CustomerInfoTableViewCell.swift
@@ -17,7 +17,6 @@ class CustomerInfoTableViewCell: UITableViewCell {
         }
     }
 
-    static let reuseIdentifier = "CustomerInfoTableViewCell"
 
     var title: String? {
         get {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/CustomerNoteTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/CustomerNoteTableViewCell.swift
@@ -14,7 +14,6 @@ class CustomerNoteTableViewCell: UITableViewCell {
         }
     }
 
-    static let reuseIdentifier = "CustomerNoteTableViewCell"
 
     var quote: String? {
         get {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderNoteTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderNoteTableViewCell.swift
@@ -25,7 +25,6 @@ class OrderNoteTableViewCell: UITableViewCell {
         }
     }
 
-    static let reuseIdentifier = "OrderNoteTableViewCell"
 
     var dateCreated: String? {
         get {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/PaymentTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/PaymentTableViewCell.swift
@@ -26,7 +26,6 @@ class PaymentTableViewCell: UITableViewCell {
     @IBOutlet private weak var separatorLine: UIView!
     @IBOutlet private weak var footerValue: UILabel!
 
-    static let reuseIdentifier = "PaymentTableViewCell"
 
     override func awakeFromNib() {
         super.awakeFromNib()
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/ProductListTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/ProductListTableViewCell.swift
@@ -4,7 +4,6 @@ class ProductListTableViewCell: UITableViewCell {
     @IBOutlet private var verticalStackView: UIStackView!
     @IBOutlet private var fulfillButton: UIButton!
 
-    static let reuseIdentifier = "ProductListTableViewCell"
 
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/SummaryTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/SummaryTableViewCell.swift
@@ -7,7 +7,6 @@ class SummaryTableViewCell: UITableViewCell {
 
     var paymentBackgroundColor: UIColor = .clear
 
-    static let reuseIdentifier = "SummaryTableViewCell"
 
     var title: String? {
         get {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderListCell.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderListCell.swift
@@ -7,7 +7,6 @@ class OrderListCell: UITableViewCell {
     @IBOutlet var paymentStatusLabel: PaddedLabel!
     @IBOutlet var shippingStatusLabel: PaddedLabel!
 
-    static let reuseIdentifier = "OrderListCell"
 
     func configureCell(order: OrderDetailsViewModel) {
         titleLabel.text = order.summaryTitle
diff --git a/WooCommerce/Classes/ViewRelated/ReusableViews/AddItemTableViewCell.swift b/WooCommerce/Classes/ViewRelated/ReusableViews/AddItemTableViewCell.swift
@@ -2,8 +2,6 @@ import UIKit
 
 class AddItemTableViewCell: UITableViewCell {
 
-    static let reuseIdentifier = "AddItemTableViewCell"
-
     override func awakeFromNib() {
         super.awakeFromNib()
         imageView?.tintColor = StyleManager.wooCommerceBrandColor
diff --git a/WooCommerce/Classes/ViewRelated/ReusableViews/NoResultsTableViewCell.swift b/WooCommerce/Classes/ViewRelated/ReusableViews/NoResultsTableViewCell.swift
@@ -12,7 +12,6 @@ class NoResultsTableViewCell: UITableViewCell {
         }
     }
 
-    static let reuseIdentifier = "NoResultsTableViewCell"
 
     override func awakeFromNib() {
         super.awakeFromNib()
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -47,6 +47,8 @@
 		B57C744720F55BC800EEFC87 /* UIView+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57C744620F55BC800EEFC87 /* UIView+Helpers.swift */; };
 		B57C744A20F5649300EEFC87 /* EmptyStoresTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57C744920F5649300EEFC87 /* EmptyStoresTableViewCell.swift */; };
 		B57C744C20F564B400EEFC87 /* EmptyStoresTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B57C744B20F564B400EEFC87 /* EmptyStoresTableViewCell.xib */; };
+		B57C744E20F56E3800EEFC87 /* UITableViewCell+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57C744D20F56E3800EEFC87 /* UITableViewCell+Helpers.swift */; };
+		B57C745120F56EE900EEFC87 /* UITableViewCellHelpersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57C745020F56EE900EEFC87 /* UITableViewCellHelpersTests.swift */; };
 		B5A8532220BDBFAF00FAAB4D /* CircularImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A8532120BDBFAE00FAAB4D /* CircularImageView.swift */; };
 		B5A8F8A920B84D3F00D211DE /* ApiCredentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A8F8A720B84D3F00D211DE /* ApiCredentials.swift */; };
 		B5A8F8AD20B88D9900D211DE /* LoginPrologueViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A8F8AC20B88D9900D211DE /* LoginPrologueViewController.swift */; };
@@ -179,6 +181,8 @@
 		B57C744620F55BC800EEFC87 /* UIView+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Helpers.swift"; sourceTree = "<group>"; };
 		B57C744920F5649300EEFC87 /* EmptyStoresTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyStoresTableViewCell.swift; sourceTree = "<group>"; };
 		B57C744B20F564B400EEFC87 /* EmptyStoresTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EmptyStoresTableViewCell.xib; sourceTree = "<group>"; };
+		B57C744D20F56E3800EEFC87 /* UITableViewCell+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+Helpers.swift"; sourceTree = "<group>"; };
+		B57C745020F56EE900EEFC87 /* UITableViewCellHelpersTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITableViewCellHelpersTests.swift; sourceTree = "<group>"; };
 		B59F38DF20D40A24008C1829 /* WooCommerce.debug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WooCommerce.debug.entitlements; sourceTree = "<group>"; };
 		B59F38E020D40A24008C1829 /* WooCommerce.release.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WooCommerce.release.entitlements; sourceTree = "<group>"; };
 		B5A8532120BDBFAE00FAAB4D /* CircularImageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CircularImageView.swift; sourceTree = "<group>"; };
@@ -356,6 +360,7 @@
 		B56DB3E02049BFAA00D4AA8E /* WooCommerceTests */ = {
 			isa = PBXGroup;
 			children = (
+				B57C744F20F56ED300EEFC87 /* Extensions */,
 				B53B898A20D4606400EDB467 /* System */,
 				B5DBF3C120E1482900B53AED /* Yosemite */,
 				B56DB3E32049BFAA00D4AA8E /* Info.plist */,
@@ -407,6 +412,14 @@
 			path = Resources;
 			sourceTree = "<group>";
 		};
+		B57C744F20F56ED300EEFC87 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				B57C745020F56EE900EEFC87 /* UITableViewCellHelpersTests.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
 		B5A8F8A620B84CF600D211DE /* DerivedSources */ = {
 			isa = PBXGroup;
 			children = (
@@ -486,8 +499,9 @@
 				CE1F51262064345B00C6C810 /* UIColor+Helpers.swift */,
 				B5D1AFB920BC515600DB0E8C /* UIColor+Woo.swift */,
 				CE1F512820697F0100C6C810 /* UIFont+Helpers.swift */,
-				CE1F51242064179A00C6C810 /* UILabel+Helpers.swift */,
 				B5D1AFB720BC510200DB0E8C /* UIImage+Woo.swift */,
+				CE1F51242064179A00C6C810 /* UILabel+Helpers.swift */,
+				B57C744D20F56E3800EEFC87 /* UITableViewCell+Helpers.swift */,
 				B57C744620F55BC800EEFC87 /* UIView+Helpers.swift */,
 				B5AA7B3E20ED81C2004DA14F /* UserDefaults+Woo.swift */,
 			);
@@ -873,6 +887,7 @@
 				CE263DE8206ACE3E0015A693 /* MainTabBarController.swift in Sources */,
 				CE1EC8EC20B8A3FF009762BF /* AddItemTableViewCell.swift in Sources */,
 				B57C744520F55BA600EEFC87 /* NSObject+Helpers.swift in Sources */,
+				B57C744E20F56E3800EEFC87 /* UITableViewCell+Helpers.swift in Sources */,
 				7403F7E220EC04070097198F /* OrderStatusViewModel.swift in Sources */,
 				CE32B10D20BEDE1C006FBCF4 /* TwoColumnSectionHeaderView.swift in Sources */,
 				B5D1AFBA20BC515600DB0E8C /* UIColor+Woo.swift in Sources */,
@@ -889,6 +904,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B53B898920D450AF00EDB467 /* SessionManagerTests.swift in Sources */,
+				B57C745120F56EE900EEFC87 /* UITableViewCellHelpersTests.swift in Sources */,
 				B5DBF3C320E1484400B53AED /* StoresManagerTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/WooCommerce/WooCommerceTests/Extensions/UITableViewCellHelpersTests.swift b/WooCommerce/WooCommerceTests/Extensions/UITableViewCellHelpersTests.swift
@@ -0,0 +1,14 @@
+import XCTest
+@testable import WooCommerce
+
+
+// UITableViewCell+Helpers: Unit Tests
+//
+class UITableViewCellHelpersTests: XCTestCase {
+
+    /// Verifies that `reuseIdentifier` class method effectively returns a string that doesn't contain the class's module.
+    ///
+    func testReuseIdentifierEffectivelyReturnsClassnameWithNoNamespaces() {
+        XCTAssertEqual(EmptyStoresTableViewCell.reuseIdentifier, "EmptyStoresTableViewCell")
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ class CustomerInfoTableViewCell: UITableViewCell {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`		`- static let reuseIdentifier = "CustomerInfoTableViewCell"`
`21`	`20`
`22`	`21`	`var title: String? {`
`23`	`22`	`get {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ class CustomerNoteTableViewCell: UITableViewCell {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`- static let reuseIdentifier = "CustomerNoteTableViewCell"`
`18`	`17`
`19`	`18`	`var quote: String? {`
`20`	`19`	`get {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ class OrderNoteTableViewCell: UITableViewCell {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- static let reuseIdentifier = "OrderNoteTableViewCell"`
`29`	`28`
`30`	`29`	`var dateCreated: String? {`
`31`	`30`	`get {`