[Jive-Checkins] r2390 - in /7.1/trunk/squeezeplay/src: squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua squeezeplay_jive/test/smoke/Macros.lua squeezeplay_jive/test/smoke/SetupWPAMacro.lua

[titmuss]

Author: titmuss
Date: Tue Apr 29 08:57:51 2008
New Revision: 2390

URL: http://svn.slimdevices.com?rev=2390&root=Jive&view=rev
Log:
Bug: N/A
Description:
Added macro for testing WPA setup.


Added:
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SetupWPAMacro.lua
Modified:
    
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua

Modified: 
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua?rev=2390&root=Jive&r1=2389&r2=2390&view=diff
==============================================================================
--- 
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
 (original)
+++ 
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
 Tue Apr 29 08:57:51 2008
@@ -377,6 +377,10 @@
        end
 
        local index = menu:getSelectedIndex() or 1
+       local dir = KEY_DOWN
+       if index ~= 1 then
+               dir = KEY_UP
+       end
 
        local ok = false
        repeat
@@ -385,7 +389,7 @@
                        break
                end
 
-               macroEvent(100, EVENT_KEY_PRESS, KEY_DOWN)
+               macroEvent(100, EVENT_KEY_PRESS, dir)
        until menu:getSelectedIndex() == index
 
        macroDelay(interval)

Modified: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua?rev=2390&root=Jive&r1=2389&r2=2390&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua Tue Apr 29 
08:57:51 2008
@@ -1,6 +1,6 @@
 return {
-  auto=3,
-  autostart={ "forcedUpgrade", "softwareUpgrade", "homeMenu", "playmode" },
+  auto=1,
+  autostart={ "forcedUpgrade", "softwareUpgrade", "factoryReset", "setupWPA", 
"homeMenu", "playmode" },
   macros={
     factoryReset={
       desc="Verify a factory reset.",
@@ -26,6 +26,15 @@
       desc="User requested software upgrade.",
       file="SoftwareUpgradeMacro.lua",
       name="Software Upgrade" 
-    } 
+    },
+    setupWPA={
+      desc="Setup using WPA network.",
+      file="SetupWPAMacro.lua",
+      name="Setup WPA",
+      region="Europe",
+      ssid="linksys",
+      wpa="adgjmptw",
+      player="Transporter",
+    }
   } 
 }

Added: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SetupWPAMacro.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SetupWPAMacro.lua?rev=2390&root=Jive&view=auto
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SetupWPAMacro.lua 
(added)
+++ 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SetupWPAMacro.lua Tue 
Apr 29 08:57:51 2008
@@ -1,0 +1,76 @@
+
+-- go home
+macroHome(1000)
+
+
+-- Return to Setup
+if not macroSelectMenuItem(100, "Return to Setup") then
+       return macroFail("Return to Setup")
+end
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
+
+
+-- Choose Language
+if not macroSelectMenuItem(100, "English") then
+       return macroFail("English")
+end
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
+
+
+-- Welcome
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
+
+
+-- Wireless Region
+local region = macroParameter("region")
+if not macroSelectMenuItem(100, region) then
+       return macroFail("Region: ", region)
+end
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
+
+
+-- Finding Networks (allow 5 seconds)
+macroDelay(5000)
+
+
+-- Wireless Networks
+local ssid = macroParameter("ssid")
+if not macroSelectMenuItem(100, ssid) then
+       return macroFail("SSID: ", ssid)
+end
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
+
+
+-- Wireless Password
+local wpa = macroParameter("wpa")
+macroTextInput(100, wpa)
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
+
+
+-- Connecting to <ssid> (allow 20 seconds)
+macroDelay(20000)
+
+
+-- Choose Player (allow 10 seconds)
+macroDelay(10000)
+
+local player = macroParameter("player")
+if not macroSelectMenuItem(100, player) then
+       return macroFail("Player: ", player)
+end
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
+
+
+-- Connecting to <player> (allow 10 seconds)
+macroDelay(10000)
+
+
+-- That's it!
+if not macroSelectMenuItem(100, "Continue") then
+       return macroFail("Continue")
+end
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
+
+
+-- All done!
+macroPass("SetupWPA")

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins