Update Dictionary lookup

instructure · May 10, 2019 · ca28f10 · ca28f10
1 parent 331f53d
commit ca28f10
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/SwiftUITest/XCElementType.swift b/SwiftUITest/XCElementType.swift
@@ -1,13 +1,12 @@
 import Foundation
 import XCTest
 
-
 private enum ElementType : String, CaseIterable, CustomStringConvertible {
     var description: String {
         return String(describing: self.rawValue)
     }
 
-    static var mapIntToStr: Dictionary<UInt, String> {
+    static var intToStr: [UInt: String] {
         var result = Dictionary<UInt, String>()
         var index = UInt(0)
         ElementType.allCases.forEach { (element) in
@@ -17,7 +16,7 @@ private enum ElementType : String, CaseIterable, CustomStringConvertible {
         return result
     }
 
-    static var mapStrToInt: Dictionary<String, UInt> {
+    static var strToInt: [String: UInt] {
         var result = Dictionary<String, UInt>()
         var index = UInt(0)
         ElementType.allCases.forEach { (element) in
@@ -119,12 +118,12 @@ public struct XCElementType  {
             return ele.description == type
             } ?? ElementType.any
 
-        let keyNumber = ElementType.mapStrToInt[found.description] ?? 0
+        let keyNumber = ElementType.strToInt[found.description] ?? 0
         return XCUIElement.ElementType.init(rawValue: keyNumber) ?? XCUIElement.ElementType.any
     }
 
     public static func from(_ index: UInt) -> String {
-        return ElementType.mapIntToStr[index] ?? ElementType.any.description
+        return ElementType.intToStr[index] ?? ElementType.any.description
     }
 
     public static let any: String = ElementType.any.description

diff --git a/Tests/XCElementType_Tests.swift b/Tests/XCElementType_Tests.swift
@@ -4,12 +4,17 @@ import SwiftUITest
 class XCElementType_Tests: SwiftUITestCase {
 
     func test_ElementType_to_string() {
-        XCTAssertTrue(XCElementType.any == "any")
-        XCTAssertTrue(XCElementType.other == "other")
+        XCTAssertEqual(XCElementType.any, "any")
+        XCTAssertEqual(XCElementType.other, "other")
     }
 
-    func test_string_to_ElementType() {
-        XCTAssertTrue(XCElementType.from(XCElementType.any) == XCUIElement.ElementType.any)
-        XCTAssertTrue(XCElementType.from(XCElementType.other) == XCUIElement.ElementType.other)
+    func test_from_string_to_ElementType() {
+        XCTAssertEqual(XCElementType.from(XCElementType.any), XCUIElement.ElementType.any)
+        XCTAssertEqual(XCElementType.from(XCElementType.other), XCUIElement.ElementType.other)
+    }
+
+    func test_from_uint_to_string() {
+        XCTAssertEqual(XCElementType.from(0), "any")
+        XCTAssertEqual(XCElementType.from(1), "other")
     }
 }