Changeset 205

Timestamp:

06/10/06 05:34:50 (2 years ago)

Author:

jordi

Message:

I've added the missing pure virtual function from last week and also added a new test function for the Config class to test the last saved folder option.

Location:

trunk/tests

Files:

• ConfigTest.cxx (modified) (6 diffs)
• ConfigTest.h (modified) (2 diffs)
• DumbDocument.cxx (modified) (1 diff)
• DumbDocument.h (modified) (1 diff)
• DumbMainView.cxx (modified) (7 diffs)
• DumbMainView.h (modified) (3 diffs)

trunk/tests/ConfigTest.cxx

@@ -60 +60 @@
     CPPUNIT_ASSERT (config.showStatusbar ());
     CPPUNIT_ASSERT_EQUAL ((gchar *)NULL, config.getOpenFileFolder ());
+    CPPUNIT_ASSERT_EQUAL ((gchar *)NULL, config.getSaveFileFolder ());
     CPPUNIT_ASSERT (!config.zoomToWidth ());
     CPPUNIT_ASSERT (!config.zoomToFit ());
@@ -78 +79 @@
     config.setWindowPos (30, 40);
     config.setWindowSize (100, 90);
-    
+
     CPPUNIT_ASSERT_EQUAL (30, config.getWindowX ());
     CPPUNIT_ASSERT_EQUAL (40, config.getWindowY ());
@@ -100 +101 @@
 
 ///
-/// @brief Checks setting the value for showing the statusbar.
+/// @brief Checks setting the value for showing the status bar.
 ///
 void
@@ -117 +118 @@
 ///
 void
-ConfigTest::currentFolder ()
+ConfigTest::openCurrentFolder ()
 {
     Config &config = Config::getConfig ();
@@ -123 +124 @@
     config.setOpenFileFolder ("/tmp");
     gchar *openFolder = config.getOpenFileFolder ();
-    CPPUNIT_ASSERT ( 0 == g_ascii_strcasecmp("/tmp", openFolder));
+    CPPUNIT_ASSERT ( 0 == g_ascii_strcasecmp ("/tmp", openFolder));
     g_free (openFolder);
+}
+
+///
+/// @brief Check setting the current folder for saving files.
+///
+void
+ConfigTest::saveCurrentFolder ()
+{
+    Config &config = Config::getConfig ();
+
+    config.setSaveFileFolder ("/home");
+    gchar *saveFolder = config.getSaveFileFolder ();
+    CPPUNIT_ASSERT ( 0 == g_ascii_strcasecmp ("/home", saveFolder));
+    g_free (saveFolder);
 }
 
@@ -171 +186 @@
 {
     Config &config = Config::getConfig ();
-   
+
     config.setExternalBrowserCommandLine ("galeon %s");
     gchar *commandLine = config.getExternalBrowserCommandLine ();
     CPPUNIT_ASSERT ( 0 == g_ascii_strcasecmp ("galeon %s", commandLine));
     g_free (commandLine);
-    
+
     config.setExternalBrowserCommandLine ("xterm -e lynx %s");
     commandLine = config.getExternalBrowserCommandLine ();

trunk/tests/ConfigTest.h

@@ -30 +30 @@
         CPPUNIT_TEST (showToolbar);
         CPPUNIT_TEST (showStatusbar);
-        CPPUNIT_TEST (currentFolder);
+        CPPUNIT_TEST (openCurrentFolder);
+        CPPUNIT_TEST (saveCurrentFolder);
         CPPUNIT_TEST (zoomValues);
         CPPUNIT_TEST (externalBrowser);
@@ -43 +44 @@
             void showToolbar (void);
             void showStatusbar (void);
-            void currentFolder (void);
+            void openCurrentFolder (void);
+            void saveCurrentFolder (void);
             void zoomValues (void);
             void externalBrowser (void);

trunk/tests/DumbDocument.cxx

@@ -100 +100 @@
 }
 
+gboolean
+DumbDocument::saveFile (const gchar *filename, GError **error)
+{
+    // Do nothing.
+    return TRUE;
+}
+
 ////////////////////////////////////////////////////////////////
 // Tests Methods

trunk/tests/DumbDocument.h

@@ -35 +35 @@
                                      gdouble *height);
             DocumentPage *renderPage (gint pageNum);
+            gboolean saveFile (const gchar *filename, GError **error);
 
             // Test functions.

trunk/tests/DumbMainView.cxx

@@ -73 +73 @@
     g_free (m_Title);
 }
-            
-void 
+
+void
 DumbMainView::activeZoomFit (gboolean active)
 {
@@ -80 +80 @@
 }
 
-void 
+void
 DumbMainView::activeZoomWidth (gboolean active)
 {
@@ -97 +97 @@
     return m_PageView;
 }
-            
+
+IPreferencesView *
+DumbMainView::getPreferencesView ()
+{
+    return (IPreferencesView *)0;
+}
+
 gchar *
 DumbMainView::openFileDialog (const gchar *lastFolder)
@@ -113 +119 @@
 }
 
+gchar *
+DumbMainView::saveFileDialog (const gchar *lastFolder)
+{
+    // Do nothing.
+    return g_strdup ("");
+}
+
 void
 DumbMainView::sensitiveGoToFirstPage (gboolean sensitive)
@@ -166 +179 @@
 }
 
-void 
+void
 DumbMainView::sensitiveRotateRight (gboolean sensitive)
 {
     m_SensitiveRotateRight = sensitive;
+}
+
+void
+DumbMainView::sensitiveSave (gboolean sensitive)
+{
+}
+
+void
+DumbMainView::sensitiveZoom (gboolean sensitive)
+{
 }
 
@@ -200 +223 @@
 {
     return (const gchar *)m_GoToPageText;
+}
+
+const gchar *
+DumbMainView::getZoomText ()
+{
+    return "";
 }
 
@@ -236 +265 @@
 void
 DumbMainView::setStatusBarText (const gchar *text)
+{
+}
+
+void
+DumbMainView::setZoomText (const gchar *text)
 {
 }

trunk/tests/DumbMainView.h

@@ -36 +36 @@
             IFindView *getFindView (void);
             IPageView *getPageView (void);
+            IPreferencesView *getPreferencesView (void);
+            const gchar *getZoomText (void);
             gchar *openFileDialog (const gchar *lastFolder);
             gchar *promptPasswordDialog (void);
+            char *saveFileDialog (const gchar *lastFolder);
             void sensitiveFind (gboolean sensitive);
             void sensitiveGoToFirstPage (gboolean sensitive);
@@ -48 +51 @@
             void sensitiveRotateLeft (gboolean sensitive);
             void sensitiveRotateRight (gboolean sensitive);
+            void sensitiveSave (gboolean sensitive);
+            void sensitiveZoom (gboolean sensitive);
             void sensitiveZoomIn (gboolean sensitive);
             void sensitiveZoomOut (gboolean sensitive);
@@ -55 +60 @@
             void setCursor (ViewCursor cursorType);
             void setTotalPages (gint pages);
-            void setGoToPageText (const char *text);            
+            void setGoToPageText (const char *text);
             void setTitle (const gchar *title);
             void setOutline (DocumentOutline *outline);
             void setStatusBarText (const gchar *text);
+            void setZoomText (const gchar *text);
             void show (void);
             void showErrorMessage (const gchar *title, const gchar *body);