FCL/sf/os/textandloc: comparison textrendering/texthandling/tfields/T

equal deleted inserted replaced

-:6124ff6478cc
+:11e2bb0d14ba
 * Description:
 *
 */
-#include <e32test.h>
-//#include /**/ <s32mem.h>
 #include <s32file.h>
 #include <flddef.h>
 #include <fldbase.h>
 #include <fldset.h>
 #include "TESTFAC.H"
+#include "T_STREAM.h"
+#define test(cond)											\
+	{														\
+	TBool __bb = (cond);									\
+	TEST(__bb);												\
+	if (!__bb)												\
+		{													\
+		ERR_PRINTF1(_L("ERROR: Test Failed"));				\
+		User::Leave(1);										\
+		}													\
+	}
 const TInt KTestCleanupStack=0x20;
-LOCAL_D RTest test(_L("T_STREAM - Fields Persistence"));
 LOCAL_D CTrapCleanup* TheTrapCleanup;
 LOCAL_D CTextFieldSet* TheFieldSetOriginal;
 LOCAL_D CTextFieldSet* TheFieldSetCopy;
 LOCAL_D TTestFieldFactory* TheFactory;
 _LIT(KTFieldOutputFile, "c:\\etext\\tfield.tst");
 // Test Picture persistance.
-LOCAL_C void testStoreRestore(CTextFieldSet* aCopy,const CTextFieldSet* aOriginal)
+void CT_STREAM::testStoreRestore(CTextFieldSet* aCopy,const CTextFieldSet* aOriginal)
 {
 	// set up the store
 	RFs	theFs;
 	theFs.Connect();
 	theFs.Delete(KTFieldOutputFile);
 }
 template <class T>
-void testCopyPaste(T* aCopy, T* aOriginal,TInt aCopyPos,TInt aLen,TInt aPastePos,TInt aPasteLen=-1)
+void CT_STREAM::testCopyPaste(T* aCopy, T* aOriginal,TInt aCopyPos,TInt aLen,TInt aPastePos,TInt aPasteLen)
 // Copy part of anOriginal to aCopy using memory-based streams.
 //
 	{
 	// set up the store
 	RFs	theFs;
 	theFs.Close();
 	}
-LOCAL_C TBool IsEqual(const CTextFieldSet* aCopy,const CTextFieldSet* anOriginal)
+TBool CT_STREAM::IsEqual(const CTextFieldSet* aCopy,const CTextFieldSet* anOriginal)
 //
 // Returns true if aCopy contents matches anOriginal contents.
 //
 	{
 	// test the num chars and num fields
 	return ETrue;
 	}
-LOCAL_C TBool UpdateField(TInt aPos,CTextFieldSet* aSet)
+TBool CT_STREAM::UpdateField(TInt aPos,CTextFieldSet* aSet)
 	{
 	// find out which field aPos is in
 	TFindFieldInfo info;
 	TBool ret;
 	ret=aSet->FindFields(info,aPos);
 	CleanupStack::PopAndDestroy();
 	return ret;
 	}
-LOCAL_C void test2()
+void CT_STREAM::test2()
 // Streams an empty field set
 //
 	{
-	test.Next(_L("- streaming of a default FieldSet (no fields)"));
+	INFO_PRINTF1(_L("- streaming of a default FieldSet (no fields)"));
 	testStoreRestore(TheFieldSetCopy,TheFieldSetOriginal);
 	test(IsEqual(TheFieldSetCopy,TheFieldSetOriginal));
 	TheFieldSetOriginal->Reset();
 	TheFieldSetCopy->Reset();
 	}
-LOCAL_C void test3()
+void CT_STREAM::test3()
 // Streams a field set containing 100 chars & 1 field
 //
 	{
-	test.Next(_L("- streaming with a field"));
+	INFO_PRINTF1(_L("- streaming with a field"));
 	// insert a block of text into the original
 	TheFieldSetOriginal->NotifyInsertion(0,100); // pos=0, len=100
 	// insert a field into the original
 	CTextField* field=TheFieldSetOriginal->NewFieldL(KDummyFieldUid);
 	TheFieldSetOriginal->Reset();
 	TheFieldSetCopy->Reset();
 	}
-LOCAL_C void test4()
+void CT_STREAM::test4()
 // Streams a field set into a non-empty target
 //
 	{
-	test.Next(_L("- streaming into a non-empty target"));
+	INFO_PRINTF1(_L("- streaming into a non-empty target"));
 	// insert a block of text into the original
 	TheFieldSetOriginal->NotifyInsertion(0,100); // pos=0, len=100
 	// insert a field into the original
 	CTextField* field=TheFieldSetOriginal->NewFieldL(KDummyFieldUid);
 	TheFieldSetOriginal->Reset();
 	TheFieldSetCopy->Reset();
 	}
-LOCAL_C void test5()
+void CT_STREAM::test5()
 // Streams a field set containing an out of date field
 //
 	{
-	test.Next(_L("- streaming an out of date field"));
+	INFO_PRINTF1(_L("- streaming an out of date field"));
 	// insert a block of text into the original
 	TheFieldSetOriginal->NotifyInsertion(0,100); // pos=0, len=100
 	// insert a field into the original
 	CTextField* field=TheFieldSetOriginal->NewFieldL(KDummyFieldUid);
 	TheFieldSetOriginal->Reset();
 	TheFieldSetCopy->Reset();
 	}
-LOCAL_C void test6()
+void CT_STREAM::test6()
 // Tests that copy/paste methods exist
 //
 	{
-	test.Next(_L("- testing copy/paste methods with empty array"));
+	INFO_PRINTF1(_L("- testing copy/paste methods with empty array"));
 	testCopyPaste(TheFieldSetCopy,TheFieldSetOriginal,0,0,0); // copyPos,Len,PastePos
 	test(IsEqual(TheFieldSetCopy,TheFieldSetOriginal));
 	TheFieldSetOriginal->Reset();
 	TheFieldSetCopy->Reset();
 	}
-LOCAL_C void test7()
+void CT_STREAM::test7()
 // Tests copy/paste methods in detail
 //
 	{
-	test.Next(_L("- testing copy/paste methods in detail"));
+	INFO_PRINTF1(_L("- testing copy/paste methods in detail"));
 	// insert a block of text into the original
 	TheFieldSetOriginal->NotifyInsertion(0,100); // pos=0, len=100
 	// insert a field into the original
 	CTextField* field=TheFieldSetOriginal->NewFieldL(KDummyFieldUid);
 		test(field!=NULL);
 	TheFieldSetOriginal->Reset();
 	TheFieldSetCopy->Reset();
 	}
-LOCAL_C void test8()
+void CT_STREAM::test8()
 // Tests paste method with restricted target length
 //
 	{
-	test.Next(_L("- testing paste method with restricted length"));
+	INFO_PRINTF1(_L("- testing paste method with restricted length"));
 	// insert a block of text into the original
 	TheFieldSetOriginal->NotifyInsertion(0,100); // pos=0, len=100
 	// insert 2 fields into the original
 	// 1...
 	CTextField* field=TheFieldSetOriginal->NewFieldL(KDummyFieldUid);
 	TheFieldSetOriginal->Reset();
 	TheFieldSetCopy->Reset();
 	}
-LOCAL_C void test9()
+void CT_STREAM::test9()
 // Tests paste into set with no field factory
 // Should convert all pasted fields to text...
 //
 	{
-	test.Next(_L("- testing paste into set with no field factory"));
+	INFO_PRINTF1(_L("- testing paste into set with no field factory"));
 	TheFieldSetCopy->SetFieldFactory(NULL);
 	// insert a block of text into the original
 	TheFieldSetOriginal->NotifyInsertion(0,100); // pos=0, len=100
 	// insert a field into the original
 	CTextField* field=TheFieldSetOriginal->NewFieldL(KDummyFieldUid);
 	TheFieldSetCopy->Reset();
 	TheFieldSetCopy->SetFieldFactory(TheFactory);
 	}
-LOCAL_C void test10()
+void CT_STREAM::test10()
 // Streams a field set containing 100 chars & 1 field
 //
 	{
-	test.Next(_L("- streaming CDateTimeField"));
+	INFO_PRINTF1(_L("- streaming CDateTimeField"));
 	// insert a block of text into the original
 	TheFieldSetOriginal->NotifyInsertion(0,100); // pos=0, len=100
 	// insert a field into the original
 	CTextField* field=TheFieldSetOriginal->NewFieldL(KDateTimeFieldUid);
 	HBufC* miniBuf = HBufC::NewL(5);
 	CleanupStack::PushL(miniBuf);
 	ret=TheFieldSetOriginal->NewFieldValueL(miniBuf,10); // pos=10
 		test(ret==KErrNone);
 	TPtr buf = miniBuf->Des();
-	test.Printf(_L("  Value before streaming: "));
+	INFO_PRINTF1(_L("  Value before streaming: "));
-		test.Printf(buf);
+		INFO_PRINTF1(buf);
-		test.Printf(_L("\n"));
+		INFO_PRINTF1(_L("\n"));
 	// test streaming
 	testStoreRestore(TheFieldSetCopy,TheFieldSetOriginal);
 	test(IsEqual(TheFieldSetCopy,TheFieldSetOriginal));
 	// value after
 	ret=TheFieldSetCopy->NewFieldValueL(miniBuf,10); // pos=10
 		test(ret==KErrNone);
 	buf = miniBuf->Des();
-	test.Printf(_L("  Value after streaming:  "));
+	INFO_PRINTF1(_L("  Value after streaming:  "));
-		test.Printf(buf);
+		INFO_PRINTF1(buf);
-		test.Printf(_L("\n"));
+		INFO_PRINTF1(_L("\n"));
 	CleanupStack::PopAndDestroy(); // miniBuf
 	TheFieldSetOriginal->Reset();
 	TheFieldSetCopy->Reset();
 	}
-void TestStreamingL()
+void CT_STREAM::TestStreamingL()
 //
 // Test streaming of PrintSetup info.
 // Stream from one copy to another, then compare
 //
 	{
 	// create the PrintSetups
-	test.Start(_L("Streaming CTextFieldSet"));
+	INFO_PRINTF1(_L("Streaming CTextFieldSet"));
 	// instantiate the factory and FieldSet
 	TheFactory = new(ELeave) TTestFieldFactory();
 	TheFieldSetOriginal = CTextFieldSet::NewL();
 	TheFieldSetOriginal->SetFieldFactory(TheFactory);
 	delete TheFieldSetCopy;
 	delete TheFactory;
 	}
-LOCAL_C void setupCleanup()
+void CT_STREAM::setupCleanup()
 //
 // Initialise the cleanup stack.
 //
 {
 		CleanupStack::Pop(KTestCleanupStack);\
 		});
 	}
-LOCAL_C void DeleteDataFile(const TDesC& aFullName)
+void CT_STREAM::DeleteDataFile(const TDesC& aFullName)
 	{
 	RFs fsSession;
 	TInt err = fsSession.Connect();
 	if(err == KErrNone)
 		{
 		{
 		RDebug::Print(_L("Error %d connecting file session. File: %S.\n"), err, &aFullName);
 		}
 	}
-GLDEF_C TInt E32Main()
-//
+CT_STREAM::CT_STREAM()
-// Test streaming conversions.
-//
 {
-	test.Title();
+SetTestStepName(KTestStep_T_STREAM);
+}
-	__UHEAP_MARK;
+TVerdict CT_STREAM::doTestStepL()
+{
+	INFO_PRINTF1(_L("T_STREAM - Fields Persistence"));
+SetTestStepResult(EFail);
+__UHEAP_MARK;
 	setupCleanup();
-	TRAPD(r,TestStreamingL());
+TRAPD(error1, TestStreamingL());
-	test(r==KErrNone);
 	delete TheTrapCleanup;
-	__UHEAP_MARKEND;
+__UHEAP_MARKEND;
+	DeleteDataFile(KTFieldOutputFile);	//deletion of data files must be before call to End() - DEF047652
-	::DeleteDataFile(KTFieldOutputFile);	//deletion of data files must be before call to End() - DEF047652
+if(error1 == KErrNone)
-	test.End();
+{
-	test.Close();
+SetTestStepResult(EPass);
+}
-	return 0;
+return TestStepResult();
 }

changeset 53	11e2bb0d14ba
parent 0	1fb32624e06b
child 55	336bee5c2d35