Author: titmuss
Date: Tue Apr 29 14:16:54 2008
New Revision: 2392
URL: http://svn.slimdevices.com?rev=2392&root=Jive&view=rev
Log:
Bug: N/A
Description:
Minor bug fixes and timing fixes in the macro scripts.
Added reference screenshots for setup mode.
Added:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChooseLanguage.bmp
(with props)
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChoosePlayer.bmp
(with props)
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Continue.bmp (with
props)
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Welcome.bmp (with
props)
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessNetworks.bmp
(with props)
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessPassword.bmp
(with props)
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessRegion.bmp
(with props)
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/FactoryResetMacro.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Macros.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SetupWPAMacro.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.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=2392&root=Jive&r1=2391&r2=2392&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 14:16:54 2008
@@ -480,6 +480,7 @@
else
log:debug("Saving reference screenshot " .. reffile)
screen:saveBMP(reffile)
+ pass = true
end
macroDelay(interval)
@@ -490,7 +491,7 @@
function macroParameter(key)
local self = instance
- return self.macro[key]
+ return self.macro.param[key]
end
Added: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChooseLanguage.bmp
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChooseLanguage.bmp?rev=2392&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChooseLanguage.bmp
------------------------------------------------------------------------------
svn:executable = *
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChooseLanguage.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChoosePlayer.bmp
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChoosePlayer.bmp?rev=2392&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChoosePlayer.bmp
------------------------------------------------------------------------------
svn:executable = *
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/ChoosePlayer.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Continue.bmp
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Continue.bmp?rev=2392&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Continue.bmp
------------------------------------------------------------------------------
svn:executable = *
Propchange: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Continue.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/FactoryResetMacro.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/FactoryResetMacro.lua?rev=2392&root=Jive&r1=2391&r2=2392&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/FactoryResetMacro.lua
(original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/FactoryResetMacro.lua
Tue Apr 29 14:16:54 2008
@@ -7,7 +7,7 @@
if not macroSelectMenuItem(100, "Settings") then
return macroFail("Settings")
end
-macroEvent(100, EVENT_KEY_PRESS, KEY_GO)
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
if not macroScreenshot(1000, "Settings") then
return macroFail("Settings")
@@ -18,7 +18,7 @@
if not macroSelectMenuItem(100, "Advanced") then
return macroFail("Advanced")
end
-macroEvent(100, EVENT_KEY_PRESS, KEY_GO)
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
if not macroScreenshot(1000, "Advanced") then
return macroFail("Advanced")
@@ -29,7 +29,7 @@
if not macroSelectMenuItem(100, "Factory Reset") then
return macroFail("FactoryReset1")
end
-macroEvent(500, EVENT_KEY_PRESS, KEY_GO)
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
if not macroScreenshot(1000, "FactoryReset1") then
return macroFail("FactoryReset1")
@@ -42,7 +42,7 @@
end
macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
-if not macroScreenshot(1000, "FactoryReset2") then
+if not macroScreenshot(100, "FactoryReset2") then
return macroFail("FactoryReset2")
end
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=2392&root=Jive&r1=2391&r2=2392&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
14:16:54 2008
@@ -28,13 +28,15 @@
name="Software Upgrade"
},
setupWPA={
- desc="Setup using WPA network.",
+ desc="Setup using WPA network. This macro only works after a Factory
Reset.",
file="SetupWPAMacro.lua",
name="Setup WPA",
- region="Europe",
- ssid="linksys",
- wpa="adgjmptw",
- player="Transporter",
+ param={
+ region="Europe",
+ ssid="linksys",
+ wpa="adgjmptw",
+ player="Transporter"
+ }
}
}
}
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua?rev=2392&root=Jive&r1=2391&r2=2392&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua
(original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua Tue
Apr 29 14:16:54 2008
@@ -1,6 +1,6 @@
-- go home
-macroHome(100)
+macroHome(500)
-- select Now Playing
if not macroSelectMenuItem(100, "Now Playing") then
@@ -8,7 +8,7 @@
end
-- key go into Now Playing
-macroEvent(100, EVENT_KEY_PRESS, KEY_GO)
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
-- stop (hold pause), wait until after show briefly
Modified:
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=2392&root=Jive&r1=2391&r2=2392&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SetupWPAMacro.lua
(original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SetupWPAMacro.lua Tue
Apr 29 14:16:54 2008
@@ -14,14 +14,24 @@
if not macroSelectMenuItem(100, "English") then
return macroFail("English")
end
+if not macroScreenshot(1000, "ChooseLanguage") then
+ return macroFail("ChooseLanguage")
+end
macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
-- Welcome
+if not macroScreenshot(1000, "Welcome") then
+ return macroFail("Welcome")
+end
macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
-- Wireless Region
+if not macroScreenshot(1000, "WirelessRegion") then
+ return macroFail("WirelessRegion")
+end
+
local region = macroParameter("region")
if not macroSelectMenuItem(100, region) then
return macroFail("Region: ", region)
@@ -34,6 +44,10 @@
-- Wireless Networks
+if not macroScreenshot(1000, "WirelessNetworks") then
+ return macroFail("WirelessNetworks")
+end
+
local ssid = macroParameter("ssid")
if not macroSelectMenuItem(100, ssid) then
return macroFail("SSID: ", ssid)
@@ -42,6 +56,10 @@
-- Wireless Password
+if not macroScreenshot(1000, "WirelessPassword") then
+ return macroFail("WirelessPassword")
+end
+
local wpa = macroParameter("wpa")
macroTextInput(100, wpa)
macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
@@ -53,6 +71,9 @@
-- Choose Player (allow 10 seconds)
macroDelay(10000)
+if not macroScreenshot(1000, "ChoosePlayer") then
+ return macroFail("ChoosePlayer")
+end
local player = macroParameter("player")
if not macroSelectMenuItem(100, player) then
@@ -69,6 +90,9 @@
if not macroSelectMenuItem(100, "Continue") then
return macroFail("Continue")
end
+if not macroScreenshot(1000, "Continue") then
+ return macroFail("Continue")
+end
macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua?rev=2392&root=Jive&r1=2391&r2=2392&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/SoftwareUpgradeMacro.lua
Tue Apr 29 14:16:54 2008
@@ -1,13 +1,13 @@
-- go home
-macroHome()
+macroHome(500)
-- Settings
if not macroSelectMenuItem(100, "Settings") then
return macroFail("Settings")
end
-macroEvent(100, EVENT_KEY_PRESS, KEY_GO)
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
if not macroScreenshot(1000, "Settings") then
return macroFail("Settings")
@@ -18,7 +18,7 @@
if not macroSelectMenuItem(100, "Advanced") then
return macroFail("Advanced")
end
-macroEvent(100, EVENT_KEY_PRESS, KEY_GO)
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
if not macroScreenshot(1000, "Advanced") then
return macroFail("Advanced")
@@ -29,7 +29,7 @@
if not macroSelectMenuItem(100, "Software Update") then
return macroFail("SoftwareUpdate")
end
-macroEvent(500, EVENT_KEY_PRESS, KEY_GO)
+macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
if not macroScreenshot(1000, "SoftwareUpdate") then
return macroFail("SoftwareUpdate")
Added: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Welcome.bmp
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Welcome.bmp?rev=2392&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Welcome.bmp
------------------------------------------------------------------------------
svn:executable = *
Propchange: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/Welcome.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessNetworks.bmp
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessNetworks.bmp?rev=2392&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessNetworks.bmp
------------------------------------------------------------------------------
svn:executable = *
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessNetworks.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessPassword.bmp
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessPassword.bmp?rev=2392&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessPassword.bmp
------------------------------------------------------------------------------
svn:executable = *
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessPassword.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessRegion.bmp
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessRegion.bmp?rev=2392&root=Jive&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessRegion.bmp
------------------------------------------------------------------------------
svn:executable = *
Propchange:
7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/WirelessRegion.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
