Changeset 98

Timestamp:

04/20/06 11:13:01 (2 years ago)

Author:

jordi

Message:

Divided the pageZoom function from the MainPter? test to ZoomInAndOut?, ZoomWidth? and ZoomFit?, because I'm planning to make ZoomToWith? and ZoomToHeigh? toggle action that deserved separate test cases.

Also added the ZoomToFit? and ZoomToWidth? options to the configuration class. Also the test case was added.

Location:

trunk

Files:

• src/Config.cxx (modified) (5 diffs)
• src/Config.h (modified) (2 diffs)
• tests/ConfigTest.cxx (modified) (2 diffs)
• tests/ConfigTest.h (modified) (2 diffs)
• tests/MainPterTest.cxx (modified) (4 diffs)
• tests/MainPterTest.h (modified) (2 diffs)

trunk/src/Config.cxx

@@ -28 +28 @@
 static gint DEFAULT_WINDOW_X = 0;
 static gint DEFAULT_WINDOW_Y = 0;
+static gboolean DEFAULT_ZOOM_TO_FIT = FALSE;
+static gboolean DEFAULT_ZOOM_TO_WIDTH = FALSE;
 
 // Static member attributes.
@@ -105 +107 @@
 
 ///
-/// @brief Gets an integer configuration option.
+/// @brief Gets a boolean configuration option.
 ///
 /// @param group Configuration group where the key belongs.
@@ -114 +116 @@
 ///         doesn't exists.
 ///
-gint
-Config::getInteger (const gchar *group, const gchar *key, gint defaultValue)
-{
-    gint value = defaultValue;
+gboolean
+Config::getBoolean (const gchar *group, const gchar *key, gboolean defaultValue)
+{
+    gboolean value = defaultValue;
 
     if ( g_key_file_has_key (m_Values, group, key, NULL) )
     {
         GError *error = NULL;
-        gint savedValue = g_key_file_get_integer (m_Values, group, key, &error);
+        gboolean savedValue = 
+            g_key_file_get_boolean (m_Values, group, key, &error);
         if ( NULL == error )
         {
@@ -139 +142 @@
 
 ///
+/// @brief Gets an integer configuration option.
+///
+/// @param group Configuration group where the key belongs.
+/// @param key The key name to retrieve its value.
+/// @param defaultValue The default value to return if @a key doesn't exists.
+///
+/// @return The value of the @a key in @a group or @a defaultValue if @a key
+///         doesn't exists.
+///
+gint
+Config::getInteger (const gchar *group, const gchar *key, gint defaultValue)
+{
+    gint value = defaultValue;
+
+    if ( g_key_file_has_key (m_Values, group, key, NULL) )
+    {
+        GError *error = NULL;
+        gint savedValue = g_key_file_get_integer (m_Values, group, key, &error);
+        if ( NULL == error )
+        {
+            value = savedValue;
+        }
+        else
+        {
+            g_warning ("Error reading key '%s' from group '%s': %s\n", 
+                       key, group, error->message);
+            g_error_free (error);
+        }        
+    }
+
+    return value;
+}
+
+///
 /// @brief Gets an string configuration option.
 ///
@@ -299 +336 @@
     g_key_file_set_integer (m_Values, "main window", "x", x);
     g_key_file_set_integer (m_Values, "main window", "y", y);
+}
+
+///
+/// @brief Sets the zoom to fit option.
+///
+/// @param activate Set to TRUE to activate the zoom to fit option. FALSE
+///        otherwise.
+///
+void
+Config::setZoomToFit (gboolean activate)
+{
+    g_key_file_set_boolean (m_Values, "main window", "zoomToFit", activate);
+    g_key_file_set_boolean (m_Values, "main window", "zoomToWidth", 
+            !activate && zoomToWidth ());
+}
+
+///
+/// @brief Sets the zoom to with option.
+///
+/// @param activate Set to TRUE to activate the zoom to width option. FALSE
+///        otherwise.
+///
+void
+Config::setZoomToWidth (gboolean activate)
+{
+    g_key_file_set_boolean (m_Values, "main window", "zoomToFit", 
+            !activate && zoomToFit ());
+    g_key_file_set_boolean (m_Values, "main window", "zoomToWidth", activate);
+}
+
+///
+/// @brief Gets the zoom to fit option.
+///
+/// @return TRUE if the zoom to fit option is activated. FALSE otherwise.
+///
+gboolean
+Config::zoomToFit ()
+{
+    return getBoolean ("main window", "zoomToFit", DEFAULT_ZOOM_TO_FIT);
+}
+
+///
+/// @brief Gets the zoom to width option.
+///
+/// @return TRUE if the zoom to width option is activated. FALSE otherwise.
+///
+gboolean
+Config::zoomToWidth ()
+{
+    return getBoolean ("main window", "zoomToWidth", DEFAULT_ZOOM_TO_WIDTH);
 }
 

trunk/src/Config.h

@@ -44 +44 @@
             gint getWindowX (void);
             gint getWindowY (void);
+            gboolean zoomToFit (void);
+            gboolean zoomToWidth (void);
             void save(void);
             void setOpenFileFolder (const gchar *folder);
             void setWindowSize (gint width, gint height);
             void setWindowPos (gint x, gint y);
+            void setZoomToFit (gboolean active);
+            void setZoomToWidth (gboolean active);
             
         protected:
@@ -58 +62 @@
             static gboolean m_LoadFile;
 
+            gboolean getBoolean (const gchar *group, const char *key,
+                                 gboolean defaultValue);
             gint getInteger (const gchar *group, const char *key, 
                              gint defaultValue);

trunk/tests/ConfigTest.cxx

@@ -58 +58 @@
     CPPUNIT_ASSERT_EQUAL (650, config.getWindowHeight ());
     CPPUNIT_ASSERT_EQUAL ((gchar *)NULL, config.getOpenFileFolder ());
+    CPPUNIT_ASSERT ( !config.zoomToWidth () );
+    CPPUNIT_ASSERT ( !config.zoomToFit () );
 }
 
@@ -90 +92 @@
     g_free (openFolder);
 }
+
+///
+/// @brief Check setting the zoom values.
+///
+/// Especially check that zoomToWidth() and zoomToFit() can't be
+/// set both to true.
+///
+void
+ConfigTest::zoomValues ()
+{
+    Config &config = Config::getConfig ();
+    
+    config.setZoomToFit (TRUE);
+    CPPUNIT_ASSERT ( !config.zoomToWidth () );
+    CPPUNIT_ASSERT ( config.zoomToFit () );
+    config.setZoomToFit (FALSE);
+    CPPUNIT_ASSERT ( !config.zoomToWidth () );
+    CPPUNIT_ASSERT ( !config.zoomToFit () );
+    config.setZoomToWidth (TRUE);
+    CPPUNIT_ASSERT ( config.zoomToWidth () );
+    CPPUNIT_ASSERT ( !config.zoomToFit () );
+    config.setZoomToWidth (FALSE);
+    CPPUNIT_ASSERT ( !config.zoomToWidth () );
+    CPPUNIT_ASSERT ( !config.zoomToFit () );
+    config.setZoomToFit (TRUE);
+    CPPUNIT_ASSERT ( !config.zoomToWidth () );
+    CPPUNIT_ASSERT ( config.zoomToFit () );
+    config.setZoomToWidth (TRUE);
+    CPPUNIT_ASSERT ( config.zoomToWidth () );
+    CPPUNIT_ASSERT ( !config.zoomToFit () );
+    config.setZoomToFit (TRUE);
+    CPPUNIT_ASSERT ( !config.zoomToWidth () );
+    CPPUNIT_ASSERT ( config.zoomToFit () );
+    config.setZoomToFit (FALSE);
+    CPPUNIT_ASSERT ( !config.zoomToWidth () );
+    CPPUNIT_ASSERT ( !config.zoomToFit () );
+}

trunk/tests/ConfigTest.h

@@ -29 +29 @@
         CPPUNIT_TEST (windowValues);
         CPPUNIT_TEST (currentFolder);
+        CPPUNIT_TEST (zoomValues);
         CPPUNIT_TEST_SUITE_END ();
 
@@ -38 +39 @@
             void windowValues (void);
             void currentFolder (void);
+            void zoomValues (void);
     };
 }

trunk/tests/MainPterTest.cxx

@@ -513 +513 @@
 /// ZoomIn insensitives the ZoomIn button. The same for the ZoomOut.
 ///
-/// Then will test Zoom Fit and Zoom Width with two different rotations.
-///
-void
-MainPterTest::pageZoom ()
+///
+void
+MainPterTest::pageZoomInAndOut ()
 {
     m_View->setOpenFileName ("/tmp/test.pdf");
@@ -549 +548 @@
     CPPUNIT_ASSERT (m_View->isSensitiveZoomIn ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomOut ());
+}
+
+///
+/// @brief Tests page's zoom to width
+///
+void
+MainPterTest::pageZoomWidth ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
 
     // OK, now try to zoom width. Since rotation is 0
+    // the zoom level should be 75/100 = 0.75
+    m_MainPter->zoomWidthActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75, m_Document->getZoom (), 0.0001);
+
+    // Now rotate and try again.
+    m_MainPter->rotateRightActivated (); 
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ());
+    
+    // Since rotation is now 90 the zoom level should be 75/250 = 0.3
+    m_MainPter->zoomWidthActivated ();
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+}
+
+///
+/// @brief Tests page's zoom to fit
+///
+void
+MainPterTest::pageZoomFit ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
+
+    // OK, now try to zoom to fit. Since rotation is 0
     // the zoom level should be 50/250 = 0.2
     m_MainPter->zoomFitActivated ();
@@ -556 +598 @@
     CPPUNIT_ASSERT (!m_View->hasImagePageView ());
     CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
-    // For the width it should be 75/100 = 0.75
-    m_MainPter->zoomWidthActivated ();
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75, m_Document->getZoom (), 0.0001);
 
     // Now rotate and try again.
@@ -571 +608 @@
     CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    // For the width it should be 75/250 = 0.3 also.
-    m_MainPter->zoomWidthActivated ();
-    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-}
+}
+
 
 ///

trunk/tests/MainPterTest.h

@@ -37 +37 @@
         CPPUNIT_TEST (pageNavigationEntry);
         CPPUNIT_TEST (pageRotate);
-        CPPUNIT_TEST (pageZoom);
+        CPPUNIT_TEST (pageZoomInAndOut);
+        CPPUNIT_TEST (pageZoomWidth);
+        CPPUNIT_TEST (pageZoomFit);
         CPPUNIT_TEST (reloadNormal);
         CPPUNIT_TEST (reloadEncrypted);
@@ -59 +61 @@
             void pageNavigationEntry (void);
             void pageRotate (void);
-            void pageZoom (void);
+            void pageZoomInAndOut (void);
+            void pageZoomWidth (void);
+            void pageZoomFit (void);
             void reloadNormal (void);
             void reloadEncrypted (void);