MCL/sf/os/osrndtools: comparison stif/StifTFwIf/src/UIStore.cpp

equal deleted inserted replaced

-:da2cedce4920
+:a9c038d69df8
 _LIT( KUIStoreIf, "CUiStoreIf" );
 //_LIT( KUIStoreDefaultDir, "C:\\TestFramework\\" );
 _LIT( KUIStoreSetStart, "[TestSetStart]" );
 _LIT( KUIStoreSetEnd, "[TestSetEnd]" );
-_LIT( KUIStoreSetName, "TestSetName=" );
 _LIT( KUIStoreSetCaseStart, "[TestSetCaseStart]" );
 _LIT( KUIStoreSetCaseEnd, "[TestSetCaseEnd]" );
 _LIT( KUIStoreCaseModuleName, "ModuleName=" );
 _LIT( KUIStoreTestCaseTitle, "Title=" );
 _LIT( KUIStoreTestCaseFile, "TestCaseFile=");
 stset->NullOriginalTestSet();
 }
 }
 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;
 }
 /*
 -------------------------------------------------------------------------------
 */
 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 )
 {
 return ret;
 {
 return ret;
 }
 TRAPD( err,
-SaveTestSetL( *setInfo, currSetName );
+SaveTestSetL( *setInfo, aSetName );
 );
-aSetName.Copy(currSetName);
 return err;
 }
 -------------------------------------------------------------------------------
 */
 EXPORT_C TInt CUIStore::LoadTestSet( const TDesC& aSetName )
 {
 TPtrC setName;
 TFileName tmp;
 TInt ret = ParseTestSetName( aSetName, setName, tmp );
 if( ret != KErrNone )
 {
 return ret;
 }
+CTestSetInfo* setInfo= NULL;
-TRAPD( err,
+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 );
 );
 if( err != KErrNone && err != KErrAlreadyExists )
 {
 Status: Draft
 -------------------------------------------------------------------------------
 */
-void CUIStore::LoadTestSetL( const TDesC& aSetName, const TDesC& aSetFileName )
+void CUIStore::LoadTestSetL( const TDesC& aSetName, const TDesC& /*aSetFileName*/ )
 {
 TPtrC tmp;
 TInt num;
 TInt high;
 TInt64 interval;
-CStifParser* parser = NULL;
+CStifParser* parser = CStifParser::NewL( KUIStoreDefaultDir, aSetName );
-TRAPD( err,
-parser = CStifParser::NewL( _L(""), aSetFileName );
-);
-if( err != KErrNone )
-{
-parser = CStifParser::NewL( KUIStoreDefaultDir, aSetName );
-}
 CleanupStack::PushL( parser );
 CStifSectionParser* section =
 parser->SectionL( KUIStoreSetStart, KUIStoreSetEnd );
 CleanupStack::PushL( section );
-CStifItemParser* item = section->GetItemLineL( KUIStoreSetName );
+CStifItemParser* item;
-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 );
 // Get started test case (if possible)
 TUint lastStartedCaseIndex = 0;
 item = section->GetItemLineL(KUIStoreLastStartedCaseIndex);
 if(item)
 {
 else
 {
 __TRACE(KInit, (_L("Could not find [%S] from test set file."), &KUIStoreLastStartedCaseIndex));
 }
-User::LeaveIfError( CreateTestSet( aSetName ) );
 CTestSetInfo* setInfo = NULL;
 User::LeaveIfError( FindSetByName( aSetName, setInfo ) );
 // Update started case
 buffer.Create(256);
 CleanupClosePushL(buffer);
 // 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);
 buffer.Format(_L("%S "), &KUIStoreLastStartedCaseIndex);
 TUint CTestSetInfo::GetLastStartedCaseIndex(void)
 {
 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

branch	RCL_3
changeset 14	a9c038d69df8
parent 0	a03f92240627
child 18	3406c99bc375