FCL/sf/os/persistentdata: comparison loggingservices/eventlogger/test/src/t

equal deleted inserted replaced

-:047f208ea78f
+:8dc8494f1e0e
 #include <s32file.h>
 #include <e32math.h>
 #include <logview.h>
 #include <s32mem.h>
 #include "t_logutil2.h"
+#include "t_logutil3.h"
 #define UNUSED_VAR(a) a = a
 const TLogContactItemId KTestContact = 0x1234;
 const TInt KTestEventNum = 10;
 Add the event once again and check for the already exits condition.
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestAddEventTypeL(CLogClient& aClient)
-//
-//
-//
 	{
 	LOGTEXT("TestAddEventTypeL()");
 	CLogEventType* type = CLogEventType::NewL();
 	CleanupStack::PushL(type);
 @SYMTestActions  	    Tests for the retrieved information of event type.
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestGetEventTypeL(CLogClient& aClient)
-//
-//
-//
 	{
 	LOGTEXT("TestGetEventTypeL()");
 	CLogEventType* type = CLogEventType::NewL();
 	CleanupStack::PushL(type);
 @SYMTestActions  	    Create a new event type,change the event type and check for any errors
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestChangeEventTypeL(CLogClient& aClient)
-//
-//
-//
 	{
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-0836 "));
 	LOGTEXT("TestChangeEventTypeL()");
 	CTestActive* active = new(ELeave)CTestActive();
 	CleanupStack::PushL(active);
 @SYMTestActions  	    Delete an event type from log database and test for no errors found
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestDeleteEventTypeL(CLogClient& aClient)
-//
-//
-//
 	{
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-0837 "));
 	LOGTEXT("TestChangeEventTypeL()");
 	CTestActive* active = new(ELeave)CTestActive();
 	CleanupStack::PushL(active);
 @SYMTestActions  	    Add an event type to the log database and test for no errors found
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestAddEventL(CLogClient& aClient)
-//
-//
-//
 	{
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-1329 "));
 	CLogEventType* type = CLogEventType::NewL();
 	CleanupStack::PushL(type);
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestGetEventL(CLogClient& aClient)
-//
-//
-//
 	{
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-0839 "));
 	CTestActive* active = new(ELeave)CTestActive();
 	CleanupStack::PushL(active);
 Check for any errors.
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestChangeEventL(CLogClient& aClient)
-//
-//
-//
 	{
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-0840 "));
 	CTestActive* active = new(ELeave)CTestActive();
 	CleanupStack::PushL(active);
 @SYMTestActions  	    Delete the event and test for no errors found.
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestDeleteEventL(CLogClient& aClient)
-//
-//
-//
 	{
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-0841 "));
 	CTestActive* active = new(ELeave)CTestActive();
 	CleanupStack::PushL(active);
 	CleanupStack::PopAndDestroy(2); // event, active
 	}
 #ifdef SYSLIBS_TEST
 /**
 @SYMTestCaseID          SYSLIB-LOGENG-UT-4015
 @SYMTestCaseDesc	    Test the behaviour implemented by PREQ2103
 @SYMTestPriority 	    Medium
-@SYMTestActions  	    Get the settings from logeng repository file / resource file.
+@SYMTestActions  	    Get the settings from logeng repository file or their default values.
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ11125
 REQ11126
 REQ11127
 REQ11128
 */
 LOCAL_C void TestGetConfigSettingsFromRepositoryFileL(CLogClient& aClient)
 	{
-	//Note: if this test starts failing, then go and check the CentralRepository private data cage
-	//(c:\\private\\10202be9 or z:\\private\\10202be9) if 101f401d.txt file is there.
-	//If it is then delete it and try the test again.
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-UT-4015 "));
-	//Get the contact match count and contact name format.This should be from resource file.
-	TInt16 contactMatchCount;
+	TInt contactMatchCount1;
-	TInt16 contactNameFormat;
+	TLogContactNameFormat contactNameFormat1;
+	LogGetContactmatchCountAndNameFormatL(contactMatchCount1, contactNameFormat1);
+	TheTest.Printf(_L("Contact match count = %d, contact name format = %d\r\n"), contactMatchCount1, (TInt)contactNameFormat1);
+	//contactMatchCount1 and contactNameFormat1 are loaded directly from the repository, if exists.
+	//Otherwise they are initialzied with their default values from the LogServ resource file.
+	//The LogEng server should load these resource values in a similar way.
+	//They will be stored in contactMatchCount2 and contactNameFormat2.
+	TInt16 contactMatchCount2;
+	TInt16 contactNameFormat2;
 	RFs fs;
 	LEAVE_IF_ERROR(fs.Connect());
 	CleanupClosePushL(fs);
 	//Creating a new CLogClient Object make the server getting the contact match settings.
-	//As the database is deleted it get them from the resource file.
+	//As the database is deleted it gets them from the LogEng repository.
 	CLogClient* client2 = CLogClient::NewL(fs);
 	CleanupStack::PushL(client2);
 	CleanupStack::PopAndDestroy(client2);
 	//Read these settings via "reader" object.
 	CleanupClosePushL(resFileFormat_reader);
 	_LIT(KLogengTestFileNameCount, "c:\\test\\test_logengconfig_count.ini");
 	_LIT(KLogengTestFileNameFormat, "c:\\test\\test_logengconfig_format.ini");
 	LEAVE_IF_ERROR(resFileCount_reader.Open(fs, KLogengTestFileNameCount, EFileRead));
 	LEAVE_IF_ERROR(resFileFormat_reader.Open(fs, KLogengTestFileNameFormat, EFileRead));
-	contactMatchCount = resFileCount_reader.ReadInt32L();
+	contactMatchCount2 = resFileCount_reader.ReadInt32L();
-	contactNameFormat = resFileFormat_reader.ReadInt32L();
+	contactNameFormat2 = resFileFormat_reader.ReadInt32L();
-	//The settings should match the ones from resource file.
+	//The settings loaded by the LogEng server should match the ones loaded by this test.
-	TEST(contactMatchCount == 8);
+	TEST(contactMatchCount1 == contactMatchCount2);
-	TEST(contactNameFormat == 0);
+	TEST(contactNameFormat1 == contactNameFormat2);
 	CleanupStack::PopAndDestroy(&resFileFormat_reader);
 	CleanupStack::PopAndDestroy(&resFileCount_reader);
 	//Get the config settings (Three config settings).
 	active->StartL();
 	aClient.GetConfig(config, active->iStatus);
 	CActiveScheduler::Start();
 	TEST2(active->iStatus.Int(), KErrNone);
-	//The config settings should match the ones from the resource file.
+	//The config settings should match the ones from the repository.
 	TEST(config.iMaxEventAge == 2592000);
 	TEST(config.iMaxLogSize == 1000);
 	TEST(config.iMaxRecentLogSize == 20);
 	CleanupClosePushL(repFileCount_reader);
 	RFileReadStream repFileFormat_reader;
 	CleanupClosePushL(repFileFormat_reader);
 	LEAVE_IF_ERROR(repFileCount_reader.Open(fs, KLogengTestFileNameCount, EFileRead));
 	LEAVE_IF_ERROR(repFileFormat_reader.Open(fs, KLogengTestFileNameFormat, EFileRead));
-	contactMatchCount = repFileCount_reader.ReadInt32L();
+	contactMatchCount2 = repFileCount_reader.ReadInt32L();
-	contactNameFormat = repFileFormat_reader.ReadInt32L();
+	contactNameFormat2 = repFileFormat_reader.ReadInt32L();
 	CleanupStack::PopAndDestroy(&repFileFormat_reader);
 	CleanupStack::PopAndDestroy(&repFileCount_reader);
 	CleanupStack::PopAndDestroy(&fs);
 	//The values should match the ones from the repository file.
-	TEST(contactMatchCount == 6);
+	TEST(contactMatchCount2 == 6);
-	TEST(contactNameFormat == 1);
+	TEST(contactNameFormat2 == 1);
 	//delete the repository file c:\\private\\10202be9\\101f401d.txt.
 	_LIT(KCommandParameters2,		"c:\\private\\10202be9\\101f401d.txt;private\\10202be9\101f401d.txt;2");
 	r = process.Create(KExecutableFileName, KCommandParameters2);
 	process.Resume();
 @SYMTestActions  	    Tests for CLogClient::GetConfig() function,check for the integrity of the data
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestGetConfigL(CLogClient& aClient)
-//
-//
-//
 	{
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-0842 "));
 	CTestActive* active = new(ELeave)CTestActive();
 	CleanupStack::PushL(active);
 @SYMTestActions  	    Change the configuration data and test for the integrity.
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestChangeConfigL(CLogClient& aClient)
-//
-//
-//
 	{
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-0843 "));
 	CTestActive* active = new(ELeave)CTestActive();
 	CleanupStack::PushL(active);
 @SYMTestActions  	    Get the string from the resource file and check for no errors and the zero string length
 @SYMTestExpectedResults Test must not fail
 @SYMREQ                 REQ0000
 */
 LOCAL_C void TestGetStringL(CLogClient& aClient)
-//
-//
-//
 	{
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-0844 "));
 	TBuf<KLogMaxSharedStringLength> str;
 	TInt err = aClient.GetString(str, R_LOG_DIR_IN);

branch	RCL_3
changeset 50	8dc8494f1e0e
parent 45	cc28652e0254
child 56	839ea9debada