# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1258988461 0
# Node ID d67c930e18a17cbc2d061b06db7f502f2510244a
# Parent  1d4270bc656b04080b7d23d40ce55e0e26eae7f6# Parent  a8a37ca9cc042500a719245e1772f2aca1e6b762
Catchup merge

diff -r 1d4270bc656b -r d67c930e18a1 common/tools/ats/smoketest/Group/smoketest.pl
--- a/common/tools/ats/smoketest/Group/smoketest.pl	Mon Nov 23 14:58:52 2009 +0000
+++ b/common/tools/ats/smoketest/Group/smoketest.pl	Mon Nov 23 15:01:01 2009 +0000
@@ -11,6 +11,7 @@
 mkpath "temp/smoketest/sms/general";
 mkpath "temp/smoketest/emailmessage/general";
 mkpath "temp/smoketest/emailsettings/general";
+mkpath "temp/smoketest/wallpaper/general";
 mkpath "temp/smoketest/appinstall/general";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
@@ -67,8 +68,10 @@
 copy($epoc . "release/winscw/udeb/testsdkskins.dll",				"temp/smoketest/winscw_udeb/testsdkskins.dll");
 copy($epoc . "data/c/smoketest/smoketest_uiresources.cfg",			"temp/smoketest/general/smoketest_uiresources.cfg");
 copy($epoc . "data/c/smoketest/ui_testsdkskinsu.cfg",				"temp/smoketest/general/ui_testsdkskinsu.cfg");
-copy($epoc . "release/winscw/udeb/InputMethodSmokeTestModule.dll",   "temp/smoketest/winscw_udeb/InputMethodSmokeTestModule.dll");
-copy($epoc . "winscw/c/smoketest/InputMethodSmokeTestModule.cfg",    "temp/smoketest/general/InputMethodSmokeTestModule.cfg");
+copy($epoc . "data/c/smoketest/ui_testsdkskinswu.cfg",				"temp/smoketest/general/ui_testsdkskinswu.cfg");
+copy($epoc . "data/c/smoketest/wallpaper/symbian_01_320x480.jpg",	"temp/smoketest/wallpaper/general/symbian_01_320x480.jpg");
+copy($epoc . "release/winscw/udeb/InputMethodSmokeTestModule.dll",  "temp/smoketest/winscw_udeb/InputMethodSmokeTestModule.dll");
+copy($epoc . "winscw/c/smoketest/InputMethodSmokeTestModule.cfg",   "temp/smoketest/general/InputMethodSmokeTestModule.cfg");
 copy($epoc . "release/winscw/udeb/IMApiTest.dll",					"temp/smoketest/winscw_udeb/IMApiTest.dll");
 copy($epoc . "data/c/smoketest/imapitest.ini",						"temp/smoketest/general/imapitest.ini");
 
diff -r 1d4270bc656b -r d67c930e18a1 common/tools/ats/smoketest/Group/smoketest.xml
--- a/common/tools/ats/smoketest/Group/smoketest.xml	Mon Nov 23 14:58:52 2009 +0000
+++ b/common/tools/ats/smoketest/Group/smoketest.xml	Mon Nov 23 15:01:01 2009 +0000
@@ -419,6 +419,24 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>
+                    <step id="" name="ui_testsdkskinswu.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="ui_testsdkskinswu.cfg"/>
+							<param dst="c:\smoketest\ui_testsdkskinswu.cfg"/>
+							<param component-path="smoketest" />
+						</params>
+					</step>
+					<step id="" name="symbian_01_320x480.jpg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="symbian_01_320x480.jpg"/>
+							<param dst="c:/smoketest/wallpaper/symbian_01_320x480.jpg"/>
+							<param component-path="smoketest\wallpaper" />
+						</params>
+					</step>
                     <step id="" name="InputMethodSmokeTestModule.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
@@ -563,6 +581,8 @@
 		<file>smoketest/winscw_udeb/testsdkskins.dll</file>		
 		<file>smoketest/general/smoketest_uiresources.cfg</file>
 		<file>smoketest/general/ui_testsdkskinsu.cfg</file>
+		<file>smoketest/general/ui_testsdkskinswu.cfg</file>
+		<file>smoketest/wallpaper/general/symbian_01_320x480.jpg</file>
         <file>smoketest/winscw_udeb/InputMethodSmokeTestModule.dll</file>
         <file>smoketest/general/InputMethodSmokeTestModule.cfg</file>
 		<file>smoketest/winscw_udeb/IMApiTest.dll</file>		
diff -r 1d4270bc656b -r d67c930e18a1 common/tools/ats/smoketest/uiresources/conf/smoketest_uiresources.cfg
--- a/common/tools/ats/smoketest/uiresources/conf/smoketest_uiresources.cfg	Mon Nov 23 14:58:52 2009 +0000
+++ b/common/tools/ats/smoketest/uiresources/conf/smoketest_uiresources.cfg	Mon Nov 23 15:01:01 2009 +0000
@@ -1,5 +1,9 @@
-
 [Test]
 title TestUSkinInstanceL
 run testscripter c:\smoketest\ui_testsdkskinsu.cfg 6
-[Endtest]  
+[Endtest]
+
+[Test]
+title TestWUSetIdleWallpaper
+run testscripter c:\smoketest\ui_testsdkskinswu.cfg 2
+[Endtest]
diff -r 1d4270bc656b -r d67c930e18a1 common/tools/ats/smoketest/uiresources/conf/ui_testsdkskinswu.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/smoketest/uiresources/conf/ui_testsdkskinswu.cfg	Mon Nov 23 15:01:01 2009 +0000
@@ -0,0 +1,33 @@
+[Test]
+title PressKey 
+pause 2000
+presskey global EKeyDevice1
+[Endtest]
+
+//----------------------------------------------------------------------------------//
+//---------------------------AknsControlContext.H-----------------------------------//
+//----------------------------------------------------------------------------------//
+// Test AknsControlContext.H
+// For test function:
+// IMPORT_C static TInt SetIdleWallpaper(const TDesC& aFilename, 
+//     CCoeEnv* aCoeEnv, TInt aWaitNoteTextResourceID = 0, TInt aWaitNoteResourceID = 0);
+[Test]
+title TestWUSetIdleWallpaper
+create testsdkskins test
+bringtoforeground
+test TestWUSetIdleWallpaper
+delete test
+sendtobackground
+[Endtest]
+
+// For test function:
+// IMPORT_C static TInt SetSlidesetWallpaper(CDesCArray& aSelectedFiles, 
+//     CCoeEnv* aCoeEnv, TInt aWaitNoteTextResourceID = 0, TInt aWaitNoteResourceID = 0);
+[Test]
+title TestWUSetSlidesetWallpaperL
+create testsdkskins test
+bringtoforeground
+test TestWUSetSlidesetWallpaperL
+delete test
+sendtobackground
+[Endtest]
diff -r 1d4270bc656b -r d67c930e18a1 common/tools/ats/smoketest/uiresources/group/bld.inf
--- a/common/tools/ats/smoketest/uiresources/group/bld.inf	Mon Nov 23 14:58:52 2009 +0000
+++ b/common/tools/ats/smoketest/uiresources/group/bld.inf	Mon Nov 23 15:01:01 2009 +0000
@@ -29,6 +29,9 @@
 PRJ_TESTEXPORTS
 ../conf/smoketest_uiresources.cfg	c:/smoketest/smoketest_uiresources.cfg
 ../conf/ui_testsdkskinsu.cfg		c:/smoketest/ui_testsdkskinsu.cfg
+../conf/ui_testsdkskinswu.cfg		c:/smoketest/ui_testsdkskinswu.cfg
+// Wallpaper image file
+../testdata/wallpaper/symbian_01_320x480.jpg	c:/smoketest/wallpaper/symbian_01_320x480.jpg
 
 PRJ_EXPORTS
 
diff -r 1d4270bc656b -r d67c930e18a1 common/tools/ats/smoketest/uiresources/src/testsdkskinsblockswu.cpp
--- a/common/tools/ats/smoketest/uiresources/src/testsdkskinsblockswu.cpp	Mon Nov 23 14:58:52 2009 +0000
+++ b/common/tools/ats/smoketest/uiresources/src/testsdkskinsblockswu.cpp	Mon Nov 23 15:01:01 2009 +0000
@@ -21,7 +21,7 @@
 
 #include "testsdkskins.h"
 
-const TInt KLength = 20;
+const TInt KLength = 50;
 
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
@@ -29,7 +29,7 @@
 // -----------------------------------------------------------------------------
 TInt CTestSDKSkins::TestWUSetIdleWallpaper( CStifItemParser& /*aItem*/ )
     {
-    _LIT( KFileName, "wallpaperutils" );
+    _LIT( KFileName, "c:\\smoketest\\wallpaper\\symbian_01_320x480.jpg" );
     TBuf<KLength> fileName( KFileName );
     AknsWallpaperUtils::SetIdleWallpaper( fileName, CCoeEnv::Static() );
     
diff -r 1d4270bc656b -r d67c930e18a1 common/tools/ats/smoketest/uiresources/testdata/wallpaper/symbian_01_320x480.jpg
Binary file common/tools/ats/smoketest/uiresources/testdata/wallpaper/symbian_01_320x480.jpg has changed