DEFEDIT-992 Make platform independent robot commands for smoke test and use them!

Author: markusgustavssonking

defold-robot/project.clj

@@ -1,20 +1,16 @@
-(defproject defold-robot "0.6.0"
-  :description "FIXME: write description"
-  :url "https://www.defold.com"
-  :license {:name "Eclipse Public License"
-            :url "http://www.eclipse.org/legal/epl-v10.html"}
+(defproject defold-robot "0.7.0"
   :dependencies [[org.clojure/clojure "1.10.0"]
                  [org.clojure/tools.cli "0.3.5"]
                  [commons-io/commons-io "2.4"]
                  [org.apache.ant/ant "1.10.1"]
-                 [org.openjfx/javafx-graphics "12-ea+8"]
-                 [org.openjfx/javafx-graphics "12-ea+8" :classifier "linux"]
-                 [org.openjfx/javafx-graphics "12-ea+8" :classifier "mac"]
-                 [org.openjfx/javafx-graphics "12-ea+8" :classifier "win"]
-                 [org.openjfx/javafx-swing "12-ea+8"]
-                 [org.openjfx/javafx-swing "12-ea+8" :classifier "linux"]
-                 [org.openjfx/javafx-swing "12-ea+8" :classifier "mac"]
-                 [org.openjfx/javafx-swing "12-ea+8" :classifier "win"]]
+                 [org.openjfx/javafx-graphics "12"]
+                 [org.openjfx/javafx-graphics "12" :classifier "linux"]
+                 [org.openjfx/javafx-graphics "12" :classifier "mac"]
+                 [org.openjfx/javafx-graphics "12" :classifier "win"]
+                 [org.openjfx/javafx-swing "12"]
+                 [org.openjfx/javafx-swing "12" :classifier "linux"]
+                 [org.openjfx/javafx-swing "12" :classifier "mac"]
+                 [org.openjfx/javafx-swing "12" :classifier "win"]]
   :resource-paths ["resources"]
   :main defold-robot.robot
   :aot [defold-robot.robot]

defold-robot/src/defold_robot/robot.clj

@@ -129,10 +129,36 @@
     (.keyType robot (char->key-code c)))
   true)
 
-(defmethod exec-step :switch-focus [{:keys [robot log-fn]} _]
+(defmethod exec-step :switch-focus [{:keys [robot log-fn platform]} _]
   (log-fn (format "<p>Switch-focus</p>"))
-  ;; TODO - platform specific
-  (press robot [:command :tab])
+  (if (= :mac platform)
+    (press robot [:command :tab])
+    (press robot [:alt :tab]))
+  true)
+
+(defmethod exec-step :open-asset [{:keys [robot log-fn action-key]} _]
+  (log-fn (format "<p>Open-asset</p>"))
+  (press robot [action-key :p])
+  true)
+
+(defmethod exec-step :build [{:keys [robot log-fn action-key]} _]
+  (log-fn (format "<p>Build</p>"))
+  (press robot [action-key :b])
+  true)
+
+(defmethod exec-step :hot-reload [{:keys [robot log-fn action-key]} _]
+  (log-fn (format "<p>Hot-reload</p>"))
+  (press robot [action-key :r])
+  true)
+
+(defmethod exec-step :undo [{:keys [robot log-fn action-key]} _]
+  (log-fn (format "<p>Undo</p>"))
+  (press robot [action-key :z])
+  true)
+
+(defmethod exec-step :quit [{:keys [robot log-fn action-key]} _]
+  (log-fn (format "<p>Quit</p>"))
+  (press robot [action-key :q])
   true)
 
 (defmethod exec-step :default [{:keys [log-fn]} step]
@@ -171,10 +197,17 @@
                log-fn (fn [s]
                         (println s)
                         (.write log-writer (format "%s\n" s)))
+               platform (let [name (System/getProperty "os.name")]
+                          (cond
+                            (.contains name "Mac") :mac
+                            (.contains name "Linux") :linux
+                            :else :windows))
                ctx {:robot robot
                     :log-fn log-fn
                     :log-descs log-descs
-                    :out-dir out-dir}
+                    :out-dir out-dir
+                    :platform platform
+                    :action-key (if (= :mac platform) :command :control)}
                result (loop [steps (get script :steps)]
                         (if-let [s (first steps)]
                           (if (exec-step ctx s)

editor/test/resources/geometry_wars/input/game.input_binding

@@ -30,6 +30,10 @@ key_trigger {
   input: KEY_4
   action: "render4"
 }
+key_trigger {
+  input: KEY_ESC
+  action: "quit"
+}
 mouse_trigger {
   input: MOUSE_BUTTON_1
   action: "touch"

editor/test/resources/geometry_wars/level/level.go

@@ -51,7 +51,6 @@ embedded_components {
   "skeleton: \"\"\n"
   "animations: \"\"\n"
   "default_animation: \"\"\n"
-  "name: \"\"\n"
   ""
   position {
     x: 0.0
@@ -180,7 +179,6 @@ embedded_components {
   "skeleton: \"\"\n"
   "animations: \"\"\n"
   "default_animation: \"\"\n"
-  "name: \"\"\n"
   ""
   position {
     x: 0.0
@@ -202,7 +200,6 @@ embedded_components {
   "skeleton: \"\"\n"
   "animations: \"\"\n"
   "default_animation: \"\"\n"
-  "name: \"\"\n"
   ""
   position {
     x: 0.0

editor/test/resources/geometry_wars/level/spawner.go

@@ -17,6 +17,7 @@ embedded_components {
   id: "black_hole_factory"
   type: "factory"
   data: "prototype: \"/enemy/black_hole.go\"\n"
+  "load_dynamically: false\n"
   ""
   position {
     x: 0.0
@@ -34,6 +35,7 @@ embedded_components {
   id: "chaser_factory"
   type: "factory"
   data: "prototype: \"/enemy/chaser.go\"\n"
+  "load_dynamically: false\n"
   ""
   position {
     x: 0.0
@@ -51,6 +53,7 @@ embedded_components {
   id: "roamer_factory"
   type: "factory"
   data: "prototype: \"/enemy/roamer.go\"\n"
+  "load_dynamically: false\n"
   ""
   position {
     x: 0.0
@@ -68,6 +71,7 @@ embedded_components {
   id: "swirler_factory"
   type: "factory"
   data: "prototype: \"/enemy/swirler.go\"\n"
+  "load_dynamically: false\n"
   ""
   position {
     x: 0.0

editor/test/resources/geometry_wars/main/main.script

@@ -15,6 +15,10 @@ local function set_render_mode(self, action_id)
 	msg.post("@render:", action_id)
 end
 
+local function quit(self, action_id)
+	sys.exit(0)
+end
+
 function init(self)
 	math.randomseed(1)
 	msg.post(nil, "acquire_input_focus")
@@ -25,7 +29,8 @@ function init(self)
 		[hash("render1")] = set_render_mode,
 		[hash("render2")] = set_render_mode,
 		[hash("render3")] = set_render_mode,
-		[hash("render4")] = set_render_mode
+		[hash("render4")] = set_render_mode,
+		[hash("quit")] = quit
 	}
 	self.timer = 0
 	self.outro = false

editor/test/resources/geometry_wars/player/bullet.go

@@ -67,6 +67,7 @@ embedded_components {
   id: "factory"
   type: "factory"
   data: "prototype: \"/player/bullet_impact.go\"\n"
+  "load_dynamically: false\n"
   ""
   position {
     x: 0.0

editor/test/resources/geometry_wars/player/cannon.go

@@ -17,6 +17,7 @@ embedded_components {
   id: "factory"
   type: "factory"
   data: "prototype: \"/player/bullet.go\"\n"
+  "load_dynamically: false\n"
   ""
   position {
     x: 0.0

packages/defold-robot-0.6.0-common.tar.gz renamed to packages/defold-robot-0.7.0-common.tar.gz

@@ -16,7 +16,7 @@
     Run build.py --help for help
 """
 
-PACKAGES_ALL="protobuf-2.3.0 waf-1.5.9 gtest-1.8.0 junit-4.6 protobuf-java-2.3.0 openal-1.1 maven-3.0.1 ant-1.9.3 vecmath vpx-1.7.0 facebook-4.7.0 facebook-gameroom-2017-08-14 luajit-2.0.5 tremolo-0.0.8 PVRTexLib-4.18.0 webp-0.5.0 defold-robot-0.6.0 bullet-2.77 libunwind-395b27b68c5453222378bc5fe4dab4c6db89816a".split()
+PACKAGES_ALL="protobuf-2.3.0 waf-1.5.9 gtest-1.8.0 junit-4.6 protobuf-java-2.3.0 openal-1.1 maven-3.0.1 ant-1.9.3 vecmath vpx-1.7.0 facebook-4.7.0 facebook-gameroom-2017-08-14 luajit-2.0.5 tremolo-0.0.8 PVRTexLib-4.18.0 webp-0.5.0 defold-robot-0.7.0 bullet-2.77 libunwind-395b27b68c5453222378bc5fe4dab4c6db89816a".split()
 PACKAGES_HOST="protobuf-2.3.0 gtest-1.8.0 cg-3.1 vpx-1.7.0 webp-0.5.0 luajit-2.0.5 tremolo-0.0.8".split()
 PACKAGES_EGGS="protobuf-2.3.0-py2.5.egg pyglet-1.1.3-py2.5.egg gdata-2.0.6-py2.6.egg Jinja2-2.6-py2.6.egg Markdown-2.6.7-py2.7.egg".split()
 PACKAGES_IOS="protobuf-2.3.0 gtest-1.8.0 facebook-4.7.0 luajit-2.0.5 tremolo-0.0.8 bullet-2.77".split()
@@ -1630,11 +1630,11 @@ def _download_editor2(self, sha1):
             print("No editor2 bundle found for %s" % host2)
             return None
 
-    def _install_editor2(self, bundle):
+    def _install_editor2(self, path):
         host2 = get_host_platform2()
         install_path = join('tmp', 'smoke_test')
         if 'darwin' in host2:
-            out = self.exec_command(['hdiutil', 'attach', bundle])
+            out = self.exec_command(['hdiutil', 'attach', path])
             print("cmd:" + out)
             last = [l2 for l2 in (l1.strip() for l1 in out.split('\n')) if l2][-1]
             words = last.split()
@@ -1649,7 +1649,10 @@ def _install_editor2(self, bundle):
                       'config': join(install_path, 'Contents', 'Resources', 'config')}
             return result
         else:
-            self._extract(bundle, install_path)
+            if 'win32' in host2:
+                self._extract_zip(path, install_path)
+            else:
+                self._extract(path, install_path)
             install_path = join(install_path, 'Defold')
             result = {'install_path': install_path,
                       'resources_path': 'Defold',
@@ -1678,16 +1681,22 @@ def _get_config(self, config, section, option, overrides):
         return v
 
     def smoke_test(self):
-        sha1 = self._git_sha1()
+        # TODO(mags): REMOVE BEFORE PUSH!
+        sha1 = '8b7b33e4147af87ffd884a5535247658fb754642' #self._git_sha1()
         cwd = join('tmp', 'smoke_test')
         if os.path.exists(cwd):
             shutil.rmtree(cwd)
-        bundle = self._download_editor2(sha1)
-        info = self._install_editor2(bundle)
+        path = self._download_editor2(sha1)
+        info = self._install_editor2(path)
         config = ConfigParser()
         config.read(info['config'])
         overrides = {'bootstrap.resourcespath': info['resources_path']}
-        java = join('Defold.app', 'Contents', 'Resources', 'packages', 'jdk11.0.1', 'bin', 'java')
+        jdk = 'jdk11.0.1'
+        host2 = get_host_platform2()
+        if 'win32' in host2:
+            java = join('Defold', 'packages', jdk, 'bin', 'java.exe')
+        else:
+            java = join('Defold.app', 'Contents', 'Resources', 'packages', jdk, 'bin', 'java')
         jar = self._get_config(config, 'launcher', 'jar', overrides)
         vmargs = self._get_config(config, 'launcher', 'vmargs', overrides).split(',') + ['-Ddefold.log.dir=.']
         vmargs = filter(lambda x: not str.startswith(x, '-Ddefold.update.url='), vmargs)
@@ -1696,15 +1705,23 @@ def smoke_test(self):
         args = [java, '-cp', jar] + vmargs + [main, '--preferences=../../editor/test/resources/smoke_test_prefs.json', game_project]
         robot_jar = '%s/ext/share/java/defold-robot.jar' % self.dynamo_home
         robot_args = [java, '-jar', robot_jar, '-s', '../../share/smoke-test.edn', '-o', 'result']
+        origdir = os.getcwd()
+        origcwd = cwd
+        if 'win32' in host2:
+            os.chdir(cwd)
+            cwd = '.'
         print('Running robot: %s' % robot_args)
         robot_proc = subprocess.Popen(robot_args, cwd = cwd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = False)
         time.sleep(2)
         self._log('Running editor: %s' % args)
-        ed_proc = subprocess.Popen(args, cwd = cwd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = False)
-
-        output = robot_proc.communicate()[0]
+        ed_proc = subprocess.Popen(args, cwd = cwd, shell = False)
+        os.chdir(origdir)
+        cwd = origcwd
+        # TODO(mags): REMOVE BEFORE PUSH - errput!
+        output, errput = robot_proc.communicate()
         if ed_proc.poll() == None:
             ed_proc.terminate()
+            ed_proc.wait()
         self._uninstall_editor2(info)
 
         result_archive_path = '/'.join(['int.d.defold.com', 'archive', sha1, 'editor2', 'smoke_test'])