--- a/graphicsdeviceinterface/gdi/tgdi/TTYPES.CPP Thu Sep 02 21:50:40 2010 +0300
+++ b/graphicsdeviceinterface/gdi/tgdi/TTYPES.CPP Fri Sep 17 08:36:49 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -23,446 +23,6 @@
CDirectFileStore* readstore=NULL;
RStoreWriteStream writestrm;
RStoreReadStream readstrm;
-
-TestTypeface::TestTypeface(
- const TBuf<KMaxTypefaceNameLength>& aName,
- TUint32 aFlags,
- CTTypes* aTest) :
- iName(aName),
- iFlags(aFlags),
- iTest(aTest)
- {}
-
-/**
- TestTypeface::Test
- Tests functionality contained within TTypeface, settings various attributes
- on the typeface & retrieving them to confirm the result
- The test also streams the typeface to file, via CDirectFileStore calls & retrieves again
- from the store to confirm result
-*/
-void TestTypeface::Test()
- {
- TTypeface typeface1;
- typeface1.iName = iName;
- const TBool prop = iFlags & TTypeface::EProportional;
- const TBool seri = iFlags & TTypeface::ESerif;
- const TBool symb = iFlags & TTypeface::ESymbol;
-
- typeface1.SetIsProportional(prop);
- iTest->TEST(typeface1.IsProportional() == prop);
-
- typeface1.SetIsSerif(seri);
- iTest->TEST(typeface1.IsSerif() == seri);
- iTest->TEST(typeface1.IsProportional() == prop);
-
- typeface1.SetIsSymbol(symb);
- iTest->TEST(typeface1.IsSymbol() == symb);
- iTest->TEST(typeface1.IsProportional() == prop);
- iTest->TEST(typeface1.IsSerif() == seri);
-
- TTypeface typeface2;
- typeface2.iName = iName;
- typeface2.SetIsProportional(prop);
- typeface2.SetIsSerif(seri);
- typeface2.SetIsSymbol(symb);
- iTest->TEST(typeface1 == typeface2);
-
- TestStream();
-
- for (TInt i = 0; i < 8; i++)
- {
- typeface1.SetAttributes(i);
- iTest->TEST(typeface1.Attributes() == i);
- }
-
- for (TInt i = 0; i < 16; i++)
- {
- typeface1.SetScriptTypeForMetrics(i);
- iTest->TEST(typeface1.ScriptTypeForMetrics() == i);
- }
-
- // test for PDEF124646. The test shouldn't cause any thread panic when passing in
- // a big value of an invalid TLanguage index. If the fix is not present this test will crash.
-
- for (TInt ii = 1; ii < 1000000; ii *= 10)
- {
- typeface1.SetScriptTypeForMetrics(static_cast<TLanguage>(ii));
- }
- }
-
-/**
- TestTypeface::TestStream
- Called by the TestTypeface::Test method, this function
- sets attributes on a typeface & streams the object to file, via CDirectFileStore calls.
- It then retrieves the typeface from the store to confirm result
-*/
-void TestTypeface::TestStream()
- {
- TTypeface typeface1;
- typeface1.iName = iName;
- typeface1.SetIsProportional(TTypeface::EProportional & iFlags);
- typeface1.SetIsSerif(TTypeface::ESerif & iFlags);
- typeface1.SetIsSymbol(TTypeface::ESymbol & iFlags);
- iTest->InitialiseWriteStream();
- TRAPD(ret, typeface1.ExternalizeL(writestrm));
- iTest->TEST2(ret, KErrNone);
- iTest->ResetWriteStream();
-
- TTypeface typeface2;
- iTest->InitialiseReadStream();
- TRAP(ret, typeface2.InternalizeL(readstrm));
- iTest->TEST2(ret, KErrNone);
- iTest->ResetReadStream();
- iTest->TEST(typeface1 == typeface2);
- }
-
-TestMargins::TestMargins(TInt aLeft,TInt aRight,TInt aTop,TInt aBottom, CTTypes* aTest):
- iLeft(aLeft),
- iRight(aRight),
- iTop(aTop),
- iBottom(aBottom),
- iTest(aTest)
- {}
-
-/**
- TestMargins::Test
- Tests functionality contained within the TMargins class, settings various attributes
- on the margins & streaming the object to file, via CDirectFileStore calls.
- The TMargins object is then retrieved from the store & compared within original to confirm result
-*/
-void TestMargins::Test()
- {
- TestStream();
- }
-
-/**
- TestMargins::TestStream
- Tests functionality contained within the TMargins class, settings various attributes
- on the margins & streaming the object to file, via CDirectFileStore calls.
- The TMargins object is then retrieved from the store & compared within original to confirm result
-*/
-void TestMargins::TestStream()
- {
- TMargins tm;
- tm.iLeft=iLeft;
- tm.iRight=iRight;
- tm.iTop=iTop;
- tm.iBottom=iBottom;
- iTest->InitialiseWriteStream();
- TRAPD(ret,tm.ExternalizeL(writestrm));
- iTest->TEST2(ret, KErrNone);
- iTest->ResetWriteStream();
- TMargins tm2;
- tm2.iLeft=0;
- tm2.iRight=0;
- tm2.iTop=0;
- tm2.iBottom=0;
- iTest->InitialiseReadStream();
- TRAP(ret,tm2.InternalizeL(readstrm));
- iTest->TEST2(ret, KErrNone);
- iTest->ResetReadStream();
- iTest->TEST(tm.iLeft==tm2.iLeft);
- iTest->TEST(tm.iRight==tm2.iRight);
- iTest->TEST(tm.iTop==tm2.iTop);
- iTest->TEST(tm.iBottom==tm2.iBottom);
- }
-
-//---------
-/**
- @SYMTestCaseID GRAPHICS-GDI-0001
-
- @SYMPREQ PREQ1301
-
- @SYMREQ REQ5381
-
- @SYMTestCaseDesc Getting/setting font effects with FontEffect
-
- @SYMTestPriority Critical
-
- @SYMTestStatus Implemented
-
- @SYMTestActions (1) Call SetEffect with attributes EAlgorithmicBold and EFalse
- (2) Call IsEffectOn with attribute EAlgorithmicBold to check (1)
- (3) Call SetEffect with attributes EAlgorithmicBold and ETrue
- (4) Call IsEffectOn with attribute EAlgorithmicBold to check (3)
- (5) Repeat (1) - (4) with all supported font effects attributes
-
- @SYMTestExpectedResults Getters should return the expected results set by setters
- (2) IsEffectOn should return a value EFalse
- (4) IsEffectOn should return a value ETrue
-*/
-void TestFontEffect::Test()
- {
- TUint32 fontEffect = FontEffect::ENone;
-
- FontEffect::SetEffect(FontEffect::EAlgorithmicBold, EFalse, fontEffect);
- iTest->TEST(!FontEffect::IsEffectOn(FontEffect::EAlgorithmicBold, fontEffect));
- FontEffect::SetEffect(FontEffect::EAlgorithmicBold, ETrue, fontEffect);
- iTest->TEST( FontEffect::IsEffectOn(FontEffect::EAlgorithmicBold, fontEffect));
-
- FontEffect::SetEffect(FontEffect::EDropShadow, EFalse, fontEffect);
- iTest->TEST(!FontEffect::IsEffectOn(FontEffect::EDropShadow, fontEffect));
- FontEffect::SetEffect(FontEffect::EDropShadow, ETrue, fontEffect);
- iTest->TEST( FontEffect::IsEffectOn(FontEffect::EDropShadow, fontEffect));
-
- FontEffect::SetEffect(FontEffect::EOutline, EFalse, fontEffect);
- iTest->TEST(!FontEffect::IsEffectOn(FontEffect::EOutline, fontEffect));
- FontEffect::SetEffect(FontEffect::EOutline, ETrue, fontEffect);
- iTest->TEST( FontEffect::IsEffectOn(FontEffect::EOutline, fontEffect));
-
- FontEffect::SetEffect(FontEffect::EEmbossed, EFalse, fontEffect);
- iTest->TEST(!FontEffect::IsEffectOn(FontEffect::EEmbossed, fontEffect));
- FontEffect::SetEffect(FontEffect::EEmbossed, ETrue, fontEffect);
- iTest->TEST( FontEffect::IsEffectOn(FontEffect::EEmbossed, fontEffect));
-
- FontEffect::SetEffect(FontEffect::EEngraved, EFalse, fontEffect);
- iTest->TEST(!FontEffect::IsEffectOn(FontEffect::EEngraved, fontEffect));
- FontEffect::SetEffect(FontEffect::EEngraved, ETrue, fontEffect);
- iTest->TEST( FontEffect::IsEffectOn(FontEffect::EEngraved, fontEffect));
-
- FontEffect::SetEffect(FontEffect::ESoftEdge, EFalse, fontEffect);
- iTest->TEST(!FontEffect::IsEffectOn(FontEffect::ESoftEdge, fontEffect));
- FontEffect::SetEffect(FontEffect::ESoftEdge, ETrue, fontEffect);
- iTest->TEST( FontEffect::IsEffectOn(FontEffect::ESoftEdge, fontEffect));
- }
-
-void TestTFontStyle::Test()
- {
- TFontStyle fontStyle00;
- TFontStyle fontStyle01(EPostureUpright, EStrokeWeightNormal, EPrintPosNormal);
- TFontStyle fontStyle02(EPostureItalic, EStrokeWeightNormal, EPrintPosNormal);
- TFontStyle fontStyle03(EPostureUpright, EStrokeWeightBold, EPrintPosNormal);
- TFontStyle fontStyle04(EPostureItalic, EStrokeWeightBold, EPrintPosNormal);
- TFontStyle fontStyle05(EPostureUpright, EStrokeWeightNormal, EPrintPosSuperscript);
- TFontStyle fontStyle06(EPostureItalic, EStrokeWeightNormal, EPrintPosSuperscript);
- TFontStyle fontStyle07(EPostureUpright, EStrokeWeightBold, EPrintPosSuperscript);
- TFontStyle fontStyle08(EPostureItalic, EStrokeWeightBold, EPrintPosSuperscript);
- TFontStyle fontStyle09(EPostureUpright, EStrokeWeightNormal, EPrintPosSubscript);
- TFontStyle fontStyle10(EPostureItalic, EStrokeWeightNormal, EPrintPosSubscript);
- TFontStyle fontStyle11(EPostureUpright, EStrokeWeightBold, EPrintPosSubscript);
- TFontStyle fontStyle12(EPostureItalic, EStrokeWeightBold, EPrintPosSubscript);
-
- Test(fontStyle00);
- Test(fontStyle01);
- Test(fontStyle02);
- Test(fontStyle03);
- Test(fontStyle04);
- Test(fontStyle05);
- Test(fontStyle06);
- Test(fontStyle07);
- Test(fontStyle08);
- Test(fontStyle09);
- Test(fontStyle10);
- Test(fontStyle11);
- Test(fontStyle12);
- }
-
-/**
- TestFontStyle::Test
- Tests functionality contained within the TFontStyle class.
- a TFontStyle object is streamed to & from a file store (via CDirectFileStore) & the results are compared.
- Attributes such as Posture, Stroke, Position, BitmapType etc are set & the result verified
-*/
-void TestTFontStyle::Test(TFontStyle& aFontStyle)
- {
- TestStream(aFontStyle);
- TestStyle(aFontStyle);
- TestBitmapType(aFontStyle);
- TestFontEffect(aFontStyle);
- }
-
-/**
- TestFontStyle::TestStream
- Streams a TFontStyle object is to & from a file store (via CDirectFileStore) & the results are compared.
-*/
-void TestTFontStyle::TestStream(const TFontStyle& aFontStyle)
- {
- iTest -> InitialiseWriteStream();
- TRAPD(ret, aFontStyle.ExternalizeL(writestrm));
- iTest -> TEST2(ret, KErrNone);
- iTest -> ResetWriteStream();
- TFontStyle fontStyle;
- iTest -> InitialiseReadStream();
- TRAP(ret, fontStyle.InternalizeL(readstrm));
- iTest -> TEST2(ret, KErrNone);
- iTest -> ResetReadStream();
- iTest -> TEST(aFontStyle == fontStyle);
- }
-
-/**
- TestFontStyle::TestStyle
- Tests key attributes of a TFontStyle object by settings Posture, Stroke, Print position & verifiying the result
-*/
-void TestTFontStyle::TestStyle(TFontStyle& aFontStyle)
- {
- iTest -> TEST(TestPosture(aFontStyle));
- iTest -> TEST(TestStrokeWeight(aFontStyle));
- iTest -> TEST(TestPrintPosition(aFontStyle));
- }
-
-/**
- TestFontStyle::TestPosture
- Tests Posture attribute of a TFontStyle object by setting a particular value that opposes the original posture & verifiying the new setting
-*/
-TBool TestTFontStyle::TestPosture(TFontStyle& aFontStyle)
- {
- if (EPostureUpright == aFontStyle.Posture())
- {
- aFontStyle.SetPosture(EPostureItalic);
- return VerifyStyle(aFontStyle, EPostureItalic, aFontStyle.StrokeWeight(), aFontStyle.PrintPosition());
- }
- else if (EPostureItalic == aFontStyle.Posture())
- {
- aFontStyle.SetPosture(EPostureUpright);
- return VerifyStyle(aFontStyle, EPostureUpright, aFontStyle.StrokeWeight(), aFontStyle.PrintPosition());
- }
- return EFalse;
- }
-
-/**
- TestFontStyle::TestStrokeWeight
- Tests Stroke attribute of a TFontStyle object by setting a particular value that opposes the original stroke & verifiying the new setting
-*/
-TBool TestTFontStyle::TestStrokeWeight(TFontStyle& aFontStyle)
- {
- if (EStrokeWeightNormal == aFontStyle.StrokeWeight())
- {
- aFontStyle.SetStrokeWeight(EStrokeWeightBold);
- return VerifyStyle(aFontStyle, aFontStyle.Posture(), EStrokeWeightBold, aFontStyle.PrintPosition());
- }
- else if (EStrokeWeightBold == aFontStyle.StrokeWeight())
- {
- aFontStyle.SetStrokeWeight(EStrokeWeightNormal);
- return VerifyStyle(aFontStyle, aFontStyle.Posture(), EStrokeWeightNormal, aFontStyle.PrintPosition());
- }
- return EFalse;
- }
-
-/**
- TestFontStyle::TestPrintPosition
- Tests Print Position attribute of a TFontStyle object by setting a particular value that opposes the original position & verifiying the new setting
-*/
-TBool TestTFontStyle::TestPrintPosition(TFontStyle& aFontStyle)
- {
- if (EPrintPosNormal == aFontStyle.PrintPosition())
- {
- aFontStyle.SetPrintPosition(EPrintPosSuperscript);
- return VerifyStyle(aFontStyle, aFontStyle.Posture(), aFontStyle.StrokeWeight(), EPrintPosSuperscript);
- }
- else if (EPrintPosSuperscript == aFontStyle.PrintPosition())
- {
- aFontStyle.SetPrintPosition(EPrintPosSubscript);
- return VerifyStyle(aFontStyle, aFontStyle.Posture(), aFontStyle.StrokeWeight(), EPrintPosSubscript);
- }
- else if (EPrintPosSubscript == aFontStyle.PrintPosition())
- {
- aFontStyle.SetPrintPosition(EPrintPosNormal);
- return VerifyStyle(aFontStyle, aFontStyle.Posture(), aFontStyle.StrokeWeight(), EPrintPosNormal);
- }
- return EFalse;
- }
-
-/**
- TestFontStyle::VerifyStyle
- Verifies the various attributes in a TFontStyle object
-*/
-TBool TestTFontStyle::VerifyStyle(
- const TFontStyle& aFontStyle,
- TFontPosture aFontPosture,
- TFontStrokeWeight aFontStrokeWeight,
- TFontPrintPosition aFontPrintPosition)
- {
- return
- aFontPosture == aFontStyle.Posture() &&
- aFontStrokeWeight == aFontStyle.StrokeWeight() &&
- aFontPrintPosition == aFontStyle.PrintPosition();
- }
-
-/**
- TestFontStyle::TestBitmapType
- Sets the BitmapType attribute for a TFontStyle object to different values & verifies the result is recorded
-*/
-void TestTFontStyle::TestBitmapType(TFontStyle& aFontStyle)
- {
- aFontStyle.SetBitmapType(EDefaultGlyphBitmap);
- iTest -> TEST(EDefaultGlyphBitmap == aFontStyle.BitmapType());
- aFontStyle.SetBitmapType(EMonochromeGlyphBitmap);
- iTest -> TEST(EMonochromeGlyphBitmap == aFontStyle.BitmapType());
- aFontStyle.SetBitmapType(EAntiAliasedGlyphBitmap);
- iTest -> TEST(EAntiAliasedGlyphBitmap == aFontStyle.BitmapType());
- }
-
-/**
- @SYMTestCaseID GRAPHICS-GDI-0002
-
- @SYMPREQ PREQ1301
-
- @SYMREQ REQ5381
-
- @SYMTestCaseDesc Getting/setting font effects on TFontStyle
-
- @SYMTestPriority Critical
-
- @SYMTestStatus Implemented
-
- @SYMTestActions (1) Call SetEffects with attributes EAlgorithmicBold and EFalse
- (2) Call IsEffectOn with attribute EAlgorithmicBold to check (1)
- (3) Call SetEffects with attributes EAlgorithmicBold and ETrue
- (4) Call IsEffectOn with attribute EAlgorithmicBold to check (3)
- (5) Call SetEffects/Effects to verify the attribute set in (3)
- (6) Repeat (1) - (5) with all supported font effects attributes
-
- @SYMTestExpectedResults Getters should return the expected results set by setters
- (2) IsEffectOn should return a value EFalse
- (4) IsEffectOn should return a value ETrue
- (5) Effects should return the value set by SetEffects
-*/
-void TestTFontStyle::TestFontEffect(TFontStyle& aFontStyle)
- {
- aFontStyle.SetEffects(FontEffect::EAlgorithmicBold, EFalse);
- iTest -> TEST(!aFontStyle.IsEffectOn(FontEffect::EAlgorithmicBold));
- aFontStyle.SetEffects(FontEffect::EAlgorithmicBold, ETrue);
- iTest -> TEST( aFontStyle.IsEffectOn(FontEffect::EAlgorithmicBold));
- VerifyFontEffect(aFontStyle);
-
- aFontStyle.SetEffects(FontEffect::EDropShadow, EFalse);
- iTest -> TEST(!aFontStyle.IsEffectOn(FontEffect::EDropShadow));
- aFontStyle.SetEffects(FontEffect::EDropShadow, ETrue);
- iTest -> TEST( aFontStyle.IsEffectOn(FontEffect::EDropShadow));
- VerifyFontEffect(aFontStyle);
-
- aFontStyle.SetEffects(FontEffect::EOutline, EFalse);
- iTest -> TEST(!aFontStyle.IsEffectOn(FontEffect::EOutline));
- aFontStyle.SetEffects(FontEffect::EOutline, ETrue);
- iTest -> TEST( aFontStyle.IsEffectOn(FontEffect::EOutline));
- VerifyFontEffect(aFontStyle);
-
- aFontStyle.SetEffects(FontEffect::EEmbossed, EFalse);
- iTest -> TEST(!aFontStyle.IsEffectOn(FontEffect::EEmbossed));
- aFontStyle.SetEffects(FontEffect::EEmbossed, ETrue);
- iTest -> TEST( aFontStyle.IsEffectOn(FontEffect::EEmbossed));
- VerifyFontEffect(aFontStyle);
-
- aFontStyle.SetEffects(FontEffect::EEngraved, EFalse);
- iTest -> TEST(!aFontStyle.IsEffectOn(FontEffect::EEngraved));
- aFontStyle.SetEffects(FontEffect::EEngraved, ETrue);
- iTest -> TEST( aFontStyle.IsEffectOn(FontEffect::EEngraved));
- VerifyFontEffect(aFontStyle);
-
- aFontStyle.SetEffects(FontEffect::ESoftEdge, EFalse);
- iTest -> TEST(!aFontStyle.IsEffectOn(FontEffect::ESoftEdge));
- aFontStyle.SetEffects(FontEffect::ESoftEdge, ETrue);
- iTest -> TEST( aFontStyle.IsEffectOn(FontEffect::ESoftEdge));
- VerifyFontEffect(aFontStyle);
- }
-
-void TestTFontStyle::VerifyFontEffect(TFontStyle& aFontStyle)
- {
- const TUint32 effects = aFontStyle.Effects();
- aFontStyle.SetEffects(effects);
- iTest -> TEST(effects == aFontStyle.Effects());
- }
-
//-----------
TestPageSpec::TestPageSpec(TPageSpec::TPageOrientation aOrientation,const TSize& aSize, CTTypes* aTest):
iPortraitPageSize(aSize),
@@ -508,49 +68,6 @@
iTest->TEST(tpss==tpss2);
}
-/**
- TestFontSSpec::Test
- Tests functionality contained within the TFontSpec class.
- a TFontSpec object is streamed to & from a file store (via CDirectFileStore) & the results are compared.
- Attributes such as typeface, font height, style are set & the result verified
-*/
-TestFontSpec::TestFontSpec(const TTypeface& aTypeface,TInt aHeight,TFontStyle aStyle, CTTypes* aTest):
- iTypeface(aTypeface),
- iHeight(aHeight),
- iStyle(aStyle),
- iTest(aTest)
- {}
-
-void TestFontSpec::Test()
- {
- TFontSpec fontspec;
- fontspec.iTypeface=iTypeface;
- fontspec.iHeight=iHeight;
- fontspec.iFontStyle=iStyle;
- TFontSpec fontspec2(iTypeface.iName,iHeight);
- fontspec2.iTypeface=iTypeface;
- fontspec2.iFontStyle=iStyle;
- iTest->TEST(fontspec==fontspec2);
- TestStream();
- }
-
-void TestFontSpec::TestStream()
- {
- TFontSpec fs(iTypeface.iName,iHeight);
- fs.iTypeface=iTypeface;
- fs.iFontStyle=iStyle;
- iTest->InitialiseWriteStream();
- TRAPD(ret,fs.ExternalizeL(writestrm));
- iTest->TEST2(ret, KErrNone);
- iTest->ResetWriteStream();
- TFontSpec fs2;
- iTest->InitialiseReadStream();
- TRAP(ret,fs2.InternalizeL(readstrm));
- iTest->TEST2(ret, KErrNone);
- iTest->ResetReadStream();
- iTest->TEST(fs==fs2);
- }
-
TestRgb::TestRgb(TUint8 r1,TUint8 g1,TUint8 b1, CTTypes* aTest):
iR(r1),
@@ -752,34 +269,12 @@
break;
case 2:
{
- INFO_PRINTF1(_L("TTypeface"));
- TestTypeface ttf1(_L(""), 0, this);
- TestTypeface ttf2(_L("Font name"), 1, this);
- TestTypeface ttf3(_L("Font name"), 2, this);
- TestTypeface ttf4(_L("Font name"), 3, this);
- TestTypeface ttf5(_L("Font name"), 4, this);
- TestTypeface ttf6(_L("Font name"), 5, this);
- TestTypeface ttf7(_L("Font name"), 6, this);
- TestTypeface ttf8(_L("Another font name"), 7, this);
- ttf1.Test();
- ttf2.Test();
- ttf3.Test();
- ttf4.Test();
- ttf5.Test();
- ttf6.Test();
- ttf7.Test();
- ttf8.Test();
+ INFO_PRINTF1(_L("TTypeface is moved to TextBase"));
}
break;
case 3:
{
- TestMargins tm1(0,0,0,0, this);
- TestMargins tm2(10,20,30,40, this);
- TestMargins tm3(-10,-20,-30,-40, this);
- INFO_PRINTF1(_L("TMargins"));
- tm1.Test();
- tm2.Test();
- tm3.Test();
+ INFO_PRINTF1(_L("TMargins is moved to TextBase"));
}
break;
case 4:
@@ -801,28 +296,17 @@
break;
case 5:
{
- INFO_PRINTF1(_L("FontEffect"));
- ((CTTypesStep*)iStep)->SetTestStepID(_L("GRAPHICS-GDI-0002"));
- TestFontEffect te(this);
- ((CTTypesStep*)iStep)->RecordTestResultL();
- te.Test();
+ INFO_PRINTF1(_L("FontEffect is moved to TextBase"));
}
break;
case 6:
{
- INFO_PRINTF1(_L("TFontSyle"));
- TestTFontStyle ts(this);
- ts.Test();
+ INFO_PRINTF1(_L("TFontSyle is moved to TextBase"));
}
break;
case 7:
{
- TTypeface typeface;
- typeface.iName=_L("Font name");
- TFontStyle fontstyle;
- TestFontSpec tfspec(typeface,200,fontstyle, this);
- INFO_PRINTF1(_L("TFontSpec"));
- tfspec.Test();
+ INFO_PRINTF1(_L("TFontSpec is moved to TextBase"));
}
break;
case 8:
@@ -856,16 +340,12 @@
break;
case 9:
{
- INFO_PRINTF1(_L("CTypefaceStore"));
- TestTFStore ttfs(this);
- ttfs.Test();
+ INFO_PRINTF1(_L("CTypefaceStore is moved to TextBase"));
}
break;
case 10:
{
- INFO_PRINTF1(_L("CFontCache"));
- TestFontCache tfc(this);
- tfc.Test();
+ INFO_PRINTF1(_L("CFontCache is moved to TextBase"));
}
break;
case 11: