Changeset 14648 for S60/trunk/S60WebUi

Timestamp:

05/31/06 11:11:08 (3 years ago)

Author:

brmorris

Message:

S60WebKit:

2006-05-30 Pat <vincent.bradley@nokia.com>

Reviewed by Bradley/Zalan

• S60WebUi/WebUi/data/WebUi.rss
• S60WebUi/WebUi/inc/WebUi.hrh
• S60WebUi/WebUi/inc/WebUiAutomatedTests.h
• S60WebUi/WebUi/src/WebUiAutomatedTests.cpp
• S60WebUi/WebUi/src/WebUiLoadObserver.cpp
• S60WebUi/WebUi/src/WebUiWindowContainer.cpp

• Performance tests run when -autotest passed in to Reindeer Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=9114
• Various other cleanups to Reindeer

Location:

S60/trunk/S60WebUi/WebUi

Files:

• data/WebUi.rss (modified) (1 diff)
• inc/WebUi.hrh (modified) (1 diff)
• inc/WebUiAutomatedTests.h (modified) (7 diffs)
• src/WebUiAutomatedTests.cpp (modified) (29 diffs)
• src/WebUiLoadObserver.cpp (modified) (2 diffs)
• src/WebUiSettings.cpp (modified) (3 diffs)
• src/WebUiWindowContainer.cpp (modified) (2 diffs)

S60/trunk/S60WebUi/WebUi/data/WebUi.rss

@@ -146 +146 @@
     items =
         {
-                MENU_ITEM { command = ECmdRunNextTest; txt = "Run next test"; },
-                MENU_ITEM { command = ECmdRunFirstTest; txt = "Run first test"; },
-                MENU_ITEM { command = ECmdRunTestByIndex; txt = "Run test by index"; },
-                MENU_ITEM { command = ECmdRunAllTests; txt = "Run all tests"; },
+                MENU_ITEM { command = ECmdRunNextLayoutTest; txt = "Run next layout test"; },
+                MENU_ITEM { command = ECmdRunFirstLayoutTest; txt = "Run first layout test"; },
+                MENU_ITEM { command = ECmdRunLayoutTestByIndex; txt = "Run layout test by index"; },
+                MENU_ITEM { command = ECmdRunAllLayoutTests; txt = "Run all layout tests"; },
                 MENU_ITEM { command = ECmdListAllTests; txt = "List all tests"; }
         };

S60/trunk/S60WebUi/WebUi/inc/WebUi.hrh

@@ -82 +82 @@
     ECmdCloseAll,
     ECmdRunAllTests,
-    ECmdRunFirstTest,
-    ECmdRunNextTest,
-    ECmdListAllTests,
-    ECmdRunTestByIndex
+    ECmdRunAllLayoutTests,
+    ECmdRunFirstLayoutTest,
+    ECmdRunNextLayoutTest,
+    ECmdRunLayoutTestByIndex,
+    ECmdListAllTests
     };
 

S60/trunk/S60WebUi/WebUi/inc/WebUiAutomatedTests.h

@@ -10 +10 @@
 *    All rights reserved.
 *  
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*   Redistribution and use in source and binary forms, with or without
+*   modification, are permitted provided that the following conditions
+*   are met:
 *  
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *  
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*   DAMAGE.
 *  
 *    Please see file patentlicense.txt for further grants.
@@ -56 +56 @@
 // the automated tests.
 // Layout test commands
+_LIT(KRunAllTests, "runalltests");
 _LIT(KRunAllLayoutTests, "runalllayouttests");
 _LIT(KRunFirstLayoutTest, "runfirstlayouttest");
@@ -114 +115 @@
         CWebUiAutomatedTests( CBrCtlInterface* aEngine );
 
-            /**
+      /**
         * ConstructL
         * EPOC default constructor.        
@@ -131 +132 @@
         * @return TInt
         */
-        TInt DoAutomatedTestsActionL( TDesC& aActionString );
+        TInt DoAutomatedTestsActionL( const TDesC& aActionString );
 
         /**
@@ -192 +193 @@
 
     private:    // new methods
+
+        /**
+        * RunAllTestsL
+        * @since 3.1
+        * @param none
+        * @return TInt
+        */
+        TInt RunAllTestsL();
+
         /**
         * RunAllLayoutTestsL
@@ -257 +267 @@
         TInt LoadTestUrlsL( const TDesC& aDirectory,
                             const TDesC& aExtension );
+
+        /**
+        * PrepPerformanceResultsFileL
+        * @since 3.1
+        * @return void
+        */
+        void PrepPerformanceResultsFileL();
 
         /**

S60/trunk/S60WebUi/WebUi/src/WebUiAutomatedTests.cpp

@@ -10 +10 @@
 *    All rights reserved.
 *
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*   Redistribution and use in source and binary forms, with or without
+*   modification, are permitted provided that the following conditions
+*   are met:
 *
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*   DAMAGE.
 *
 *    Please see file patentlicense.txt for further grants.
@@ -76 +76 @@
 
 // These strings are used to create the html test result files (ie Content)
-_LIT8(KPagesLoadedContent, "<html>\r\n<head>\r\n<title>Automated Test Results</title>\r\n</head>\r\n<body bgcolor=\"lightgreen\">\r\n");
-_LIT8(KLayoutResultsContent, "<html>\r\n<head>\r\n<title>Layout Test Results</title>\r\n</head>\r\n<body>\r\n");
-_LIT8(KPerfResultContent, "<html>\r\n<head>\r\n<title>Performance Test Results</title>\r\n</head>\r\n<body>\r\n");
-_LIT8(KTestPageListContent, "<html>\r\n<head>\r\n<title>Automated Test Page List</title>\r\n</head>\r\n<body bgcolor=\"cyan\">\r\n");
+_LIT8(KPagesLoadedContent, "<html>\r\n<head>\r\n<title>Test Page Loaded</title>\r\n</head>\r\n<body bgcolor=\"lightgreen\">\r\n");
+_LIT8(KLayoutResultsContent, "<html>\r\n<head>\r\n<title>Layout Test Results</title>\r\n</head>\r\n<body bgcolor=\"red\">\r\n");
+_LIT8(KPerfResultContent, "<html>\r\n<head>\r\n<title>Performance Test Results</title>\r\n</head>\r\n<body bgcolor=\"pink\">\r\n");
+_LIT8(KTestPageListContent, "<html>\r\n<head>\r\n<title>Test Page List</title>\r\n</head>\r\n<body bgcolor=\"cyan\">\r\n");
 _LIT8(KBR, "<br>\r\n");
 _LIT8(KNBSP, "&nbsp;&nbsp;");
-_LIT8(KFileName, "<hr>\r\nFile: ");
-_LIT8(KLayoutCompleteTime, "Layout complete time: ");
-_LIT8(KDocumentCompleteTime, "Document complete time: ");
+_LIT8(KLayoutCompleteTime, "Layout complete time");
+_LIT8(KDocumentCompleteTime, "Document complete time");
 _LIT8(KMicroSecs, " microsecs");
 _LIT8(KTableStart, "\r\n<table border=\"1\"><tr><th>Index</th><th>Path and Filename</th></tr>");
 _LIT8(KIndexTDEntry, "\r\n<tr><td> ");
+_LIT8(KIndexCenterTDEntry, "\r\n<tr><td align=\"center\"> ");
 _LIT8(KFileTDEntry, " </td><td> ");
-_LIT8(KEndTDEntry, " </td><tr>\r\n");
-_LIT8(KTableEnding, "</table>\r\n");
+_LIT8(KEndTDEntry, " </td></tr>");
+_LIT8(KTableEnding, "\r\n</table>\r\n");
 _LIT8(KCurrentPageLoading, "<br>\r\nCurrent page loading<br>");
 _LIT8(KTotalNumPages, "<b>Total number of test pages:</b> ");
@@ -145 +145 @@
     RFs rfs;
     TInt err = rfs.Connect();
-    if ( !err )
+    if ( err == KErrNone )
         {
         rfs.MkDirAll( KTestingResultsDir );
@@ -180 +180 @@
 // ---------------------------------------------------------
 //
-TInt CWebUiAutomatedTests::DoAutomatedTestsActionL( TDesC& aActionString )
+TInt CWebUiAutomatedTests::DoAutomatedTestsActionL( const TDesC& aActionString )
     {
     TInt err( KErrNotFound );
 
+    if ( aActionString.Find( KRunAllTests ) != KErrNotFound )
+        {
+        // This will run all of the tests from beginning until completed
+        err = RunAllTestsL();
+        }
     if ( aActionString.Find( KRunAllLayoutTests ) != KErrNotFound )
         {
-        // This will run all of the tests from beginning until completed
+        // This will run all of the layout tests from beginning until completed
         err = RunAllLayoutTestsL();
         }
     else if ( aActionString.Find( KRunFirstLayoutTest ) != KErrNotFound )
         {
-        // This will run the first test case, iPageIndex = 0
+        // This will run the first layout test case, iPageIndex = 0
         err = RunFirstLayoutTestL();
         }
     else if ( aActionString.Find( KRunNextLayoutTest ) != KErrNotFound )
         {
-        // This will run the next test case, using current iPageIndex
+        // This will run the next layout test case, using current iPageIndex
         err = RunNextLayoutTestL();
         }
@@ -207 +212 @@
     else if ( aActionString.Find( KRunLayoutTestByIndex ) != KErrNotFound )
         {
+        // This will run the layout test case, using a specified iPageIndex
         err = RunLayoutTestByIndexL();
         }
     else if ( aActionString.Find( KRunPerformanceTests ) != KErrNotFound )
         {
+        // This will run the next layout test case, using current iPageIndex
         err = RunAllPerformanceTestsL();
         }
@@ -218 +225 @@
 
 // ---------------------------------------------------------
-// CWebUiAutomatedTests::RunLayoutTestsL
+// CWebUiAutomatedTests::RunAllTestsL
+// Run all of the test cases until complete. This loads all
+// of the test cases urls into iUrlArray. This method will run
+// both the layout render tree and performance tests. It is currently
+// called by the launcher (ATF script).
+// ---------------------------------------------------------
+//
+TInt CWebUiAutomatedTests::RunAllTestsL()
+    {
+    TInt err( KErrNone );
+
+    // If we haven't already, get the test pages url
+    if ( iUrlArray->Count() == 0 )
+        {
+        err = LoadTestUrlsL( KLayoutTestsDir(), KHtmlTestFiles() );
+        }
+
+    // If we found layout test pages, start loading
+    if ( err == KErrNone && iUrlArray->Count() )
+        {
+        // If we found test pages, prep the performance results file.
+        PrepPerformanceResultsFileL();
+        
+        // Set Layout test mode, ie run layout tests
+        iLayoutTestMode = ETrue;
+        // Set Performance test mode, ie run performance tests
+        iPerformanceTestMode = ETrue;
+        // Set run all tests, ie run all test cases until complete
+        iRunAllTests = ETrue;
+        // Set the test page index to run the first page
+        iPageIndex = 0;
+        
+        LoadTestPageL();
+        }
+
+    return err;
+    }
+
+// ---------------------------------------------------------
+// CWebUiAutomatedTests::RunAllLayoutTestsL
 // Run all of the layout test cases until complete. This loads all
 // of the test cases urls into iUrlArray.
@@ -234 +280 @@
 
     // If we found layout test pages, start loading
-    if ( !err && iUrlArray->Count() )
-        {
+    if ( err  == KErrNone && iUrlArray->Count() )
+        {
+        // Set our testing mode
         iLayoutTestMode = ETrue;
         iRunAllTests = ETrue;
+
+        // Set our testing page index
+        iPageIndex = 0;
         LoadTestPageL();
         }
@@ -261 +311 @@
 
     // If we found layout test pages, start loading
-    if ( !err && iUrlArray->Count() )
-        {
+    if ( err == KErrNone && iUrlArray->Count() )
+        {
+        // Set our testing mode
         iLayoutTestMode = ETrue;
         iRunAllTests = EFalse;
+
+        // Set our testing page index
         iPageIndex = 0;
         LoadTestPageL();
@@ -286 +339 @@
         {
         err = LoadTestUrlsL( KLayoutTestsDir(), KHtmlTestFiles() );
+        // We are doing this for the first time, the increment below will
+        // make iPageIndex=0 (first test case)
+        iPageIndex = -1;
         }
 
     // If we found layout test pages, start loading
-    if ( !err && iUrlArray->Count() )
-        {
+    if ( err == KErrNone && iUrlArray->Count() )
+        {
+        // Set our testing mode
         iLayoutTestMode = ETrue;
         iRunAllTests = EFalse;
+
+        // Set our next testing page index
+        ++iPageIndex;
         LoadTestPageL();
         }
@@ -317 +377 @@
 
     // If we found layout test pages, start loading test page using index
-    if ( !err && iUrlArray->Count() )
+    if ( err == KErrNone && iUrlArray->Count() )
         {
         // Get the index of the test page we want to load
@@ -345 +405 @@
             }
 
-        // We have a valid index, so use it
-        iPageIndex = pageIndex;
+        // Set our testing mode
         iLayoutTestMode = ETrue;
         iRunAllTests = EFalse;
+
+        // We have a valid testing page index, use it
+        iPageIndex = pageIndex;
         LoadTestPageL();
         }
@@ -365 +427 @@
     // developer can go to thier developement machine file system and review
     // the delta's introduced and make any code changes necessary to correct
-    // the layout (render tree).
+    // the layout (render tree). See ATF script.
 
     return KErrNone;
@@ -385 +447 @@
         }
 
-    // If we found test pages, prep the results file and start loading
-    if ( !err && iUrlArray->Count() )
-        {
-        // Get the total number of test pages
-        HBufC8* numTestsRun = HBufC8::NewLC( KMaxBufferSize );
-        ++cleanupCount;
-        numTestsRun->Des().AppendNum( iUrlArray->Count() );
-
-        // Add the number of test line
-        TInt numTestsLen( KTotalNumPages().Length() + numTestsRun->Des().Length() +
-                          KBR().Length() + KHtmlEnding().Length() );
-        TInt htmlLen( KPerfResultContent().Length() + numTestsLen );
-
-        // Don't put this pointer on cleanup stack
-        delete iHtmlFileBuffer;
-        iHtmlFileBuffer = NULL;
-        iHtmlFileBuffer = HBufC8::NewL( htmlLen );
-
-        // Prepare the beginning of performance results buffer (html page)
-        TPtr8 perfResultsPtr( iHtmlFileBuffer->Des() );
-        perfResultsPtr.Copy( KPerfResultContent() );
-        perfResultsPtr.Append( KTotalNumPages() );
-        perfResultsPtr.Append( *numTestsRun );
-        perfResultsPtr.Append( KBR() );
-        perfResultsPtr.Append( KHtmlEnding() );
-
+    // If we found test pages, prep the performance results file
+    // and start loading
+    if ( err == KErrNone && iUrlArray->Count() )
+        {
+        // If we found test pages, prep the performance results file.
+        PrepPerformanceResultsFileL();
+        
+        // Set our test mode
         iPerformanceTestMode = ETrue;
         iRunAllTests = ETrue;
+        
         LoadTestPageL();
         }
@@ -460 +505 @@
     CDir* currentDirEntries = NULL;
 
-        do
-            {
+  do
+      {
         delete currentDirEntries;
         dirScan->NextL( currentDirEntries );
@@ -495 +540 @@
                 }
             }
-                } while ( currentDirEntries );
+    } while ( currentDirEntries );
 
     // Clean up our memory
@@ -510 +555 @@
 
 // ---------------------------------------------------------
+// CWebUiAutomatedTests::PrepPerformanceResultsFileL
+// Prepare the initial content for the performance results file.
+// ---------------------------------------------------------
+//
+void CWebUiAutomatedTests::PrepPerformanceResultsFileL()
+    {
+    // Get the total number of test pages.
+    HBufC8* numTestsRun = HBufC8::NewLC( KMaxBufferSize );
+    numTestsRun->Des().AppendNum( iUrlArray->Count() );
+
+    // Add the number of test line
+    TInt htmlLen( KPerfResultContent().Length() + KTotalNumPages().Length() +
+                  numTestsRun->Length() + KBR().Length() +
+                  KTableStart().Length() );
+
+    // Don't put this pointer on cleanup stack
+    delete iHtmlFileBuffer;
+    iHtmlFileBuffer = NULL;
+    iHtmlFileBuffer = HBufC8::NewL( htmlLen );
+
+    // Prepare the beginning of performance results buffer (html page)
+    TPtr8 perfResultsPtr( iHtmlFileBuffer->Des() );
+    perfResultsPtr.Copy( KPerfResultContent() );
+    perfResultsPtr.Append( KTotalNumPages() );
+    perfResultsPtr.Append( *numTestsRun );
+    perfResultsPtr.Append( KBR() );
+    perfResultsPtr.Append( KTableStart() );
+
+    // Clean up memory
+    CleanupStack::PopAndDestroy( 1 );   // numTestsRun
+    }
+
+// ---------------------------------------------------------
 // CWebUiAutomatedTests::DumpLayoutResults
 // ---------------------------------------------------------
@@ -530 +608 @@
                                 TPerformanceTimes& aPerformance )
     {
-    if ( !iHtmlFileBuffer )
-        {
-        // We don't have a performance test results buffer
+    if ( !iHtmlFileBuffer || iPageIndex < 0 || iPageIndex >= iUrlArray->Count() )
+        {
+        // We don't have a performance test results buffer, or page index
+        // is out of range, i.e. we are at the end of the url array
         return;
         }
@@ -540 +619 @@
     TInt cleanupCount( 0 );
 
-    // Get the path and filename of the last url loaded (Convert 16->8bit)
-    TPtr filename( iUrlArray->At( iPageIndex-1 )->Des() );
-    HBufC8* filename8 = HBufC8::NewLC( filename.Length() );
-    ++cleanupCount;
-    filename8->Des().Copy( filename );
-
-    // Get the time to layout document
+    // Create the index and path filename line.
+    // Get the index of current test page running.
+    HBufC8* currentPageIndex = HBufC8::NewLC( KMaxBufferSize );
+    ++cleanupCount;
+    currentPageIndex->Des().AppendNum( iPageIndex );
+
+    // Get the path filename of the current test page loading (Convert 16->8bit)
+    TPtr currentFile( iUrlArray->At( iPageIndex )->Des() );
+    HBufC8* currentFilename8 = HBufC8::NewLC( currentFile.Length() );
+    ++cleanupCount;
+    currentFilename8->Des().Copy( currentFile );
+
+    // Remove the file scheme from the current filename
+    TInt parseLen( currentFilename8->Des().Length() -
+                   KFileScheme().Length() );
+    TPtrC8 filename8( currentFilename8->Des().Right( parseLen ) );
+
+    TInt fileLen( KIndexCenterTDEntry().Length() +
+                  currentPageIndex->Des().Length() + KFileTDEntry().Length() +
+                  filename8.Length() + KEndTDEntry().Length() );
+
+    HBufC8* fileEntry = HBufC8::NewLC( fileLen );
+    ++cleanupCount;
+    TPtr8 fileEntryPtr( fileEntry->Des() );
+    fileEntryPtr.Copy( KIndexCenterTDEntry() );
+    fileEntryPtr.Append( *currentPageIndex );
+    fileEntryPtr.Append( KFileTDEntry() );
+    fileEntryPtr.Append( filename8 );
+    fileEntryPtr.Append( KEndTDEntry() );
+
+    // Create the layout complete time line
     timeDelta = aPerformance.timeLayoutComplete.Int64();
     HBufC8* layoutTime = HBufC8::NewLC( KMaxBufferSize );
@@ -552 +655 @@
     layoutTime->Des().AppendNum( timeDelta );
 
-    // Get the time to complete document
+    TInt layoutLen( KIndexTDEntry().Length() + KLayoutCompleteTime().Length() +
+                    KFileTDEntry().Length() + layoutTime->Des().Length() +
+                    KMicroSecs().Length() + KEndTDEntry().Length() );
+
+    HBufC8* layoutEntry = HBufC8::NewLC( layoutLen );
+    ++cleanupCount;
+    TPtr8 layoutEntryPtr( layoutEntry->Des() );
+    layoutEntryPtr.Copy( KIndexTDEntry() );
+    layoutEntryPtr.Append( KLayoutCompleteTime() );
+    layoutEntryPtr.Append( KFileTDEntry() );
+    layoutEntryPtr.Append( *layoutTime );
+    layoutEntryPtr.Append( KMicroSecs() );
+    layoutEntryPtr.Append( KEndTDEntry() );
+
+    // Create the Document complete time line
     timeDelta = aPerformance.timeDocumentComplete.Int64();
     HBufC8* completeTime = HBufC8::NewLC( KMaxBufferSize );
@@ -558 +675 @@
     completeTime->Des().AppendNum( timeDelta );
 
-    // Add the filename line
-    TInt fileLen( KFileName().Length() + filename8->Des().Length() +
-                  KBR().Length() );
-
-    HBufC8* fileEntry = HBufC8::NewLC( fileLen );
-    ++cleanupCount;
-    TPtr8 fileEntryPtr( fileEntry->Des() );
-    fileEntryPtr.Append( KFileName() );
-    fileEntryPtr.Append( *filename8 );
-    fileEntryPtr.Append( KBR() );
-
-    // Add the layout complete time line
-    TInt layoutLen( KLayoutCompleteTime().Length() +
-                    layoutTime->Des().Length() + KMicroSecs().Length() +
-                    KBR().Length() );
-
-    HBufC8* layoutEntry = HBufC8::NewLC( layoutLen );
-    ++cleanupCount;
-    TPtr8 layoutEntryPtr( layoutEntry->Des() );
-    layoutEntryPtr.Append( KLayoutCompleteTime() );
-    layoutEntryPtr.Append( *layoutTime );
-    layoutEntryPtr.Append( KMicroSecs() );
-    layoutEntryPtr.Append( KBR() );
-
-    // Add the document complete time line
-    TInt completeLen( KDocumentCompleteTime().Length() +
-                      completeTime->Des().Length() + KMicroSecs().Length() +
-                      KBR().Length() );
+    TInt completeLen( KIndexTDEntry().Length() + KDocumentCompleteTime().Length() +
+                      KFileTDEntry().Length() + completeTime->Des().Length() +
+                      KMicroSecs().Length() + KEndTDEntry().Length() );
 
     HBufC8* completeEntry = HBufC8::NewLC( completeLen );
     ++cleanupCount;
     TPtr8 completeEntryPtr( completeEntry->Des() );
+    completeEntryPtr.Copy( KIndexTDEntry() );
     completeEntryPtr.Append( KDocumentCompleteTime() );
+    completeEntryPtr.Append( KFileTDEntry() );
     completeEntryPtr.Append( *completeTime );
     completeEntryPtr.Append( KMicroSecs() );
-    completeEntryPtr.Append( KBR() );
-
-    // Expand the results buffer to hold the new entry
+    completeEntryPtr.Append( KEndTDEntry() );
+
+    // Expand the results buffer to hold the new entries
     TInt newLen( iHtmlFileBuffer->Des().Length() + fileLen +
                  layoutLen + completeLen );
@@ -603 +697 @@
     HBufC8* tempResult = HBufC8::NewL( newLen );
     TPtr8 tempResultPtr( tempResult->Des() );
-    tempResultPtr.Append( iHtmlFileBuffer->Des() );
+    tempResultPtr.Copy( iHtmlFileBuffer->Des() );
     tempResultPtr.Append( *fileEntry );
     tempResultPtr.Append( *layoutEntry );
@@ -656 +750 @@
 
     TInt err = resultFile.Replace( fs, KLayoutResultFile, EFileWrite );
-    if ( !err )
+    if ( err == KErrNone )
         {
         resultFile.Write( layoutEntry->Des() );