Changeset 6

Timestamp:

04/10/06 11:11:30 (3 years ago)

Author:

jordi

Message:

The Document class now actually tries to open a PDFDoc document from Poppler and reports an error if it can't find the PDF file.

Also, now the test file has a member which is the document to test, since it will be the same for all test (even for the empty, because I don't load a file in the setUp() function).

Location:

trunk

Files:

• src/Document.cxx (modified) (4 diffs)
• src/Document.h (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/epdfview.h (modified) (1 diff)
• tests/DocumentTest.cxx (modified) (3 diffs)
• tests/DocumentTest.h (modified) (2 diffs)
• tests/Makefile.am (modified) (1 diff)

trunk/src/Document.cxx

@@ -16 +16 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+// Poppler headers.
+#include <ErrorCodes.h>
+#include <GlobalParams.h>
+
 #include "epdfview.h"
 
@@ -25 +29 @@
 Document::Document ()
 {
+    this->m_Document = NULL;
 }
 
@@ -32 +37 @@
 Document::~Document ()
 {
+    delete this->m_Document;
 }
 
@@ -43 +49 @@
 {
     return false;
+}
+
+///
+/// @brief Load a PDF file.
+///
+/// Tries to open the PDF file @a filename.
+///
+/// @param filename The name of the filename to open.
+/// @param error Locatrion to store the error ocurringm or NULL to ignore 
+///              errors.
+///
+/// @return True if the file could be opened, false otherwise.
+///
+bool
+Document::loadFile (const gchar *filename, GError **error)
+{
+    assert (NULL != filename && "Tried to load a NULL filename");
+
+    // The poppler library has a GLOBAL file for parameters.
+    // If this file isn't loaded then weird error happens.
+    if ( NULL == globalParams )
+    {
+        globalParams = new GlobalParams ("/etc/xpdfrc");
+    }
+
+    GooString *filename_g = new GooString (filename);
+    GooString *password_g = NULL;
+    // Try to open the PDF document.
+    PDFDoc *newDocument = new PDFDoc (filename_g, password_g, password_g);
+    delete password_g;
+    // The filename_g can't be deleted as PDFDoc saves the reference.
+    // deleting it will cause trouble when deleting the newDocument.
+
+    // Check if the document couldn't be opened sucessfully and why.
+    if ( !newDocument->isOk() )
+    {
+        gint errorCode = newDocument->getErrorCode ();
+        delete newDocument;
+
+        if ( errEncrypted == errorCode )
+        {
+            g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, 
+                         _("Document is encrypted."));
+        }
+        else
+        {
+            g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                        _("Failed to load document '%s'. Error %d"),
+                        filename, errorCode);
+        }
+
+        return false;
+    }
+
+    delete this->m_Document;
+    this->m_Document = newDocument;
+
+    return true;
 }
 

trunk/src/Document.h

@@ -54 +54 @@
 
             bool isLoaded (void);
+            bool loadFile (const gchar *filename, GError **error);
             const gchar *getTitle (void);
             const gchar *getAuthor (void);
@@ -69 +70 @@
             gint getCurrentPageNum (void);
             DocumentIndex &getDocumentIndex (void);
+
+        protected:
+            PDFDoc *m_Document;
     };
 }

trunk/src/Makefile.am

@@ -11 +11 @@
 
 libepdfview_a_CXXFLAGS =    \
-    $(GLIB_CFLAGS)
+    $(GLIB_CFLAGS)          \
+    $(POPPLER_CFLAGS)

trunk/src/epdfview.h

@@ -19 +19 @@
 #define __E_PDF_VIEW_H__
 
+#include <assert.h>
 #include <gettext.h>
 #include <glib.h>
+
+// Poppler headers.
+#include <PDFDoc.h>
 
 #include <DocumentIndex.h>

trunk/tests/DocumentTest.cxx

@@ -30 +30 @@
 DocumentTest::setUp ()
 {
+    m_Document = new Document ();
 }
 
@@ -38 +39 @@
 DocumentTest::tearDown ()
 {
+    delete m_Document;
 }
 
@@ -51 +53 @@
 DocumentTest::emptyDocument ()
 {
-    Document *doc = new Document ();
+    CPPUNIT_ASSERT (!m_Document->isLoaded ());
+    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", m_Document->getTitle ()));
+    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", m_Document->getAuthor ()));
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("", m_Document->getSubject ()));
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("", m_Document->getKeywords ()));
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("", m_Document->getCreator ()));
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("", m_Document->getProducer ()));
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("", m_Document->getFormat ()));
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("", m_Document->getLinearized ()));
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("", m_Document->getCreationDate ()));
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("", m_Document->getModifiedDate ()));
+    CPPUNIT_ASSERT_EQUAL (PageModeUnset, m_Document->getPageMode ());
+    CPPUNIT_ASSERT_EQUAL (PageLayoutUnset, m_Document->getPageLayout ());
+    CPPUNIT_ASSERT_EQUAL (0, m_Document->getNumPages ());
+    CPPUNIT_ASSERT_EQUAL (0, m_Document->getCurrentPageNum ());
 
-    CPPUNIT_ASSERT (!doc->isLoaded ());
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getTitle ()));
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getAuthor ()));
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getSubject ()));
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getKeywords ()));
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getCreator ()));
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getProducer ()));
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getFormat ()));
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getLinearized ()));
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getCreationDate ()));
-    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("", doc->getModifiedDate ()));
-    CPPUNIT_ASSERT_EQUAL (PageModeUnset, doc->getPageMode ());
-    CPPUNIT_ASSERT_EQUAL (PageLayoutUnset, doc->getPageLayout ());
-    CPPUNIT_ASSERT_EQUAL (0, doc->getNumPages ());
-    CPPUNIT_ASSERT_EQUAL (0, doc->getCurrentPageNum ());
-
-    DocumentIndex &index = doc->getDocumentIndex ();
+    DocumentIndex &index = m_Document->getDocumentIndex ();
     CPPUNIT_ASSERT_EQUAL (0, index.getNumChildren ());
 }
+
+///
+/// @brief Tests that loading a file which does not exist fails.
+///
+/// Loading a PDF can fail under three conditions: the file is not found,
+/// the file is not a PDF (or a malformed PDF file) and the file is encrypted
+/// but not password has been supplied.
+///
+/// This test just check that loading a not existent file fails.
+///
+void
+DocumentTest::fileNotFound (void)
+{
+    gchar *error_message;
+    GError *error = NULL;    
+
+    CPPUNIT_ASSERT (!m_Document->loadFile (TEST_DATA_DIR "noFile.pdf", &error));
+    CPPUNIT_ASSERT (!m_Document->isLoaded ());
+    
+    error_message = g_strdup_printf (
+            "Failed to load document '%sNoFile.pdf'. Error 1", TEST_DATA_DIR);
+    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp (error_message, 
+                                                 error->message));
+}

trunk/tests/DocumentTest.h

@@ -27 +27 @@
         CPPUNIT_TEST_SUITE (DocumentTest);
         CPPUNIT_TEST (emptyDocument);
+        CPPUNIT_TEST (fileNotFound);
         CPPUNIT_TEST_SUITE_END ();
 
@@ -34 +35 @@
 
             void emptyDocument (void);
+            void fileNotFound (void);
+
+        private:
+            Document *m_Document;
     };
 }

trunk/tests/Makefile.am

@@ -9 +9 @@
     main.cxx
 
-test_epdfview_CXXFLAGS =                \
-    -DTEST_DATA_DIR=$(top_srcdir)/src   \
-    -I$(top_srcdir)/src                 \
-    $(GLIB_CFLAGS)                      \
+test_epdfview_CXXFLAGS =                    \
+    -DTEST_DATA_DIR='"$(top_srcdir)/src/"'  \
+    -I$(top_srcdir)/src                     \
+    $(GLIB_CFLAGS)                          \
+    $(POPPLER_CFLAGS)                       \
     $(CPPUNIT_CFLAGS)
 
 test_epdfview_LDFLAGS = \
     $(GLIB_LIBS)        \
+    $(POPPLER_LIBS)     \
     $(CPPUNIT_LIBS)