--- a/hti/HtiFramework/src/HtiDispatcher.cpp Tue May 25 14:22:58 2010 +0300
+++ b/hti/HtiFramework/src/HtiDispatcher.cpp Wed Jun 09 11:23:41 2010 +0300
@@ -124,7 +124,7 @@
iHtiInstanceId( 0 ),
iShowErrorDialogs( aShowErrorDialogs ),
iReconnectDelay(aReconnectDelay),
- iRebootReason(0)
+ iRebootReason(-1)
{
HTI_LOG_FORMAT( "MaxQueueMemorySize %d", iMaxQueueMemorySize );
iQueueSizeLowThresold = ( iMaxQueueMemorySize / 2 ) / 2;
@@ -869,7 +869,7 @@
}
else if(aMessage.Length() == 1)
{
- iRebootReason = 0;
+ iRebootReason = -1;
}
else
{
@@ -1039,7 +1039,7 @@
TInt err = KErrNone;
RProcess rebootProcess;
// First try the UI layer rebooter
- if(iRebootReason == 0)
+ if(iRebootReason == -1)
{
err = rebootProcess.Create( KHtiDeviceRebootExeUI, KNullDesC );
}
--- a/hti/hti_plat/hti_api/inc/HtiVersion.h Tue May 25 14:22:58 2010 +0300
+++ b/hti/hti_plat/hti_api/inc/HtiVersion.h Wed Jun 09 11:23:41 2010 +0300
@@ -25,13 +25,13 @@
// CONSTANTS
const TUint8 KHtiVersionMajor = 2;
-const TUint8 KHtiVersionMinor = 22;
+const TUint8 KHtiVersionMinor = 23;
const TUint8 KHtiVersionBuild = 0;
const TUint16 KHtiVersionYear = 2010;
-const TUint8 KHtiVersionMonth = 4;
-const TUint8 KHtiVersionWeek = 17;
-const TUint8 KHtiVersionDay = 30;
+const TUint8 KHtiVersionMonth = 5;
+const TUint8 KHtiVersionWeek = 19;
+const TUint8 KHtiVersionDay = 14;
// MACROS
--- a/piprofiler/engine/group/ProfilerEngine.mmp Tue May 25 14:22:58 2010 +0300
+++ b/piprofiler/engine/group/ProfilerEngine.mmp Wed Jun 09 11:23:41 2010 +0300
@@ -42,13 +42,13 @@
SOURCE ProfilerTimer.cpp
LIBRARY sysutil.lib
-LIBRARY EFSRV.LIB
-LIBRARY C32.LIB
-LIBRARY EUSER.LIB
+LIBRARY efsrv.lib
+LIBRARY c32.lib
+LIBRARY euser.lib
LIBRARY estor.lib
LIBRARY fbscli.lib
LIBRARY ws32.lib
LIBRARY bafl.lib
LIBRARY charconv.lib
LIBRARY ecom.lib
-LIBRARY PlatformEnv.lib
+LIBRARY platformenv.lib
--- a/piprofiler/engine/group/ProfilerEshell.mmp Tue May 25 14:22:58 2010 +0300
+++ b/piprofiler/engine/group/ProfilerEshell.mmp Wed Jun 09 11:23:41 2010 +0300
@@ -35,7 +35,7 @@
SOURCE ProfilerEshell.cpp
-LIBRARY C32.LIB
-LIBRARY EUSER.LIB
+LIBRARY c32.lib
+LIBRARY euser.lib
LIBRARY bafl.lib
LIBRARY efsrv.lib
--- a/piprofiler/plugins/BUPplugin/group/BUPPlugin.mmp Tue May 25 14:22:58 2010 +0300
+++ b/piprofiler/plugins/BUPplugin/group/BUPPlugin.mmp Wed Jun 09 11:23:41 2010 +0300
@@ -40,12 +40,12 @@
LIBRARY euser.lib
LIBRARY bafl.lib
-LIBRARY ECom.lib
+LIBRARY ecom.lib
LIBRARY apparc.lib
LIBRARY cone.lib
LIBRARY gdi.lib
LIBRARY ws32.lib
-LIBRARY EFSRV.LIB
+LIBRARY efsrv.lib
LIBRARY charconv.lib
-LIBRARY commonengine.lib
+LIBRARY CommonEngine.lib
LIBRARY flogger.lib
--- a/piprofiler/plugins/DebugOutputWriterPlugin/group/DebOutWriterPlugin.mmp Tue May 25 14:22:58 2010 +0300
+++ b/piprofiler/plugins/DebugOutputWriterPlugin/group/DebOutWriterPlugin.mmp Wed Jun 09 11:23:41 2010 +0300
@@ -45,7 +45,7 @@
SOURCE DebOutWriterPluginImplementationTable.cpp
LIBRARY euser.lib
-LIBRARY ECom.lib
-LIBRARY EFSRV.LIB
-LIBRARY commonengine.lib
+LIBRARY ecom.lib
+LIBRARY efsrv.lib
+LIBRARY CommonEngine.lib
LIBRARY flogger.lib
--- a/piprofiler/plugins/DiskWriterPlugin/group/DiskWriterPlugin.mmp Tue May 25 14:22:58 2010 +0300
+++ b/piprofiler/plugins/DiskWriterPlugin/group/DiskWriterPlugin.mmp Wed Jun 09 11:23:41 2010 +0300
@@ -43,8 +43,8 @@
LIBRARY sysutil.lib
LIBRARY euser.lib
-LIBRARY ECom.lib
-LIBRARY EFSRV.LIB
-LIBRARY commonengine.lib
+LIBRARY ecom.lib
+LIBRARY efsrv.lib
+LIBRARY CommonEngine.lib
LIBRARY flogger.lib
--- a/piprofiler/plugins/GeneralsPlugin/group/GeneralsPlugin.mmp Tue May 25 14:22:58 2010 +0300
+++ b/piprofiler/plugins/GeneralsPlugin/group/GeneralsPlugin.mmp Wed Jun 09 11:23:41 2010 +0300
@@ -41,12 +41,12 @@
LIBRARY euser.lib
LIBRARY bafl.lib
-LIBRARY ECom.lib
+LIBRARY ecom.lib
LIBRARY apparc.lib
LIBRARY cone.lib
LIBRARY ws32.lib
LIBRARY charconv.lib
-LIBRARY commonengine.lib
+LIBRARY CommonEngine.lib
LIBRARY flogger.lib
epocallowdlldata
--- a/stif/ConsoleUI/src/Consolemenus.cpp Tue May 25 14:22:58 2010 +0300
+++ b/stif/ConsoleUI/src/Consolemenus.cpp Wed Jun 09 11:23:41 2010 +0300
@@ -4067,17 +4067,6 @@
User::InfoPrint( _L("Test set saving failed at saving test set") );
}
- ret = iMain->UIStore().RemoveTestSet( currSetName );
- if( ret != KErrNone )
- {
- User::InfoPrint( _L("Test set saving failed at removing old test set") );
- }
-
- ret = iMain->UIStore().LoadTestSet( iTestSetName );
- if( ret != KErrNone )
- {
- User::InfoPrint( _L("Test set saving failed at reloding test set") );
- }
break;
default:
--- a/stif/StifTFwIf/src/UIStore.cpp Tue May 25 14:22:58 2010 +0300
+++ b/stif/StifTFwIf/src/UIStore.cpp Wed Jun 09 11:23:41 2010 +0300
@@ -46,7 +46,6 @@
_LIT( KUIStoreSetStart, "[TestSetStart]" );
_LIT( KUIStoreSetEnd, "[TestSetEnd]" );
-_LIT( KUIStoreSetName, "TestSetName=" );
_LIT( KUIStoreSetCaseStart, "[TestSetCaseStart]" );
_LIT( KUIStoreSetCaseEnd, "[TestSetCaseEnd]" );
_LIT( KUIStoreCaseModuleName, "ModuleName=" );
@@ -1071,7 +1070,23 @@
}
delete setInfo;
-
+ TFileName setfile;
+ setfile.Append(KUIStoreDefaultDir);
+ setfile.Append(aSetName);
+ RFs fs;
+ TInt err=fs.Connect();
+ if(err!=KErrNone)
+ {
+ fs.Close();
+ return err;
+ }
+ err=fs.Delete(setfile);
+ if(err!=KErrNone)
+ {
+ fs.Close();
+ return err;
+ }
+
return KErrNone;
}
@@ -1321,27 +1336,65 @@
EXPORT_C TInt CUIStore::SaveTestSet2( TDes& aSetName )
{
+ RRefArray<TDesC> testsets;
+
+ GetTestSetsList(testsets);
+ TBool isexist(EFalse);
+ for(TInt i=0;i<testsets.Count();i++)
+ {
+ if(testsets[i]==aSetName)
+ {
+ isexist=ETrue;
+ break;
+ }
+
+ }
+ testsets.Reset();
+ if(!isexist)
+ {
+ TTime current;
+ TDateTime date_rep;
+ current.HomeTime();
+ date_rep = current.DateTime();
+ TBuf<32> currSetName;
+ _LIT(f_ext,".set");
+
+ //create "test set name" string
+ currSetName.AppendNum(date_rep.Year());
+ currSetName.Append('_');
+ currSetName.AppendNum(date_rep.Month()+1); // Incrimination necessary, because Day and Month fields of TDateTime class are 0 based
+ currSetName.Append('_');
+ currSetName.AppendNum(date_rep.Day()+1);
+ currSetName.Append('_');
+ currSetName.AppendNum(date_rep.Hour());
+ currSetName.Append('_');
+ currSetName.AppendNum(date_rep.Minute());
+ currSetName.Append('_');
+ currSetName.AppendNum(date_rep.Second());
+ currSetName.Append(f_ext);
+
+ for(TInt i=0;i<iTestSets.Count();i++)
+ {
+ if(iTestSets[i]->Name()==aSetName)
+ {
+ iTestSets[i]->RenameTestSet(currSetName);
+
+ }
+
+ }
+
+
+
+ aSetName.Zero();
+ aSetName.Copy(currSetName);
+
+
+
+ }
TPtrC setName;
TFileName tmp;
- TTime current;
- TDateTime date_rep;
- current.HomeTime();
- date_rep = current.DateTime();
- TBuf<32> currSetName;
- _LIT(f_ext,".set");
-
- //create "test set name" string
- currSetName.AppendNum(date_rep.Year());
- currSetName.Append('_');
- currSetName.AppendNum(date_rep.Month()+1); // Incrimination necessary, because Day and Month fields of TDateTime class are 0 based
- currSetName.Append('_');
- currSetName.AppendNum(date_rep.Day()+1);
- currSetName.Append('_');
- currSetName.AppendNum(date_rep.Hour());
- currSetName.Append('_');
- currSetName.AppendNum(date_rep.Minute());
- currSetName.Append(f_ext);
+
TInt ret = ParseTestSetName( aSetName, setName, tmp );
if( ret != KErrNone )
@@ -1357,10 +1410,10 @@
}
TRAPD( err,
- SaveTestSetL( *setInfo, currSetName );
+ SaveTestSetL( *setInfo, aSetName );
);
- aSetName.Copy(currSetName);
+
return err;
@@ -1387,7 +1440,6 @@
*/
EXPORT_C TInt CUIStore::LoadTestSet( const TDesC& aSetName )
{
-
TPtrC setName;
TFileName tmp;
TInt ret = ParseTestSetName( aSetName, setName, tmp );
@@ -1395,8 +1447,28 @@
{
return ret;
}
-
- TRAPD( err,
+ CTestSetInfo* setInfo= NULL;
+
+ FindSetByName( setName, setInfo );
+ if(setInfo != NULL)
+ {
+ return KErrNone;
+ }
+
+ TRAPD( err,
+ setInfo = CTestSetInfo::NewL( aSetName );
+ );
+ if( err != KErrNone )
+ {
+ return err;
+ }
+ if( iTestSets.Append( setInfo ) != KErrNone )
+ {
+ delete setInfo;
+ return KErrNoMemory;
+ }
+
+ TRAP( err,
LoadTestSetL( setName, aSetName );
);
@@ -1848,7 +1920,7 @@
-------------------------------------------------------------------------------
*/
-void CUIStore::LoadTestSetL( const TDesC& aSetName, const TDesC& aSetFileName )
+void CUIStore::LoadTestSetL( const TDesC& aSetName, const TDesC& /*aSetFileName*/ )
{
TPtrC tmp;
@@ -1856,15 +1928,8 @@
TInt high;
TInt64 interval;
- CStifParser* parser = NULL;
-
- TRAPD( err,
- parser = CStifParser::NewL( _L(""), aSetFileName );
- );
- if( err != KErrNone )
- {
- parser = CStifParser::NewL( KUIStoreDefaultDir, aSetName );
- }
+ CStifParser* parser = CStifParser::NewL( KUIStoreDefaultDir, aSetName );
+
CleanupStack::PushL( parser );
@@ -1872,24 +1937,8 @@
parser->SectionL( KUIStoreSetStart, KUIStoreSetEnd );
CleanupStack::PushL( section );
- CStifItemParser* item = section->GetItemLineL( KUIStoreSetName );
- CleanupStack::PushL( item );
-
- User::LeaveIfError( item->GetString( KUIStoreSetName, tmp ) );
-
- // get the standard method
- TCollationMethod method = *Mem::CollationMethodByIndex(0);
- // ignore case
- method.iFlags |= TCollationMethod::EFoldCase;
-
- TInt compare = aSetName.CompareC( tmp, 3, &method );
- if( compare != KErrNone )
- {
- User::LeaveIfError( KErrNotFound );
- }
-
- CleanupStack::PopAndDestroy( item );
-
+ CStifItemParser* item;
+
// Get started test case (if possible)
TUint lastStartedCaseIndex = 0;
item = section->GetItemLineL(KUIStoreLastStartedCaseIndex);
@@ -1908,7 +1957,6 @@
__TRACE(KInit, (_L("Could not find [%S] from test set file."), &KUIStoreLastStartedCaseIndex));
}
- User::LeaveIfError( CreateTestSet( aSetName ) );
CTestSetInfo* setInfo = NULL;
User::LeaveIfError( FindSetByName( aSetName, setInfo ) );
@@ -2048,8 +2096,6 @@
// Saving
buffer.Format(_L("%S"), &KUIStoreSetStart);
WriteLineL(file, buffer);
- buffer.Format(_L("%S %S"), &KUIStoreSetName,&aSetFileName);
- WriteLineL(file, buffer);
// Saving test set causes reset of index
aSetInfo.SetLastStartedCaseIndex(0);
@@ -4737,6 +4783,31 @@
return iLastStartedCaseIndex;
}
+/*
+-------------------------------------------------------------------------------
+
+ Class: CTestSetInfo
+
+ Method: RenameTestSet
+
+ Description: rename test set
+
+ Parameters: aTestSetName : new TestSetName
+
+ Return Values: TInt: KErrNone if success.
+
+ Errors/Exceptions: None
+
+ Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+void CTestSetInfo::RenameTestSet(const TDesC& aTestSetName)
+ {
+ delete iName;
+ iName=NULL;
+ iName=aTestSetName.AllocL();
+ }
// ================= OTHER EXPORTED FUNCTIONS =================================
// End of File
--- a/stif/TouchConsoleUI/group/TouchConsoleUI.mmp Tue May 25 14:22:58 2010 +0300
+++ b/stif/TouchConsoleUI/group/TouchConsoleUI.mmp Wed Jun 09 11:23:41 2010 +0300
@@ -21,10 +21,10 @@
TARGET TouchConsoleUI.exe
TARGETTYPE exe
-
+UID 0 0x2002C347
CAPABILITY AllFiles CommDD
-VENDORID 0x101FB657
-SECUREID 0x102073DA
+//VENDORID 0x101FB657
+//SECUREID 0x102073DA
USERINCLUDE ../inc
USERINCLUDE ../../inc
--- a/stif/TouchConsoleUI/src/Consolemenus.cpp Tue May 25 14:22:58 2010 +0300
+++ b/stif/TouchConsoleUI/src/Consolemenus.cpp Wed Jun 09 11:23:41 2010 +0300
@@ -3992,7 +3992,7 @@
*/
CMenu* CTestSetMenu::SelectL( TKeyCode aSelection, TBool& aContinue )
{
- TBuf<32> currSetName;
+
MapKeyCode(aSelection);
if( ( aSelection != EKeyRightArrow ) &&
@@ -4064,28 +4064,11 @@
return iSubMenu;
case ESetSave:
- // during the save operation default set name (ConsoleUI.set) is replaced with
- // new name created base on current date.
- // Set is the reloaded to make sure that
- // old test set with default name will not affect test execution
- currSetName.Copy( iTestSetName );
ret = iMain->UIStore().SaveTestSet2( iTestSetName );
if( ret != KErrNone )
{
- User::InfoPrint( _L("Test set saving failed at saving test set") );
- }
-
- ret = iMain->UIStore().RemoveTestSet( currSetName );
- if( ret != KErrNone )
- {
- User::InfoPrint( _L("Test set saving failed at removing old test set") );
- }
-
- ret = iMain->UIStore().LoadTestSet( iTestSetName );
- if( ret != KErrNone )
- {
- User::InfoPrint( _L("Test set saving failed at reloding test set") );
- }
+ User::InfoPrint( _L("Test set saving failed") );
+ }
break;
default:
--- a/stif/group/ReleaseNote.txt Tue May 25 14:22:58 2010 +0300
+++ b/stif/group/ReleaseNote.txt Wed Jun 09 11:23:41 2010 +0300
@@ -1,5 +1,5 @@
========================================================================
-RELEASE NOTE FOR STIF - STIF_201018 (7.3.32)
+RELEASE NOTE FOR STIF - STIF_201020 (7.3.33)
SUPPORTING SERIES 60 3.0 ->
========================================================================
--- a/stif/inc/version.h Tue May 25 14:22:58 2010 +0300
+++ b/stif/inc/version.h Wed Jun 09 11:23:41 2010 +0300
@@ -20,9 +20,9 @@
#define STIF_MAJOR_VERSION 7
#define STIF_MINOR_VERSION 3
-#define STIF_BUILD_VERSION 32
+#define STIF_BUILD_VERSION 33
-#define STIF_REL_DATE "04th May 2010"
+#define STIF_REL_DATE "18th May 2010"
#define TO_UNICODE(text) _L(text)
Binary file stif/sis/Stif_31.sis has changed
--- a/stif/stif_plat/inc/UIStoreIf.h Tue May 25 14:22:58 2010 +0300
+++ b/stif/stif_plat/inc/UIStoreIf.h Wed Jun 09 11:23:41 2010 +0300
@@ -221,6 +221,10 @@
* Gets the info which test case has been started lately.
*/
TUint GetLastStartedCaseIndex(void);
+ /**
+ * rename test set
+ */
+ void RenameTestSet(const TDesC& aTestSetName);
public: // Functions from base classes