Test fixes

Change-Id: I365789e0aedc0bdc8a8ee2c5fc7a4ebf90425ad9

Author: dukov

tests/osx/SKBase.applescript

@@ -63,6 +63,16 @@ BaseTestCase.prototype.quitByHotkey = function() {
     this.sendKeyCombination(['command down'], 'q')
 }
 
+BaseTestCase.prototype.quitApp = function(appname = '') {
+    if (appname != '') {
+        an = appname
+    } else {
+        an = this.appname
+    }
+    app = Application(an)
+    app.quit()
+}
+
 BaseTestCase.prototype.typeString = function(str) {
     var customKeyCodes = {
         "0":29,

tests/osx/run_tests.sh

@@ -16,7 +16,7 @@ function runAll() {
         echo  -e "${BASE_LIB}\n${tst}" | osascript -l JavaScript
         if [ $? != 0 ]
         then
-            let ERR_COUNT=${ERR_COUNT} + 1
+            let ERR_COUNT=${ERR_COUNT}+1
         fi
         echo
     done

tests/osx/test_base_paste_ops.applescript

@@ -9,7 +9,7 @@ function SKBasePasteOps() {
         this.runApp(this.bundle_path, this.appname, 1)
         assert(this.isAppRunning(this.appname), true)
 
-        this.quitByHotkey()
+        this.quitApp()
         delay(1)
         assert(this.isAppRunning(this.appname), false)
     }
@@ -23,7 +23,7 @@ function SKBasePasteOps() {
         assert(this.isAppRunning(this.appname), true)
 
         this.runApp(this.bundle_path, this.appname, 1)
-        this.quitByHotkey()
+        this.quitApp()
         delay(1)
         assert(this.isAppRunning(this.appname), false)
     }
@@ -53,7 +53,7 @@ function SKBasePasteOps() {
 	    delay(1)
 
         this.runApp(this.terminal_bundle, this.terminal_app, 2)
-        this.quitByHotkey()
+        this.quitApp(this.terminal_app)
         delay(2)
 
 	    res = this.runShellCmd("cat /tmp/test" + timeStamp)