[Jive-Checkins] r2334 - in /7.1/trunk/squeezeplay/src: squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua squeezeplay_jive/test/smoke/HomeMenu.bmp squeezeplay_jive/test/smoke/HomeMenuMacro.lua squeezeplay_jive/test/smoke/Macros.lua

[titmuss]

Author: titmuss
Date: Thu Apr 24 04:20:53 2008
New Revision: 2334

URL: http://svn.slimdevices.com?rev=2334&root=Jive&view=rev
Log:
Bug: N/A
Description:
Added home menu test macro.


Added:
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenu.bmp   (with 
props)
    7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenuMacro.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=2334&root=Jive&r1=2333&r2=2334&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
 Thu Apr 24 04:20:53 2008
@@ -297,8 +297,10 @@
 function macroDelay(interval)
        local self = instance
 
-       self.timer:restart(interval)
-       Task:yield(false)       
+       if interval then
+               self.timer:restart(interval)
+               Task:yield(false)
+       end
 end
 
 
@@ -345,11 +347,13 @@
 
 
 -- force return to the home menu
-function macroHome()
+function macroHome(interval)
        log:info("macroHome")
        if #Framework.windowStack > 1 then
                Framework.windowStack[#Framework.windowStack - 1]:hideToTop()
        end
+
+       macroDelay(interval)
 end
 
 

Added: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenu.bmp
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenu.bmp?rev=2334&root=Jive&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenu.bmp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenu.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenuMacro.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenuMacro.lua?rev=2334&root=Jive&view=auto
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenuMacro.lua 
(added)
+++ 7.1/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/HomeMenuMacro.lua Thu 
Apr 24 04:20:53 2008
@@ -1,0 +1,11 @@
+
+
+-- go home
+macroHome(1000)
+
+-- check screen
+if not macroScreenshot(1000, "HomeMenu") then
+       return macroFail("HomeMenu")
+end
+
+macroPass("HomeMenu")

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=2334&root=Jive&r1=2333&r2=2334&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 Thu Apr 24 
04:20:53 2008
@@ -1,6 +1,6 @@
 return {
   auto=1,
-  autostart={ "forcedUpgrade", "softwareUpgrade", "playmode" },
+  autostart={ "homeMenu", "playmode" },
   macros={
     forcedUpgrade={
       desc="Forced software upgrade.",
@@ -16,6 +16,11 @@
       desc="User requested software upgrade.",
       file="SoftwareUpgradeMacro.lua",
       name="Software Upgrade" 
+    },
+    homeMenu={
+      desc="Verify the home menu.",
+      file="HomeMenuMacro.lua",
+      name="Home Menu" 
     } 
   } 
 }

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