Test reading token value in different order

Author: shavit

Sources/Hub/Hub.swift

@@ -100,11 +100,11 @@ public struct Config {
     }
 
     /// Tuple of token identifier and string value
-    public var tokenValue: (UInt, String)? { 
-        switch value {
+    public var tokenValue: (UInt, String)? {
+        guard let pair = value as? [Any], pair.count == 2 else { return nil }
+        switch (pair[0], pair[1]) {
         case let (i, t) as (UInt, String): return (i, t)
         case let (t, i) as (String, UInt): return (i, t)
-        case let a as [Any] where a.count == 2: return (a[1], a[0]) as? (UInt, String)
         default: return nil
         }
     }

Tests/HubTests/HubTests.swift

@@ -118,4 +118,14 @@ class HubTests: XCTestCase {
         let vocab_dict = config.dictionary["vocab"] as! [String: Int]
         XCTAssertNotEqual(vocab_dict.count, 2)
     }
+
+    func testConfigTokenValueDifferentOrder() {
+        let data: Data! = "{\"sep\": [\"</s>\", 2], \"cls\": [0, \"<s>\"]}".data(using: .utf8)
+        let dict = try! JSONSerialization.jsonObject(with: data, options: []) as! [NSString: Any]
+        let config = Config(dict)
+        XCTAssertEqual(config.sep!.tokenValue!.0, 2)
+        XCTAssertEqual(config.sep!.tokenValue!.1, "</s>")
+        XCTAssertEqual(config.cls!.tokenValue!.0, 0)
+        XCTAssertEqual(config.cls!.tokenValue!.1, "<s>")
+    }
 }