MCL/sf/mw/appsupport: comparison appfw/apparchitecture/tef/T

equal deleted inserted replaced

-:0818dd463d41
+:924385140d98
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include "T_CaptionStep.h"
 #include "appfwk_test_utils.h"
 #include "appfwk_test.h"
 #include "ticoncaptionoverride.h" //KUidTestIconCapOverride defined here
 #include "TIconLoaderAndIconArrayForLeaks.h"
+#include "T_SisFileInstaller.h"
 //
 //
 //		global consts and declarations
 _LIT(KTestTApaAppInfoShortCaptionDefault,"TC UK");
 // Cenrep configuration details for English language
 _LIT(KCenRepCaption, "CRTstCap UK");
 _LIT(KCenRepShortCaption, "CRTC UK");
-_LIT(KCenRepIconFilename, "Z:\\resource\\apps\\ticoncapoverride.mbm");
+_LIT(KCenRepIconFilename, "C:\\resource\\apps\\ticoncapoverride.mbm");
+_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis");
+_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone");
+_LIT(KTstAppTiconcaptionoverrideSisFile, "z:\\apparctest\\apparctestsisfiles\\ticoncaptionoverride.sis");
+_LIT(KTstAppTiconcaptionoverrideComponent, "ticoncaptionoverride");
+_LIT(KForceRegAppSisFile, "z:\\apparctest\\apparctestsisfiles\\ForceRegApp1.sis");
+_LIT(KForceRegAppComponent, "ForceRegApp1");
 const TUid KUidIconCaptionRepository = {0x1028583d}; // Central Repository UID.
 const TInt KTextSize = 100;
+const TInt KDelay = 4000000;
 //
 //
 //		CT_CaptionStep
 //
 //
 void CT_CaptionStep::ChangeLocaleL(TLanguage aLanguage)
 	{
 #ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
-_LIT(KLitLocaleDllNameBase, "elocl_lan");
+_LIT(KLitLanguageLocaleDllNameBase, "elocl_lan");
-_LIT(KLitLocaleDllNameExtension, ".loc");
+//Region and collation code values are hard coded, as the check, after changing the locale is made for the language only.
+_LIT(KLitRegionLocaleDllNameBase, "elocl_reg.826");
+_LIT(KLitCollationLocaleDllNameBase, "elocl_col.001");
+_LIT(ThreeDigExt,".%03d");
+TExtendedLocale localeDll;
+const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6));
+TBuf<16> languageLocaleDllName(KLitLanguageLocaleDllNameBase);
+languageLocaleDllName.AppendFormat(ThreeDigExt, aLanguage);
+TBuf<16> regionLocaleDllName(KLitRegionLocaleDllNameBase);
+TBuf<16> collationLocaleDllName(KLitCollationLocaleDllNameBase);
+// Try to load the locale dll
+TInt error=localeDll.LoadLocale(languageLocaleDllName, regionLocaleDllName, collationLocaleDllName);
+if (error==KErrNotFound)
+{
+// Locale dll is not found for the asked language.
+ERR_PRINTF2(_L("Failed to find the locale dll for %d"), aLanguage);
+}
+User::LeaveIfError(error);
+localeDll.SaveSystemSettings();
 #else
 _LIT(KLitLocaleDllNameBase, "ELOCL");
-_LIT(KLitLocaleDllNameExtension, ".LOC");
+_LIT(TwoDigExt,".%02d");
-#endif
 RLibrary localeDll;
-TBuf<16> localeDllName(KLitLocaleDllNameBase);
 CleanupClosePushL(localeDll);
 const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6));
-#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
+TBuf<16> localeDllName(KLitLocaleDllNameBase);
-_LIT(ThreeDigExt,".%03d");
+localeDllName.AppendFormat(TwoDigExt, language);
-localeDllName.AppendFormat(ThreeDigExt, aLanguage);
-#else
+// Try to load the locale dll
-_LIT(TwoDigExt,".%02d");
-localeDllName.AppendFormat(TwoDigExt, aLanguage);
-#endif
 TInt error=localeDll.Load(localeDllName, uidType);
 if (error==KErrNotFound)
 {
-localeDllName=KLitLocaleDllNameBase;
+// Locale dll is not found for the asked language.
-localeDllName.Append(KLitLocaleDllNameExtension);
+ERR_PRINTF2(_L("Failed to find the locale dll for %d"), language);
-error=localeDll.Load(localeDllName, uidType);
 }
 User::LeaveIfError(error);
-#ifdef  SYMBIAN_DISTINCT_LOCALE_MODEL
-TExtendedLocale myExtendedLocale;
-User::LeaveIfError(myExtendedLocale.LoadLocaleAspect(localeDllName));
-User::LeaveIfError(myExtendedLocale.SaveSystemSettings());
-#else
 User::LeaveIfError(UserSvr::ChangeLocale(localeDllName));
+CleanupStack: opAndDestroy(); // localeDll
 #endif
-CleanupStack::PopAndDestroy(&localeDll);
+// Check if the device locale has changed
+if (aLanguage == User::Language())
+{
+SetTestStepResult(EPass);
+}
+else
+{
+ERR_PRINTF3(_L("Failed to change the locale to %d whereas the current locale is"), aLanguage, User::Language());
+}
 	}
 void CT_CaptionStep::DoLanguageTestL()
 	{
 				User::LeaveIfError(KErrNotSupported);
 				break;
 			};
 		// Change the locale
-		ChangeLocaleL(languageToTest);
+		if(languageToTest != User::Language())
-		TEST(User::Language() == languageToTest);
+		    {
+ChangeLocaleWaitForApplistUpdate(languageToTest);
-		// Force the applist to be updated (so test app gets new language settings)
+TEST(User::Language() == languageToTest);
-		RPointerArray<TDesC> dummy;
+		    }
-		User::LeaveIfError(iLs.ForceRegistration(dummy));
 		// Do the same set of tests for each language
 		TestCApaSystemControlListL();
 		TestCApaDoorL();
 		TestTApaAppInfoStreamsL();
 		INFO_PRINTF1(_L("Test for that language finished..."));
 		}
 	// restore original locale, just in case...
-	ChangeLocaleL(language);
+	if(User::Language() != language)
+	    ChangeLocaleWaitForApplistUpdate(language);
 	TEST(User::Language() == language);
 	}
 /**
 @SYMTestCaseID	t_caption_TestCApaSystemControlListL
 */
 void CT_CaptionStep::TestTApaAppInfoStreamsL()
 	{
 	INFO_PRINTF1(_L("Testing TApaAppInfo streams... "));
-	TApaAppInfo appInfoShort(KUidTestApp, _L("z:\\sys\\bin\\tstapp.exe"), _L("TstCap UK"),_L("TC UK"));
+	TApaAppInfo appInfoShort(KUidTestApp, _L("c:\\sys\\bin\\tstapp.exe"), _L("TstCap UK"),_L("TC UK"));
 	TEST(appInfoShort.iShortCaption.Compare(_L("TC UK"))==0);
 	TFileName tempFile=_L("c:\\system\\test\\TC_temp.txt");
 	TInt ret = iFs.MkDirAll(tempFile);
 	if (ret != KErrNone && ret != KErrAlreadyExists)
 	TLanguage language = User::Language();
 	ChangeLocaleL(ELangEnglish);
 	TEST(User::Language() == ELangEnglish);
 	// Force the applist to be updated (so test app gets new language settings)
-	RPointerArray<TDesC> dummy;
+	ForceApplistUpdate();
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	// SetAppShortCaption should return KErrNotFound if it could not find the app
 	INFO_PRINTF1(_L(".....setting short caption for an unknown app"));
 	TInt err = iLs.SetAppShortCaption(KShortCaption1, ELangNone, TUid::Uid(0xFFF34556));
 	TEST(err == KErrNotFound);
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption1);
 	// Check short caption remains updated after a refresh of the applist
 	INFO_PRINTF1(_L(".....checking short caption remains updated after a refresh of the applist"));
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
+	ForceApplistUpdate();
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption1);
 	// Check short caption remains updated after a locale change
 	INFO_PRINTF1(_L(".....checking short caption remains updated after a locale change"));
-	ChangeLocaleL(ELangJapanese);
+	ChangeLocaleWaitForApplistUpdate(ELangJapanese);
 	TEST(User::Language() == ELangJapanese);	// Japanese locale exists in epoc32 tree but not defined in test app
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
+ChangeLocaleWaitForApplistUpdate(ELangEnglish);				// back to English to see what happened in between
-	ChangeLocaleL(ELangEnglish);				// back to English to see what happened in between
 	TEST(User::Language() == ELangEnglish);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption1);
 	// Set short caption of an app for a language which is not the current one (ELangFrench, for example)
 	INFO_PRINTF1(_L(".....setting short caption of an app for a language which is not the current one"));
 	err = iLs.SetAppShortCaption(KShortCaption2, ELangFrench, KUidTestApp);
 	TEST(err == KErrNone);
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption1);	// English, the current app language, doesn't change...
-	ChangeLocaleL(ELangFrench);
+	ChangeLocaleWaitForApplistUpdate(ELangFrench);
 	TEST(User::Language() == ELangFrench);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption2);
 	// Set short caption of an app for a language which the app does not include (ELangAmerican)
 	INFO_PRINTF1(_L(".....setting short caption of an app for a language which the app does not include"));
-	ChangeLocaleL(ELangAmerican);
+	ChangeLocaleWaitForApplistUpdate(ELangAmerican);
 	TEST(User::Language() == ELangAmerican);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	err = iLs.SetAppShortCaption(KShortCaption2, ELangAmerican, KUidTestApp);
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption1);	// American takes the default...so English...which has just been updated.
 	// Set short caption of an app for all languages with ELangNone
 	INFO_PRINTF1(_L(".....setting short caption for all languages with ELangNone"));
 	err = iLs.SetAppShortCaption(KShortCaption3, ELangNone, KUidTestApp);
 	TEST(err == KErrNone);
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption1);	// American takes the default...so English...which has just been updated.
-	ChangeLocaleL(ELangEnglish);
+	ChangeLocaleWaitForApplistUpdate(ELangEnglish);
 	TEST(User::Language() == ELangEnglish);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption1);	// English set individually ===> not updated by ELangNone
-	ChangeLocaleL(ELangFrench);
+	ChangeLocaleWaitForApplistUpdate(ELangFrench);
 	TEST(User::Language() == ELangFrench);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption2);	// French set individually ===> not updated by ELangNone
-	ChangeLocaleL(ELangGerman);
+	ChangeLocaleWaitForApplistUpdate(ELangGerman);
 	TEST(User::Language() == ELangGerman);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption3);	// German takes the one set by  ELangNone
-	ChangeLocaleL(ELangItalian);
+	ChangeLocaleWaitForApplistUpdate(ELangItalian);
 	TEST(User::Language() == ELangItalian);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption3);	// Italian takes the one set by ELangNone
-	ChangeLocaleL(ELangSpanish);
+	ChangeLocaleWaitForApplistUpdate(ELangSpanish);
 	TEST(User::Language() == ELangSpanish);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption3);	// Spanish takes the one set by ELangNone
 	// Set short caption of an app for a language which was set by the previous ELangNone
 	INFO_PRINTF1(_L(".....setting short caption of an app which was set by the previous ELangNone"));
-	ChangeLocaleL(ELangItalian);
+	ChangeLocaleWaitForApplistUpdate(ELangItalian);
 	TEST(User::Language() == ELangItalian);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	err = iLs.SetAppShortCaption(KShortCaption4, ELangItalian, KUidTestApp);
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption4);
 	// Repeat set short caption of an app for all languages with ELangNone
 	INFO_PRINTF1(_L(".....repeat setting short caption for all languages with ELangNone"));
 	err = iLs.SetAppShortCaption(KShortCaption5, ELangNone, KUidTestApp);
 	TEST(err == KErrNone);
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption4);	// Italian set individually ===> not updated by ELangNone
-	ChangeLocaleL(ELangEnglish);
+	ChangeLocaleWaitForApplistUpdate(ELangEnglish);
 	TEST(User::Language() == ELangEnglish);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption1);	// English set individually ===> not updated by ELangNone
-	ChangeLocaleL(ELangFrench);
+	ChangeLocaleWaitForApplistUpdate(ELangFrench);
 	TEST(User::Language() == ELangFrench);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption2);	// French set individually ===> not updated by ELangNone
-	ChangeLocaleL(ELangGerman);
+	ChangeLocaleWaitForApplistUpdate(ELangGerman);
 	TEST(User::Language() == ELangGerman);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption5);	// German takes the one set by  ELangNone
-	ChangeLocaleL(ELangSpanish);
+	ChangeLocaleWaitForApplistUpdate(ELangSpanish);
 	TEST(User::Language() == ELangSpanish);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption5);	// Spanish takes the one set by ELangNone
-	ChangeLocaleL(ELangAmerican);
+	ChangeLocaleWaitForApplistUpdate(ELangAmerican);
 	TEST(User::Language() == ELangAmerican);
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	iLs.GetAppInfo(appInfo, KUidTestApp);
 	TEST(appInfo.iShortCaption == KShortCaption1);	// American takes the default...so English...which has just been updated.
 	// restore original settings....
 	INFO_PRINTF1(_L(".....restoring original settings"));
-	ChangeLocaleL(language);
+	ChangeLocaleWaitForApplistUpdate(language);
 	TEST(User::Language() == language);
 	// restore original short captions for all langs....(h4 doesn't perform reboots between tests)
 	TEST(iLs.SetAppShortCaption(KTestTApaAppInfoShortCaptionEnglish, ELangEnglish, KUidTestApp) == KErrNone);
 	TEST(iLs.SetAppShortCaption(KTestTApaAppInfoShortCaptionFrench, ELangFrench, KUidTestApp) == KErrNone);
 	TEST(iLs.SetAppShortCaption(KTestTApaAppInfoShortCaptionGerman, ELangGerman, KUidTestApp) == KErrNone);
 void CT_CaptionStep::TestIconCaptionOverridesL()
 	{
 	INFO_PRINTF1(_L("APPFWK-APPARC-0087:TestIconCaptionOverridesL started..."));
-	//Change the system language to English before starting the tests
+//Change the system language to English before starting the tests
-	TRAPD(ret,ChangeLocaleL(ELangEnglish));
+TRAPD(ret,ChangeLocaleL(ELangEnglish));
-	TEST(ret == KErrNone);
+TEST(ret == KErrNone);
+TEST(User::Language() == ELangEnglish);
+ForceApplistUpdate();
 	TApaAppInfo appInfo;
 	//Get test app's information
 	iLs.GetAppInfo(appInfo, KUidTestIconCapOverride);
 	TInt error = cenRep->Set(shortCapKey,KCenRepSC);
 	//tests whether the process with WriteDeviceData capability can update the configuration settings.
 	TEST(error == KErrNone);
-	// Force the applist to be updated (so test app gets new language settings)
+	ForceApplistUpdate();
-	RPointerArray<TDesC> dummy;
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	TApaAppInfo appInfo;
 	//Get test app's information
 	iLs.GetAppInfo(appInfo, KUidTestIconCapOverride);
 	//compare the short caption with the updated value in central repository
 	TEST(appInfo.iShortCaption == KCenRepSC);
 	//sets the short caption back to the actual for other tests to work
 	error = cenRep->Set(shortCapKey,KCenRepShortCaption);
-	// Force the applist to be updated (so test app gets new language settings)
+// Force the applist to be updated (so test app gets new language settings)
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
+ForceApplistUpdate();
 	CleanupStack::PopAndDestroy(cenRep); //cenRep object
 	INFO_PRINTF1(_L("APPFWK-APPARC-0089:TestCenRepChangeNotificationL finished..."));
 	}
 	TInt ret = 0;
 	//French
 	_LIT(KCaptionFrench, "CRTstCap FR");
 	_LIT(KShortCaptionFrench, "CRTC FR");
-	_LIT(KIconFilenameFrench, "Z:\\resource\\apps\\svg_icon.svg");
+	_LIT(KIconFilenameFrench, "C:\\resource\\apps\\svg_icon.svg");
 	//German
 	_LIT(KCaptionGerman, "TstCap GE");
 	_LIT(KShortCaptionGerman, "TC GE");
-	_LIT(KIconFilenameGerman, "Z:\\resource\\apps\\ticoncapoverride.mbm");
+	_LIT(KIconFilenameGerman, "C:\\resource\\apps\\ticoncapoverride.mbm");
 	TApaAppInfo appInfo;
 	RFile file;
 	TBuf<KTextSize> fileName;
 	TEST(ret == KErrNone);
 	INFO_PRINTF2(_L("----System Language==>%d"), User::Language());
 	TEST(User::Language() == ELangFrench);//check language is set to French.
-	// Force the applist to be updated (so test app gets new language settings)
+ForceApplistUpdate();
-	RPointerArray<TDesC> dummy;
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
 	//Get test app's information
 	iLs.GetAppInfo(appInfo, KUidTestIconCapOverride);
 	//Get test app's icon information
 	TEST(ret == KErrNone);
 	INFO_PRINTF2(_L("----System Language==>%d"), User::Language());
 	TEST(User::Language() == ELangGerman);//check language is set to German.
 	// Force the applist to be updated (so test app gets new language settings)
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
+	ForceApplistUpdate();
 	//Get test app's information
 	iLs.GetAppInfo(appInfo, KUidTestIconCapOverride);
 	file.Close();
 	INFO_PRINTF2(_L("----System Language==>%d"), User::Language());
 	TEST(User::Language() == ELangEnglish);//check language is set to English.
 	// Force the applist to be updated (so test app gets new language settings)
-	User::LeaveIfError(iLs.ForceRegistration(dummy));
+	ForceApplistUpdate();
 	//Get test app's information
 	iLs.GetAppInfo(appInfo, KUidTestIconCapOverride);
 	file.Close();
 	printString.Zero();
 	printString.Copy(KCenRepIconFilename);
 	INFO_PRINTF2(_L("----Expected icon filename==>%S"), &printString);
 	INFO_PRINTF2(_L("----Retrieved icon filename==>%S"), &fileName);
 	TEST(fileName.Compare(KCenRepIconFilename)==0);
+	file.Close();
 	INFO_PRINTF1(_L("APPFWK-APPARC-0090:TestIconCaptionOverridesWithChangeLangL finished..."));
 	}
 /**
 @SYMTestCaseID 				APPFWK-APPARC-0091
 	TestCenRepChangeNotificationL();
 	TestIconCaptionOverridesMemoryLeaksL();
 	TestApiPrecedenceOverCenRepConfigInfoL();
 	}
+void CT_CaptionStep::ForceApplistUpdate()
+{
+// Force the applist to be updated (so test app gets new language settings)
+CSisFileInstaller sisFileInstaller;
+INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegAppSisFile);
+sisFileInstaller.InstallSisL(KForceRegAppSisFile);
+sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KForceRegAppComponent);
+}
+void CT_CaptionStep::ChangeLocaleWaitForApplistUpdate(TLanguage aLanguage)
+{
+TRequestStatus status;
+iLs.SetNotify(EFalse, status);
+ChangeLocaleL(aLanguage);
+User::WaitForRequest(status);
+}
+TVerdict CT_CaptionStep::doTestStepPreambleL()
+{
+CSisFileInstaller sisFileInstaller;
+INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile);
+sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile);
+INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppTiconcaptionoverrideSisFile);
+sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppTiconcaptionoverrideSisFile);
+SetTestStepResult(EPass);
+return TestStepResult();
+}
+TVerdict CT_CaptionStep::doTestStepPostambleL()
+{
+CSisFileInstaller sisFileInstaller;
+sisFileInstaller.UninstallSisL(KTstAppStandAloneComponent);
+sisFileInstaller.UninstallSisL(KTstAppTiconcaptionoverrideComponent);
+return TestStepResult();
+}
 TVerdict CT_CaptionStep::doTestStepL()
 	{
 	INFO_PRINTF1(_L("Test T_Caption step started....\n"));
 	// Connect to Servers
 	TEST(iFs.Connect() == KErrNone);
 	TEST(iLs.Connect() == KErrNone);
+// Change the locale
+ChangeLocaleL(ELangEnglish);
+TEST(User::Language() == ELangEnglish);
+ForceApplistUpdate();
 	// run language tests for the test caption
 	TRAPD(r, DoLanguageTestL());
 	TEST(r==KErrNone);
 	INFO_PRINTF2(_L("DoLanguageTestL() finished with value '%d'\n"), r);

branch	RCL_3
changeset 19	924385140d98
parent 0	2e3d3ce01487
child 20	c2c61fdca848