FCL/sf/os/graphics: comparison fbs/fontandbitmapserver/tfbs/tfbsglyphdatapanic.cpp

equal deleted inserted replaced

-:d72fc2aace31
+:62bb7c97884c
 /**
 @file
 @internalComponent - Internal Symbian test code
 */
+#include <test/graphicsfontutils.h>
 #include <graphics/fbsglyphmetricsarray.h>
 #include <graphics/fbsglyphdataiterator.h>
 #include "tfbsglyphdatapanic.h"
 _LIT(KTypefaceName, "DejaVu Sans Condensed");
 const TInt KNumGlyphCodes = 96;
-/*
-Lookup table to convert from ascii code to
-glyph code for the Deja Vu family of fonts.
-*/
-const TUint DejaVuASCIIToGlyphCode[] =
-{
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 3, 4, 5, 6, 7, 8, 9, 10,
-11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
-61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
-71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
-81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
-91, 92, 93, 94, 95, 96, 97, 98,
-};
 CTFbsGlyphDataPanic::CTFbsGlyphDataPanic(CTestStep* aStep):
 CTGraphicsBase(aStep)
 {
 }
 User::LeaveIfNull(iTs = (CFbsTypefaceStore*)CFbsTypefaceStore::NewL(NULL));
 User::LeaveIfError(iTs->GetNearestFontToDesignHeightInPixels((CFont*&)iFont, TFontSpec(KTypefaceName, 15)));
 User::LeaveIfError(iSgDriver.Open());
 //initialize the array with ASCII characters from 0020 to 007F
+CCharCodeConverter* converter = CCharCodeConverter::NewLC();
+converter->UseFontL(iFont);
 iGlyphCodes = new(ELeave) TUint[KNumGlyphCodes];
 for (TInt i = 0; i < KNumGlyphCodes; ++i)
 {
-TUint asciiCode = i+0x20;
+TUint asciiCode = i + 0x20;
-iGlyphCodes[i] = DejaVuASCIIToGlyphCode[asciiCode];
+iGlyphCodes[i] = converter->GlyphCodeL(asciiCode);
 }
+CleanupStack::PopAndDestroy(1); // converter
 }
 void CTFbsGlyphDataPanic::RunTestCaseL(TInt /*aCurTestCase*/)
 {
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(KUnknownSYMTestCaseIDName);
 @SYMTestActions
 	Call Next() on an RFbsGlyphDataIterator instance without opening it.
 @SYMTestExpectedResults
-	The call to Next() should panic with GDI 4.
+	The call to Next() should panic with FBSCLI 31.
 */
 void CTFbsGlyphDataPanic::TestGlyphDataIteratorNotInitializedNext()
 {
 INFO_PRINTF1(_L("Ensure that Next() operation applied on null iterator will panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0651"));
 @SYMTestActions
 	Call Image() on an RFbsGlyphDataIterator instance without opening it.
 @SYMTestExpectedResults
-	The call to Image() should panic with GDI 4.
+	The call to Image() should panic with FBSCLI 31.
 */
 void CTFbsGlyphDataPanic::TestGlyphDataIteratorNotInitializedImage()
 {
 INFO_PRINTF1(_L("Ensure that Image() operation applied on null iterator will panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0652"));
 @SYMTestActions
 	Call Metrics() on an RFbsGlyphDataIterator instance without opening it.
 @SYMTestExpectedResults
-	The call to Metrics() should panic with GDI 4.
+	The call to Metrics() should panic with FBSCLI 31.
 */
 void CTFbsGlyphDataPanic::TestGlyphDataIteratorNotInitializedMetrics()
 {
 INFO_PRINTF1(_L("Ensure that Metrics() operation applied on null iterator will panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0653"));
 @SYMTestActions
 	Call GlyphCode() on an RFbsGlyphDataIterator instance without opening it.
 @SYMTestExpectedResults
-	The call to GlyphCode() should panic with GDI 4.
+	The call to GlyphCode() should panic with FBSCLI 31.
 */
 void CTFbsGlyphDataPanic::TestGlyphDataIteratorNotInitializedGlyphCode()
 {
 INFO_PRINTF1(_L("Ensure that GlyphCode() operation applied on null iterator will panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0654"));
 	ii. Call Next() to attempt to move the iterator past the end of the array of glyph codes.
 	iii. Call Close() and repeat ii.
 @SYMTestExpectedResults
 	The call to Next() should fail with KErrNotFound, signifying the iterator is still open.
-	The final call to Next() should panic with GDI 4.
+	The final call to Next() should panic with FBSCLI 31.
 */
 void CTFbsGlyphDataPanic::TestGlyphDataIteratorClosedNext()
 {
 INFO_PRINTF1(_L("Ensure that Next() operation applied on iterator which has been closed will panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0655"));
 	i. Open the glyph data iterator.
 	ii. Close the glyph data iterator.
 	iii. Call Image() on an RFbsGlyphDataIterator instance which has been closed.
 @SYMTestExpectedResults
-	The call to Image() should panic with GDI 4.
+	The call to Image() should panic with FBSCLI 31.
 */
 void CTFbsGlyphDataPanic::TestGlyphDataIteratorClosedImage()
 {
 INFO_PRINTF1(_L("Ensure that Image() operation applied on iterator which has been closed will panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0656"));
 	i. Open the glyph data iterator.
 	ii. Close the glyph data iterator.
 	iii. Call Metrics() on an RFbsGlyphDataIterator instance which has been closed.
 @SYMTestExpectedResults
-	The call to Metrics() should panic with GDI 4.
+	The call to Metrics() should panic with FBSCLI 31.
 */
 void CTFbsGlyphDataPanic::TestGlyphDataIteratorClosedMetrics()
 {
 INFO_PRINTF1(_L("Ensure that Metrics()operation applied on iterator which has been closed will panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0657"));
 	i. Open the glyph data iterator.
 	ii. Close the glyph data iterator.
 	iii. Call GlyphCode() on an RFbsGlyphDataIterator instance which has been closed.
 @SYMTestExpectedResults
-	The call to GlyphCode() should panic with GDI 4.
+	The call to GlyphCode() should panic with FBSCLI 31.
 */
 void CTFbsGlyphDataPanic::TestGlyphDataIteratorClosedGlyphCode()
 {
 INFO_PRINTF1(_L("Ensure that GlyphCode() operation applied on iterator which has been closed will panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0658"));
 @SYMTestActions
 	i. Retrieve glyph metrics array.
 	ii. Try to access glyph metrics entry with a negative index.
 @SYMTestExpectedResults
-	Should panic with GDI 5.
+	Should panic with FBSCLI 32.
 */
 void CTFbsGlyphDataPanic::TestGlyphMetricsArrayIndexNegative()
 {
 INFO_PRINTF1(_L("Ensure that accessing the glyph metrics entry with negative index will cause a panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0648"));
 @SYMTestActions
 	i. Retrieve a glyph metrics array with total number of elements equals 2
 	ii. Try to access glyph metrics entry with index equals 2.
 @SYMTestExpectedResults
-	Should panic with GDI 5.
+	Should panic with FBSCLI 32.
 */
 void CTFbsGlyphDataPanic::TestGlyphMetricsArrayIndexTooHigh()
 {
 INFO_PRINTF1(_L("Ensure that accessing the glyph metrics entry with index greater than number of elemnets in array will cause a panic"));
 ((CTFbsGlyphDataPanicStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0649"));

changeset 136	62bb7c97884c
parent 121	d72fc2aace31