Merge pull request #460 from jinmay/master

Edit key in each test function
gureum · Nov 25, 2018 · 4a03abc · 4a03abc
2 parents b01644d + c6fad66
commit 4a03abc
Showing 1 changed file with 33 additions and 33 deletions.
diff --git a/GureumTests/GureumTests.swift b/GureumTests/GureumTests.swift
@@ -67,25 +67,25 @@ class GureumTests: XCTestCase {
         for app in self.apps{
             app.client.string=""
             app.controller.setValue(GureumInputSourceIdentifier.qwerty.rawValue, forTag : kTextServiceInputModePropertyTag, client : app.client)
-            app.inputText("m",key:46, modifiers:NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("r",key:15, modifiers:NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("2",key:19, modifiers:NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("m", key: UInt(kVK_ANSI_M), modifiers:NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("r", key: UInt(kVK_ANSI_R), modifiers:NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("2", key: UInt(kVK_ANSI_2), modifiers:NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("mr2", app.client.string, "buffer: \(app.client.string), app: \(app)")
             app.client.string=""
             app.controller.setValue(GureumInputSourceIdentifier.qwerty.rawValue, forTag : kTextServiceInputModePropertyTag, client : app.client)
-            app.inputText("m",key:46, modifiers: NSEvent.ModifierFlags(rawValue: 0x10000))
-            app.inputText("r",key:15, modifiers:NSEvent.ModifierFlags(rawValue: 0x10000))
-            app.inputText("2",key:19, modifiers:NSEvent.ModifierFlags(rawValue: 0x10000))
+            app.inputText("m", key: UInt(kVK_ANSI_M), modifiers:NSEvent.ModifierFlags(rawValue: 0x10000))
+            app.inputText("r", key: UInt(kVK_ANSI_R), modifiers:NSEvent.ModifierFlags(rawValue: 0x10000))
+            app.inputText("2", key: UInt(kVK_ANSI_2), modifiers:NSEvent.ModifierFlags(rawValue: 0x10000))
             XCTAssertEqual("MR2", app.client.string, "buffer: \(app.client.string), app: \(app)")
         }
     }
     func testHanjaSyllable() {
         for app in self.apps {
             app.client.string = ""
             app.controller.setValue(GureumInputSourceIdentifier.han3Final.rawValue, forTag: kTextServiceInputModePropertyTag, client: app.client)
-            app.inputText("m", key: 46, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("f", key: 3, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("s", key: 1, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("m", key: UInt(kVK_ANSI_M) , modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("f", key: UInt(kVK_ANSI_F) , modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("s", key: UInt(kVK_ANSI_S) , modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("한", app.client.string, "buffer: \(app.client.string), app: \(app)")
             XCTAssertEqual("한", app.client.markedString(), "buffer: \(app.client.string), app: \(app)")
             app.inputText("\n", key: 36, modifiers: NSEvent.ModifierFlags.option)
@@ -324,11 +324,11 @@ class GureumTests: XCTestCase {
             app.client.string = ""
             app.controller.setValue(GureumInputSourceIdentifier.colemak.rawValue, forTag:kTextServiceInputModePropertyTag, client: app.client)
 
-            app.inputText("h", key: 4, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("k", key: 40,modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("u", key: 32,modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("u", key: 32,modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText(";", key: 41,modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("h", key: UInt(kVK_ANSI_H), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("k", key: UInt(kVK_ANSI_K), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("u", key: UInt(kVK_ANSI_U), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("u", key: UInt(kVK_ANSI_U), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText(";", key: UInt(kVK_ANSI_Semicolon), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("hello", app.client.string, "buffer: \(app.client.string) app: \(app)")
 
         }
@@ -339,34 +339,34 @@ class GureumTests: XCTestCase {
             app.client.string = ""
             app.controller.setValue(GureumInputSourceIdentifier.han2.rawValue, forTag:kTextServiceInputModePropertyTag, client: app.client)
 
-            app.inputText("g", key: 5, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("k", key: 40, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("s", key: 1, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("g", key: UInt(kVK_ANSI_G), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("k", key: UInt(kVK_ANSI_K), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("s", key: UInt(kVK_ANSI_S), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("한", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("한", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
-            app.inputText("r", key: 15, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("r", key: UInt(kVK_ANSI_R), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("한ㄱ", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("ㄱ", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
-            app.inputText("m", key: 46, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("f", key: 3, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("m", key: UInt(kVK_ANSI_M), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("f", key: UInt(kVK_ANSI_F), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("한글", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("글", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
-            app.inputText(" ", key: 49, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText(" ", key: UInt(kVK_Space), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("한글 ", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
 
-            app.inputText("g", key: 5, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("g", key: UInt(kVK_ANSI_G), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("한글 ㅎ", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("ㅎ", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
-            app.inputText("k", key: 40, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("s", key: 1, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("k", key: UInt(kVK_ANSI_K), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("s", key: UInt(kVK_ANSI_S), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("한글 한", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("한", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
-            app.inputText("r", key: 15, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("r", key: UInt(kVK_ANSI_R), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("한글 한ㄱ", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("ㄱ", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
-            app.inputText("m", key: 46, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("f", key: 3, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("m", key: UInt(kVK_ANSI_M), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("f", key: UInt(kVK_ANSI_F), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("한글 한글", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("글", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
             app.inputText("\n", key: 36, modifiers: NSEvent.ModifierFlags(rawValue: 0))
@@ -381,18 +381,18 @@ class GureumTests: XCTestCase {
             app.client.string = ""
             app.controller.setValue(GureumInputSourceIdentifier.han3Final.rawValue, forTag:kTextServiceInputModePropertyTag, client: app.client)
 
-            app.inputText("m", key: 46, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("r", key: 15, modifiers: NSEvent.ModifierFlags(rawValue: 0))
-            app.inputText("2", key: 19, modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("m", key: UInt(kVK_ANSI_M), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("r", key: UInt(kVK_ANSI_R), modifiers: NSEvent.ModifierFlags(rawValue: 0))
+            app.inputText("2", key: UInt(kVK_ANSI_2), modifiers: NSEvent.ModifierFlags(rawValue: 0))
             XCTAssertEqual("했", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("했", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
 
             app.inputText(" ", key: 49, modifiers: NSEvent.ModifierFlags(rawValue: 0))
 
             app.client.string = ""
-            app.inputText("m", key: 46, modifiers: NSEvent.ModifierFlags(rawValue: 0x10000))
-            app.inputText("r", key: 15, modifiers: NSEvent.ModifierFlags(rawValue: 0x10000))
-            app.inputText("2", key: 19, modifiers: NSEvent.ModifierFlags(rawValue: 0x10000))
+            app.inputText("m", key: UInt(kVK_ANSI_M), modifiers: NSEvent.ModifierFlags(rawValue: 0x10000))
+            app.inputText("r", key: UInt(kVK_ANSI_R), modifiers: NSEvent.ModifierFlags(rawValue: 0x10000))
+            app.inputText("2", key: UInt(kVK_ANSI_2), modifiers: NSEvent.ModifierFlags(rawValue: 0x10000))
             XCTAssertEqual("했", app.client.string, "buffer: \(app.client.string) app: \(app)")
             XCTAssertEqual("했", app.client.markedString(), "buffer: \(app.client.string) app: \(app)")
         }