Changeset 210

Timestamp:

06/10/06 09:02:37 (2 years ago)

Author:

jordi

Message:

Added test for checking the save a document functionality.

Location:

trunk

Files:

• src/JobSave.cxx (modified) (1 diff)
• tests/DumbDocument.cxx (modified) (4 diffs)
• tests/DumbDocument.h (modified) (2 diffs)
• tests/DumbMainView.cxx (modified) (5 diffs)
• tests/DumbMainView.h (modified) (3 diffs)
• tests/MainPterTest.cxx (modified) (4 diffs)
• tests/MainPterTest.h (modified) (2 diffs)

trunk/src/JobSave.cxx

@@ -112 +112 @@
 {
     g_assert ( NULL != document && "Tried to set a NULL document.");
-    
+
     m_Document = document;
 }

trunk/tests/DumbDocument.cxx

@@ -30 +30 @@
     m_Loaded = FALSE;
     m_OpenError = DocumentErrorNone;
-    m_TestPassword = NULL; 
+    m_SavedFileName = g_strdup ("");
+    m_TestPassword = NULL;
     setNumPages (2);
 }
@@ -37 +38 @@
 {
     clearCache ();
+    g_free (m_SavedFileName);
     g_free (m_TestPassword);
 }
@@ -101 +103 @@
 
 gboolean
-DumbDocument::saveFile (const gchar *filename, GError **error)
+DumbDocument::saveFile (const gchar *fileName, GError **error)
 {
-    // Do nothing.
+    g_free (m_SavedFileName);
+    m_SavedFileName = g_strdup (fileName);
     return TRUE;
 }
@@ -110 +113 @@
 // Tests Methods
 ////////////////////////////////////////////////////////////////
+
+const gchar *
+DumbDocument::getSavedFileName ()
+{
+    return m_SavedFileName;
+}
+
 void
 DumbDocument::setOpenError (DocumentError error)

trunk/tests/DumbDocument.h

@@ -32 +32 @@
             gboolean loadFile (const gchar *filename, const gchar *password,
                                GError **error);
-            void getPageSizeForPage (gint pageNum, gdouble *width, 
+            void getPageSizeForPage (gint pageNum, gdouble *width,
                                      gdouble *height);
             DocumentPage *renderPage (gint pageNum);
-            gboolean saveFile (const gchar *filename, GError **error);
+            gboolean saveFile (const gchar *fileName, GError **error);
 
             // Test functions.
+            const gchar *getSavedFileName (void);
             void setOpenError (DocumentError error);
             void setOutline (DocumentOutline *outline);
@@ -46 +47 @@
             DocumentError m_OpenError;
             gchar *m_TestPassword;
+            gchar *m_SavedFileName;
     };
 }

trunk/tests/DumbMainView.cxx

@@ -35 +35 @@
     m_OpenFileName = g_strdup ("");
     m_LastOpenFileFolder = NULL;
+    m_LastSaveFileFolder = NULL;
     m_Outline = NULL;
-    m_PageView = new DumbPageView (); 
+    m_PageView = new DumbPageView ();
     m_Password = NULL;
+    m_SaveFileName = g_strdup ("");
     m_SensitiveFind = TRUE;
     m_SensitiveGoToFirstPage = TRUE;
@@ -72 +74 @@
     g_free (m_GoToPageText);
     g_free (m_LastOpenFileFolder);
+    g_free (m_LastSaveFileFolder);
     g_free (m_OpenFileName);
     g_free (m_Password);
+    g_free (m_SaveFileName);
     g_free (m_Title);
     g_free (m_ZoomText);
@@ -126 +130 @@
 DumbMainView::saveFileDialog (const gchar *lastFolder)
 {
-    // Do nothing.
-    return g_strdup ("");
+    g_free (m_LastSaveFileFolder);
+    m_LastSaveFileFolder = g_strdup (lastFolder);
+    return g_strdup (m_SaveFileName);
 }
 
@@ -333 +338 @@
 }
 
+const gchar *
+DumbMainView::getLastSaveFileFolder ()
+{
+    return m_LastSaveFileFolder;
+}
+
 
 DocumentOutline *
@@ -491 +502 @@
     m_Password = g_strdup (password);
     m_TimesShownPassword = 0;
+}
+
+void
+DumbMainView::setSaveFileName (const gchar *fileName)
+{
+    g_free (m_SaveFileName);
+    m_SaveFileName = g_strdup (fileName);
 }
 

trunk/tests/DumbMainView.h

@@ -75 +75 @@
             gint getCurrentPage (void);
             const gchar *getLastOpenFileFolder (void);
+            const gchar *getLastSaveFileFolder (void);
             DocumentOutline *getOutline (void);
             const gchar *getTitle (void);
@@ -101 +102 @@
             void setOpenFileName (const gchar *fileName);
             void setPassword (const gchar *password);
+            void setSaveFileName (const gchar *fileName);
             gboolean shownError (void);
 
@@ -108 +110 @@
             gchar *m_GoToPageText;
             gchar *m_LastOpenFileFolder;
+            gchar *m_LastSaveFileFolder;
             gchar *m_OpenFileName;
             DocumentOutline *m_Outline;
             DumbPageView *m_PageView;
             gchar *m_Password;
+            gchar *m_SaveFileName;
             gboolean m_SensitiveFind;
             gboolean m_SensitiveGoToFirstPage;

trunk/tests/MainPterTest.cxx

@@ -191 +191 @@
 void
 MainPterTest::loadFailed ()
-{    
+{
     m_View->setOpenFileName ("/tmp/test.pdf");
     m_Document->setOpenError (DocumentErrorDamaged);
@@ -231 +231 @@
     m_MainPter->openFileActivated ();
     m_MainPter->waitForFileLoaded ();
-    CPPUNIT_ASSERT_EQUAL (0, 
+    CPPUNIT_ASSERT_EQUAL (0,
             g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToFirstPage ());
@@ -329 +329 @@
 ///
 void
-MainPterTest::lastFolder ()
+MainPterTest::openLastFolder ()
 {
     m_View->setOpenFileName ("/tmp/test.pdf");
@@ -348 +348 @@
                                              m_View->getLastOpenFileFolder ()));
 }
+
+///
+/// @brief Test saving a document.
+///
+/// Saving a document will call the saveFile() function of the document's class.
+///
+void
+MainPterTest::saveDocument ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    m_MainPter->waitForFileLoaded ();
+    m_View->setSaveFileName ("/tmp/copy.pdf");
+    m_MainPter->saveFileActivated ();
+    CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("/tmp/copy.pdf",
+                                             m_Document->getSavedFileName ()));
+}
+
+///
+/// @brief Tests a canceled save file.
+///
+/// When the user cancels the save dialog, then nothing should be saved.
+///
+void
+MainPterTest::saveCanceled ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    m_MainPter->waitForFileLoaded ();
+    // returning a NULL file name is what will happen when cancel.
+    m_View->setSaveFileName (NULL);
+    m_MainPter->saveFileActivated ();
+    CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("",
+                                             m_Document->getSavedFileName ()));
+}
+
+///
+/// @brief Test the last folder used to save a file.
+///
+/// When the presenter wants to save a file, it should pass to the
+/// view the last folder that was used to save a file, so the
+/// view can show it up when saving the dialog.
+///
+void
+MainPterTest::saveLastFolder ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    m_MainPter->waitForFileLoaded ();
+    m_View->setSaveFileName ("/tmp/copy.pdf");
+    m_MainPter->saveFileActivated ();
+    m_MainPter->waitForFileSaved ();
+    CPPUNIT_ASSERT (NULL == m_View->getLastSaveFileFolder ());
+
+
+    m_View->setSaveFileName ("/usr/copy.pdf");
+    m_MainPter->saveFileActivated ();
+    m_MainPter->waitForFileSaved ();
+    CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("/tmp",
+                                             m_View->getLastSaveFileFolder ()));
+
+    m_MainPter->saveFileActivated ();
+    m_MainPter->waitForFileSaved ();
+    CPPUNIT_ASSERT (0 == g_ascii_strcasecmp ("/usr",
+                                             m_View->getLastSaveFileFolder ()));
+
+}
+
 
 ///

trunk/tests/MainPterTest.h

@@ -33 +33 @@
         CPPUNIT_TEST (badPassword);
         CPPUNIT_TEST (goodPassword);
-        CPPUNIT_TEST (lastFolder);
+        CPPUNIT_TEST (openLastFolder);
+        CPPUNIT_TEST (saveDocument);
+        CPPUNIT_TEST (saveCanceled);
+        CPPUNIT_TEST (saveLastFolder);
         CPPUNIT_TEST (pageNavigation);
         CPPUNIT_TEST (pageNavigationEntry);
@@ -60 +63 @@
             void badPassword (void);
             void goodPassword (void);
-            void lastFolder (void);
+            void openLastFolder (void);
+            void saveDocument (void);
+            void saveCanceled (void);
+            void saveLastFolder (void);
             void pageNavigation (void);
             void pageNavigationEntry (void);