FCL/sf/app/contacts: comparison phonebookengines/contactsmodel/tsrc/cntplsql/src/t

equal deleted inserted replaced

-:de1630741fbe
+:2a11b5b00470
 //  INTERNAL INCLUDES
 #include "t_cpplpredictivesearchtable.h"
 #include "pltables.h"
 #include "dbsqlconstants.h"
+#include "cpcskeymap.h" // USE_ORBIT_KEYMAP macro
 //  SYSTEM INCLUDES
 #include <digia/eunit/eunitmacros.h>
 #include <f32file.h> // added for setup2L()
 _LIT(KTestFirstName, "123");
 _LIT(KTestLastName, "45678");
 // Must have same value as KMaxDigits in cpplpredictivesearchtable.cpp
 const TInt KMaxDigits = 15;
+const TInt KTableCount = 12;
 // Must have same value as KConversionError in cpplpredictivesearchtable.cpp
 const quint64 KConversionError = 0xeeeeeeeeeeeeeee;
 }
 void UT_CPplPredictiveSearchTable::UT_ConvertToHexL()
 	{
 	// Basic case
-	EUNIT_ASSERT_EQUALS(0x4458aaaaaaaaaaa, iTable->ConvertToHex("4458"));
+	EUNIT_ASSERT_EQUALS(0x4458fffffffffff, iTable->ConvertToHex("4458"));
+	// Long digit
+	EUNIT_ASSERT_EQUALS(0x123456789012345, iTable->ConvertToHex("123456789012345"));
 	// Trailing zeros
-	EUNIT_ASSERT_EQUALS(0x12345678900aaaa, iTable->ConvertToHex("12345678900"));
+	EUNIT_ASSERT_EQUALS(0x12345678900ffff, iTable->ConvertToHex("12345678900"));
 	// Leading zeros
-	EUNIT_ASSERT_EQUALS(0x00123456789aaaa, iTable->ConvertToHex("00123456789"));
+	EUNIT_ASSERT_EQUALS(0x00123456789ffff, iTable->ConvertToHex("00123456789"));
 	// Just zeros
-	EUNIT_ASSERT_EQUALS(0x00000aaaaaaaaaa, iTable->ConvertToHex("00000"));
+	EUNIT_ASSERT_EQUALS(0x00000ffffffffff, iTable->ConvertToHex("00000"));
-	EUNIT_ASSERT_EQUALS(0x00000000000000a, iTable->ConvertToHex("00000000000000"));
+	EUNIT_ASSERT_EQUALS(0x00000000000000f, iTable->ConvertToHex("00000000000000"));
 	EUNIT_ASSERT_EQUALS(0x000000000000000, iTable->ConvertToHex("000000000000000"));
-	EUNIT_ASSERT_EQUALS(0x0aaaaaaaaaaaaaa, iTable->ConvertToHex("0"));
+	EUNIT_ASSERT_EQUALS(0x0ffffffffffffff, iTable->ConvertToHex("0"));
 	// Zeros in the middle
-	EUNIT_ASSERT_EQUALS(0x12300450008000a, iTable->ConvertToHex("12300450008000"));
+	EUNIT_ASSERT_EQUALS(0x12300450008000f, iTable->ConvertToHex("12300450008000"));
 	// Empty string
-	EUNIT_ASSERT_EQUALS(0xaaaaaaaaaaaaaaa, iTable->ConvertToHex(""));
+	EUNIT_ASSERT_EQUALS(0xfffffffffffffff, iTable->ConvertToHex(""));
 	// Unmapped characters
-	EUNIT_ASSERT_EQUALS(0x123aaaaaaaaaaaa, iTable->ConvertToHex("123??45??67"));
+	EUNIT_ASSERT_EQUALS(0x123ffffffffffff, iTable->ConvertToHex("123??45??67"));
-	EUNIT_ASSERT_EQUALS(0x00aaaaaaaaaaaaa, iTable->ConvertToHex("00?1234567"));
+	EUNIT_ASSERT_EQUALS(0x00fffffffffffff, iTable->ConvertToHex("00?1234567"));
-	EUNIT_ASSERT_EQUALS(0xaaaaaaaaaaaaaaa, iTable->ConvertToHex("?1234567"));
+	EUNIT_ASSERT_EQUALS(0xfffffffffffffff, iTable->ConvertToHex("?1234567"));
-	EUNIT_ASSERT_EQUALS(0xaaaaaaaaaaaaaaa, iTable->ConvertToHex("???"));
+	EUNIT_ASSERT_EQUALS(0xfffffffffffffff, iTable->ConvertToHex("???"));
 	// Too many digits
 	EUNIT_ASSERT_EQUALS(KConversionError, iTable->ConvertToHex("12345678901234567890"));
 	}
 TInt aCountInTable4,
 TInt aCountInTable5,
 TInt aCountInTable6,
 TInt aCountInTable7,
 TInt aCountInTable8,
-TInt aCountInTable9)
+TInt aCountInTable9,
-{
+TInt aCountInTable10,
-const TInt KTableCount = 10;
+TInt aCountInTable11)
+{
 TPtrC tableNames[KTableCount] =
 {
 KSqlContactPredSearchTable0,
 KSqlContactPredSearchTable1,
 KSqlContactPredSearchTable2,
 KSqlContactPredSearchTable4,
 KSqlContactPredSearchTable5,
 KSqlContactPredSearchTable6,
 KSqlContactPredSearchTable7,
 KSqlContactPredSearchTable8,
-KSqlContactPredSearchTable9
+KSqlContactPredSearchTable9,
+KSqlContactPredSearchTable10,
+KSqlContactPredSearchTable11
 };
 TInt rowCounts[KTableCount] = {0};
 for (TInt i = 0; i < KTableCount; ++i)
 {
 HBufC* s = HBufC::NewLC(KCountSelect().Length() +
-// All table names are same length
+// Enough space for longest table name
-KSqlContactPredSearchTable0().Length());
+KSqlContactPredSearchTable11().Length());
 TPtr ptr = s->Des();
 ptr.Format(KCountSelect, &tableNames[i]);
 TSqlScalarFullSelectQuery scalarQuery(iDB);
 EUNIT_ASSERT_EQUALS(aCountInTable5, rowCounts[5]);
 EUNIT_ASSERT_EQUALS(aCountInTable6, rowCounts[6]);
 EUNIT_ASSERT_EQUALS(aCountInTable7, rowCounts[7]);
 EUNIT_ASSERT_EQUALS(aCountInTable8, rowCounts[8]);
 EUNIT_ASSERT_EQUALS(aCountInTable9, rowCounts[9]);
+EUNIT_ASSERT_EQUALS(aCountInTable10, rowCounts[10]);
+EUNIT_ASSERT_EQUALS(aCountInTable11, rowCounts[11]);
 }
 // There is only need to search from one table (unless search string begins
 // with a zero).
 // E.g. if search string is "102", the results are both in tables 1 and 2
 	if (aSearchString.Length() == 1)
 		{
 		// No need to use "WHERE.." or "ORDER BY first_name ASC"
 		_LIT(KSearchOneDigitFormat, "SELECT contact_id FROM %S");
 		select = HBufC::NewLC(KSearchOneDigitFormat().Length() +
-							  KSqlContactPredSearchTable0().Length());
+							  KSqlContactPredSearchTable11().Length());
 		select->Des().AppendFormat(KSearchOneDigitFormat, &tableName);
 		}
 	else
 		{
 		// This does not yet support zero in the middle
 		_LIT(KSearchFormat, "SELECT contact_id FROM %S WHERE \
 (nbr>%ld AND nbr<%ld) OR (nbr2>%ld AND nbr2<%ld) OR (nbr3>%ld AND nbr3<%ld) OR (nbr4>%ld AND nbr4<%ld);");
 		TInt KNbrColumns = 4;
 		TInt KSpaceForLimits = KNbrColumns * 2 * (KMaxDigits + 2); // Two extra for decimal representation of max 15 hex digits
 		select = HBufC::NewLC(KSearchFormat().Length() +
-							  KSqlContactPredSearchTable0().Length() +
+							  KSqlContactPredSearchTable11().Length() +
 							  KSpaceForLimits);
 		select->Des().AppendFormat(KSearchFormat, &tableName,
 								   lowerLimit, upperLimit,
 								   lowerLimit, upperLimit,
 								   lowerLimit, upperLimit,
 			return KSqlContactPredSearchTable7;
 		case '8':
 			return KSqlContactPredSearchTable8;
 		case '9':
 			return KSqlContactPredSearchTable9;
+		case 'a':
+		    return KSqlContactPredSearchTable10;
+		case 'b':
+		    return KSqlContactPredSearchTable11;
 		default:
 			return KNullDesC;
 		}
 	}
 	return ConvertToNbrL(aString, '0');
 	}
 TInt64 UT_CPplPredictiveSearchTable::UpperLimitL(const TDesC& aString) const
 	{
-	return ConvertToNbrL(aString, 'a');
+	return ConvertToNbrL(aString, 'f');
 	}
 TInt64 UT_CPplPredictiveSearchTable::ConvertToNbrL(const TDesC& aString,
 												   TChar aPadChar) const
 	{
 	// SQLite does not have SHOW TABLES command, so try to search from
 // predictive search table.
 _LIT(KCheckIfTableExistsFormat, "SELECT %S FROM %S;");
 TInt bufSize = KCheckIfTableExistsFormat().Length() +
 KPredSearchContactId().Length() +
-KSqlContactPredSearchTable0().Length();
+KSqlContactPredSearchTable11().Length();
 HBufC* sqlStatement = HBufC::NewLC(bufSize);
 sqlStatement->Des().AppendFormat(KCheckIfTableExistsFormat,
 &KPredSearchContactId,
 &KSqlContactPredSearchTable0);
 	}
 // This function has code copied from CPplContactItemManager::DeletePredSearchTablesL
 void UT_CPplPredictiveSearchTable::CPplContactItemManager_DeletePredSearchTablesL()
 	{
-	const TInt KTableCount = 10;
 const TDesC* KTableNames[KTableCount] =
 {
 &KSqlContactPredSearchTable0,
 &KSqlContactPredSearchTable1,
 &KSqlContactPredSearchTable2,
 &KSqlContactPredSearchTable4,
 &KSqlContactPredSearchTable5,
 &KSqlContactPredSearchTable6,
 &KSqlContactPredSearchTable7,
 &KSqlContactPredSearchTable8,
-&KSqlContactPredSearchTable9
+&KSqlContactPredSearchTable9,
+&KSqlContactPredSearchTable10,
+&KSqlContactPredSearchTable11
 };
 	// IF EXISTS suppresses error that would occur if table does not exist
 	_LIT(KDropTable, "DROP TABLE IF EXISTS %S;");
 for (TInt i = 0; i < KTableCount; ++i)

changeset 31	2a11b5b00470
parent 27	de1630741fbe
child 46	efe85016a067