FCL/sf/app/contacts: comparison contacts_plat/predictivesearch_utils_api/tsrc/PsUtilsTestSuite/src/TestSuiteInputData.cpp

equal deleted inserted replaced

-:4ae315f230bc
+:a6539d1e8e43
 // ----------------------------------------------------------------------------
 CTestSuiteInputData::CTestSuiteInputData()
 {
 }
 // ----------------------------------------------------------------------------
 // Destructor
 // ----------------------------------------------------------------------------
 CTestSuiteInputData::~CTestSuiteInputData()
 {
 if(iQueryBuf)
 {
 	delete iQueryBuf;
 		iQueryBuf = NULL;
 }
 {
 	delete iKeyboardModeBuf;
 	iKeyboardModeBuf = NULL;
 }
+iCacheUris.ResetAndDestroy();
-	iCacheUris.ResetAndDestroy();
 	iDisplayFields.Close();
 }
 // ----------------------------------------------------------------------------
 // Destructor
 // ----------------------------------------------------------------------------
 	return iId;
 }
 void CTestSuiteInputData::Data(RPointerArray<TDesC> & aDataArray)
 {
-	for(TInt i = 0 ; i < iDataArray.Count(); i++)
+	for(TInt i = 0; i < iDataArray.Count(); i++)
 	{
 		aDataArray.Append(iDataArray[i]->AllocL());
 	}
+}
-}
 // ----------------------------------------------------------------------------
 // Sets the keyboard mode
 // ----------------------------------------------------------------------------
 void CTestSuiteInputData::SetKeyboardModeL(const TDesC& aKeyboardMode)
 {
 // ----------------------------------------------------------------------------
 void CTestSuiteInputData::SetQueryL(const TDesC& aQuery)
 {
 	iQueryBuf = aQuery.AllocL();
 }
 // ----------------------------------------------------------------------------
 // Return the cache uri at given index
 // ----------------------------------------------------------------------------
 TDesC& CTestSuiteInputData::CacheUriAt(TInt aIndex) const
 	}
 return *(iCacheUris[aIndex]);
 }
 // ----------------------------------------------------------------------------
 // Return the cache uri
 // ----------------------------------------------------------------------------
 void CTestSuiteInputData::CacheUris(RPointerArray<TDesC> & aUriArray)
 {
-	for(TInt i = 0 ; i < iCacheUris.Count(); i++)
+	for(TInt i = 0; i < iCacheUris.Count(); i++)
 	{
 		aUriArray.Append(iCacheUris[i]->AllocL());
 	}
 }
 // ----------------------------------------------------------------------------
 // Sets the cache uris
 // ----------------------------------------------------------------------------
 void CTestSuiteInputData::ApendCacheUrisL(RPointerArray<TDesC>& aCacheUriArray)
-{   iCacheUris.ResetAndDestroy();
+{
+iCacheUris.ResetAndDestroy();
 	for(TInt i =0; i <aCacheUriArray.Count(); i++ )
 	iCacheUris.Append(aCacheUriArray[i]);
 }
 // ----------------------------------------------------------------------------
 // Second phase construction
 // ----------------------------------------------------------------------------
 void CTestSuiteInputData::ConstructL(CStifItemParser& /*aItem*/)
 {
 }
 // -----------------------------------------------------------------------------
 // This function parses the input parameters
 // -----------------------------------------------------------------------------
 			TPtrC16 dataPtr = string.Mid(sqBracketStartPos + 1,sqBracketEndPos - sqBracketStartPos - 1 );
 			// Check the type of tag, then do the corresponding parsing
-		   if(optionPtr.Compare(KSearchQueryTag) == 0)
+		    if(optionPtr.Compare(KSearchQueryTag) == 0)
 		    {
 		    	// Search query
 		    	ParseInputForSearchQueryL(dataPtr);
 		    }
 		}
 		else
 		{
 			// Wrong Input..
 			User::Leave(KErrGeneral);
 		}
+	}
-	}
+}
-}
 // -----------------------------------------------------------------------------
 // This function parses input for number id
 // -----------------------------------------------------------------------------
 void CTestSuiteInputData::ParseInputForIdL(TDesC& aInput)
 {
+TInt fieldId = 0;
-		TInt fieldId = 0;
+TLex num(aInput);
-		TLex num(aInput);
+TInt err = num.Val(fieldId);
-		TInt err = num.Val(fieldId);
+if(err == KErrNone)
-		if(err == KErrNone)
+{
-		{
+iId = fieldId;
-			iId = fieldId;
+}
-		}
+else
-		else
+{
-		{
+User::Leave(KErrArgument);
-			User::Leave(KErrArgument);
+}
-		}
 }
 // -----------------------------------------------------------------------------
 // This function parses input for sort type
 // -----------------------------------------------------------------------------
 	// Get the uris which are separated by commas
 	GetCharacterSeparatedDataL( aInput,separator, data);
 	for(TInt i = 0; i< data.Count(); i++)
 	{
-	        HBufC *temp =  data[i]->AllocL();
+HBufC *temp =  data[i]->AllocL();
-			iDataArray.Append(data[i]);
+iDataArray.Append(data[i]);
 	}
 }
 // -----------------------------------------------------------------------------
 // This function parses input for cache uris
 	// Get the uris which are separated by commas
 	GetCharacterSeparatedDataL( aInput,separator, Uris);
 	for(TInt i = 0; i< Uris.Count(); i++)
 	{
-	        HBufC *temp =  Uris[i]->AllocL();
+HBufC *temp =  Uris[i]->AllocL();
-			iCacheUris.Append(Uris[i]);
+iCacheUris.Append(Uris[i]);
+	}
-	}
+}
-}
 // -----------------------------------------------------------------------------
 // This function parses the input for display fields
 // -----------------------------------------------------------------------------
 void CTestSuiteInputData::ParseInputForDisplayFieldsL(TDesC& aInput)
 	for(TInt i = 0; i< dispFieldsBuf.Count(); i++)
 	{
 		TInt fieldId = 0;
 		TLex num(*(dispFieldsBuf[i]));
-		    TInt err = num.Val(fieldId);  // parse the string to extract integer value
+TInt err = num.Val(fieldId);  // parse the string to extract integer value
-			if(err != KErrNone)
+if(err != KErrNone)
-			{
+{
-				User::Leave(KErrGeneral);
+User::Leave(KErrGeneral);
-			}
+}
-			else
+else
-			{
+{
-			    iDisplayFields.Append(fieldId);
+iDisplayFields.Append(fieldId);
-			}
+}
 	}
 }
 // -----------------------------------------------------------------------------
 // This function parses the input for expected group ids
 	for(TInt i = 0; i< grpIdsBuf.Count(); i++)
 	{
 		TInt groupId = 0;
 		TLex num(*(grpIdsBuf[i]));
-		    TInt err = num.Val(groupId);  // parse the string to extract integer value
+TInt err = num.Val(groupId);  // parse the string to extract integer value
-			if(err != KErrNone)
+if(err != KErrNone)
-			{
+{
-				User::Leave(KErrGeneral);
+User::Leave(KErrGeneral);
-			}
+}
-			else
+else
-			{
+{
-			    iGroupIds.Append(groupId);
+iGroupIds.Append(groupId);
-			}
+}
 	}
 }
 // -----------------------------------------------------------------------------
 // This function splits the the input separated by particular character
 // -----------------------------------------------------------------------------
 void CTestSuiteInputData::GetCharacterSeparatedDataL(TDesC& aInput,TChar aSeparator, RPointerArray<TDesC> &aSeparatedData)
 {
 	TInt SeparatorPos = -1 ;
 for (TInt j = 0 ; j< aInput.Length();)
 	{
+TInt Startpos = SeparatorPos + 1;
-	        TInt Startpos = SeparatorPos + 1;
 		// Get the data for each contact
-			while((aInput[j] != aSeparator) && (j < ( aInput.Length()-1) ) )
+while((aInput[j] != aSeparator) && (j < ( aInput.Length()-1) ) )
-			     j++;
+j++;
-			if(j == (aInput.Length() - 1))
+		if(j == (aInput.Length() - 1))
-			 j++;
+			j++;
-			TPtrC16 dataPtr = aInput.Mid(Startpos ,j - Startpos);
+TPtrC16 dataPtr = aInput.Mid(Startpos ,j - Startpos);
+// Add data to the output
-			// Add data to the output
+HBufC* tempData = dataPtr.AllocL();
-			HBufC* tempData = dataPtr.AllocL();
+aSeparatedData.Append(tempData);
-			aSeparatedData.Append(tempData);
+SeparatorPos = j ;
-			SeparatorPos = j ;
+j++;
-			j++;
+}
-		}
 }
 // -----------------------------------------------------------------------------
 // This function parses the input for search query
 // -----------------------------------------------------------------------------
 void CTestSuiteInputData::ParseInputForSearchQueryL(TDesC& aInput)
 {
 	RPointerArray<TDesC> queryData;
 	TChar separator = ',';
 	GetCharacterSeparatedDataL( aInput,separator, queryData);
 // If there are more than 2 field, then it is an error
 else
 {
 	queryData.ResetAndDestroy();
 	User::Leave(KErrArgument);
 }
+}
-}
 // -----------------------------------------------------------------------------
 // This function creates the search query from the input buffer
 // -----------------------------------------------------------------------------
 void CTestSuiteInputData::CreateSearchQueryL(CPsQuery& aPsQuery,TDesC& aQueryBuf)
 	    item1->SetMode(keyboardMode);
 	    aPsQuery.AppendL(*item1);
 	}
 }
 // -----------------------------------------------------------------------------
 // Perform the search settings
 // -----------------------------------------------------------------------------
 void CTestSuiteInputData::PerformSearchSettingsL(CPsSettings& aSettings)
 {
 	RPointerArray<TDesC> databases; // list of databases
 	RArray<TInt> displayFields;     // list of display fields
 	TInt maxResults = 100;
 	// add the display fields
 if(iDisplayFields.Count())
 {
 		for(TInt i =0; i<iDisplayFields.Count();i++)
 		    displayFields.Append(iDisplayFields[i]);
 }
 else
 {
 	    displayFields.Append(6); // Firstname
 	    displayFields.Append(4); // Lastname
 	    displayFields.Append(27); // Company name
 }
 // Set the databases to be searched
 	for(TInt i =0; i <iCacheUris.Count(); i++ )
 	{
 		databases.Append(iCacheUris[i]->AllocL());
 	}
 	// Perform the settings
 	aSettings.SetSearchUrisL(databases);
 aSettings.SetDisplayFieldsL(displayFields);
 aSettings.SetMaxResults(maxResults);
 	// cleanup
 	displayFields.Close();
 	databases.Reset();
 	databases.Close();
 }
 TInt CTestSuiteInputData::CompareByDataL ( const CPsClientData& aObject1, const CPsClientData& aObject2 )
 {
 	TBuf<KBufferMaxLen> data1;
 TBuf<255> data2;
 _LIT(KSpace, " ");
 data1 = KNullDesC;
 for ( int i = 0; i < aObject1.DataElementCount(); i++ )
 {
-	 if ( aObject1.Data(i) )
+if ( aObject1.Data(i) )
-	     {
+{
-	     	data1 += aObject1.Data(i)->Des();
+data1 += aObject1.Data(i)->Des();
-	     	data1 += KSpace;
+data1 += KSpace;
-	     }
+}
 }
 // Trim the unnecessary white spaces before we compare
 data1.TrimAll();
 data2 = KNullDesC;
 for ( int i = 0; i < aObject2.DataElementCount(); i++ )
 {
-	 if ( aObject2.Data(i) )
+if ( aObject2.Data(i) )
-	     {
+{
-	     	data2 += aObject2.Data(i)->Des();
+data2 += aObject2.Data(i)->Des();
-	     	data2 += KSpace;
+data2 += KSpace;
-	     }
+}
 }
 // Trim the unnecessary white spaces before we compare
 data2.TrimAll();
-	 // Get the standard method
+// Get the standard method
-	 TCollationMethod meth = *Mem::CollationMethodByIndex( 0 );
+TCollationMethod meth = *Mem::CollationMethodByIndex( 0 );
-	 meth.iFlags |= TCollationMethod::EIgnoreNone;
+meth.iFlags |= TCollationMethod::EIgnoreNone;
-	 meth.iFlags |= TCollationMethod::EFoldCase;
+meth.iFlags |= TCollationMethod::EFoldCase;
-	 // Magic: Collation level 3 is used
+// Magic: Collation level 3 is used
-	 TInt comparison(data1.CompareC( data2, 3, &meth ));
+TInt comparison(data1.CompareC( data2, 3, &meth ));
-	 return comparison;
+return comparison;
 }
 // End of file

branch	RCL_3
changeset 39	a6539d1e8e43
parent 0	e686773b3f54
child 64	c1e8ba0c2b16