Changeset 122

Timestamp:

04/26/06 16:32:51 (2 years ago)

Author:

jordi

Message:

Now all tests pass. It turns out that I used usleep(2) believing that it was in milliseconds instead of microseconds, so the time sleeping was too short. Also, the PDFDocumentTest was deleting the page in the renderPage() method, leading to a double delete.

Location:

trunk

Files:

• src/IDocument.cxx (modified) (12 diffs)
• src/MainPter.cxx (modified) (1 diff)
• tests/DumbDocument.cxx (modified) (1 diff)
• tests/MainPterTest.cxx (modified) (25 diffs)
• tests/PDFDocumentTest.cxx (modified) (1 diff)

trunk/src/IDocument.cxx

@@ -17 +17 @@
 
 #include <config.h>
+#include <string.h>
 #include "epdfview.h"
 
@@ -143 +144 @@
         PageRequest *request = (PageRequest *)g_async_queue_pop (renderQueue);
         G_LOCK (rendering);
-        if ( 0 < request->pageNum )
-        {
-            if ( NULL != request->document )
-            {
-                request->page = request->document->renderPage (request->pageNum);
-            }
-            request->done = TRUE;
-        }
-        else if ( -1 == request->pageNum )
+        if ( -1 == request->pageNum )
         {
             delete request;
@@ -158 +151 @@
         else
         {
+            if ( 0 < request->pageNum )
+            {
+                request->page = 
+                    request->document->renderPage (request->pageNum);
+            }
             request->done = TRUE;
         }
@@ -215 +213 @@
     // thread that we are done.
     PageRequest *request = new PageRequest;
+    memset (request, 0, sizeof (PageRequest));
     request->pageNum = -1;
     g_async_queue_unref (m_RenderQueue);
@@ -680 +679 @@
 IDocument::getCurrentPage ()
 {
-    GList *cache = g_list_first (m_PageCache);
     PageRequest *request = NULL;
-    while ( NULL != cache && NULL == request )
+    for ( GList *cache = g_list_first (m_PageCache) ;
+          NULL != cache && NULL == request ;
+          cache = g_list_next (cache) )
     {
         PageRequest *tmpRequest = (PageRequest *)cache->data;
@@ -689 +689 @@
             request = tmpRequest;
         }
-        cache = g_list_next (cache);
     }
 
     if ( NULL == request )
+    {
         return NULL;
-
+    }
     WAIT_REQUEST (request);
-
     return request->page;
 }
@@ -1003 +1002 @@
     // Check if the page is already on cache.
     PageRequest *request = NULL;
-    GList *cache = g_list_first (m_PageCache);
-    while ( NULL != cache && NULL == request)
+    for ( GList *cache = g_list_first (m_PageCache) ; 
+          NULL != cache && NULL == request ;
+          cache = g_list_next (cache) )
     {
         PageRequest *tmpRequest = (PageRequest *)cache->data;
@@ -1011 +1011 @@
             request = tmpRequest;
         }
-        cache = g_list_next (cache);
     }
 
@@ -1030 +1029 @@
             PageRequest *oldestRequest = NULL;
             guint32 oldestAge = G_MAXUINT32;
-            for ( cache = g_list_first (m_PageCache) ; NULL != cache ;
+            for ( GList *cache = g_list_first (m_PageCache) ; NULL != cache ;
                   cache = g_list_next (cache) )
             {
@@ -1040 +1039 @@
                 }
             }
-            m_PageCache = g_list_remove (m_PageCache, oldestRequest);
+            m_PageCache = g_list_remove_all (m_PageCache, oldestRequest);
             WAIT_REQUEST (oldestRequest);
             delete oldestRequest->page;
+            oldestRequest->page = NULL;
             delete oldestRequest;
         }
@@ -1096 +1096 @@
     {
         PageRequest *request = (PageRequest *)cache->data;
-        request->document = NULL;
+        request->pageNum = 0;
     }
     G_UNLOCK (rendering);
@@ -1107 +1107 @@
         WAIT_REQUEST (request);
         delete request->page;
+        request->page = NULL;
         delete request;
     }

trunk/src/MainPter.cxx

@@ -613 +613 @@
                         GError **error)
 {
+    g_assert ( NULL != m_Document && "The document is NULL.");
+
     // if fileName is NULL, then the user cancelled the operation.
     // I don't need to do anything in this case. I'm only interested when

trunk/tests/DumbDocument.cxx

@@ -36 +36 @@
 DumbDocument::~DumbDocument ()
 {
+    clearCache ();
     g_free (m_TestPassword);
 }

trunk/tests/MainPterTest.cxx

@@ -26 +26 @@
 CPPUNIT_TEST_SUITE_REGISTRATION (MainPterTest);
 
+// Constants.
+static const gint SLEEP_TIME = 250000;
+
 ///
 /// @brief Sets up the environment for each test.
@@ -100 +103 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0, 
             g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
@@ -122 +125 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0, 
             g_ascii_strcasecmp ("Test PDF", m_View->getTitle ()));
@@ -153 +156 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0, 
             g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
@@ -186 +189 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0, 
             g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
@@ -221 +224 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0, 
             g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
@@ -256 +259 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0, 
             g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
@@ -291 +294 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0, 
             g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
@@ -324 +327 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (NULL == m_View->getLastOpenFileFolder ());
 
@@ -331 +334 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("/tmp", 
                                              m_View->getLastOpenFileFolder ()));
@@ -337 +340 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("/usr", 
                                              m_View->getLastOpenFileFolder ()));
@@ -355 +358 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     // Check that sets the correct number of pages and the current page.
     CPPUNIT_ASSERT_EQUAL (4, m_View->getTotalPages ());
@@ -437 +440 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     // Check that sets the correct number of pages and the current page.
     CPPUNIT_ASSERT_EQUAL (4, m_View->getTotalPages ());
@@ -518 +521 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT (!m_View->hasImagePageView ());
@@ -548 +551 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT (!m_View->hasImagePageView ());
@@ -589 +592 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
@@ -655 +658 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
@@ -720 +723 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
@@ -765 +768 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
 
@@ -779 +782 @@
     m_MainPter->reloadActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0, 
             g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
@@ -803 +806 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT_EQUAL (0, 
@@ -822 +825 @@
     m_MainPter->reloadActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0, 
             g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
@@ -847 +850 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT_EQUAL (0, 
@@ -868 +871 @@
     m_MainPter->reloadActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT_EQUAL (0,
             g_ascii_strcasecmp("newpassword", m_Document->getPassword ()));
@@ -907 +910 @@
     m_MainPter->openFileActivated ();
     // Sleep to let the thread open the file.
-    usleep (500);
+    usleep (SLEEP_TIME);
     CPPUNIT_ASSERT (m_View->isShownSidebar ());
     CPPUNIT_ASSERT (outline == m_View->getOutline ());

trunk/tests/PDFDocumentTest.cxx

@@ -507 +507 @@
     CPPUNIT_ASSERT (0 != memcmp (testData, page->getData (), imageSize));
     delete[] testData;
-    delete page;
-
-    g_free (testFile);
-}
+
+    g_free (testFile);
+}