fixed tests

dkandalov · Aug 10, 2017 · 13590fe · 13590fe
1 parent cb97a79
commit 13590fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/ijkl/keymap-modifier.kt b/src/ijkl/keymap-modifier.kt
@@ -22,7 +22,7 @@ fun initCurrentKeymapModifier(
     logger: Logger,
     actionManager: ActionManager = ActionManager.getInstance()
 ) {
-    var shortcuts = IjklShortcuts(all = keymapInputStream.readShortcutsData())
+    var shortcuts = IjklShortcuts(keymapInputStream.readShortcutsData())
 
     registerKeymapListener(application, object: KeymapChangeListener {
         override fun onChange(oldKeymap: Keymap?, newKeymap: Keymap?) {

diff --git a/src/ijkl/shortcut-reader.kt b/src/ijkl/shortcut-reader.kt
@@ -8,9 +8,7 @@ import java.io.InputStream
 import javax.swing.KeyStroke
 import javax.xml.parsers.DocumentBuilderFactory
 
-fun InputStream.readShortcutsData(): List<ShortcutData> {
-    return use { readShortcutsDataFrom(this) }
-}
+fun InputStream.readShortcutsData(): List<ShortcutData> = use { readShortcutsDataFrom(this) }
 
 private fun readShortcutsDataFrom(inputStream: InputStream): List<ShortcutData> {
     fun Node.getAttribute(name: String): String? =

diff --git a/test/ijkl/Tests.kt b/test/ijkl/Tests.kt
@@ -10,15 +10,15 @@ import java.util.regex.Pattern
 class Tests {
     @Test fun `win, linux keymap xml`() {
         resourceInputStream("ijkl-keymap.xml").readShortcutsData().validate(
-            amountOfActions = 46,
-            amountOfShortcuts = 49
+            amountOfActions = 48,
+            amountOfShortcuts = 51
         )
     }
 
     @Test fun `osx keymap xml`() {
         resourceInputStream("ijkl-osx-keymap.xml").readShortcutsData().validate(
-            amountOfActions = 46,
-            amountOfShortcuts = 50
+            amountOfActions = 48,
+            amountOfShortcuts = 52
         )
     }