Changeset 544

Timestamp:

08/18/09 08:34:25 (15 years ago)

Author:

vbarta

Message:

corrected dynamic memory handling in UI::from_setting, more UIException tests

Location:

library

Files:

• bdm/base/user_info.h (modified) (2 diffs)
• tests/erroneous.cfg (added)
• tests/user_info_test.cpp (modified) (6 diffs)

library/bdm/base/user_info.h

@@ -331 +331 @@
                 try {
                         instance->from_setting ( link.result );
-                } catch ( SettingException sttng_xcptn ) {
+                } catch ( SettingException &sttng_xcptn ) {
+                        delete instance;
+                        instance = 0;
                         string msg = "UIException: method ";
                         msg += class_name;
                         msg += ".from_setting(Setting&) has thrown a SettingException.";
                         throw UISettingException(msg, sttng_xcptn.getPath());
+                } catch (...) {
+                        delete instance;
+                        instance = 0;
+                        throw;
                 }
         }
@@ -521 +527 @@
                 try {
                         instance->to_setting ( set );
-                } catch ( SettingException sttng_xcptn ) {
+                } catch ( SettingException &sttng_xcptn ) {
                         string msg = "UIException: method ";
                         msg += class_name;

library/tests/user_info_test.cpp

@@ -1 +1 @@
 #include <string>
+#include <vector>
 #include <string.h>
 #include "base/user_info.h"
@@ -76 +77 @@
         string manufacturer;
 
-        Transport() {
-                year = 1900;
-                manufacturer = "unknown";
-        }
-
-        Transport ( int year, string manufacturer )
-                        : year ( year ), manufacturer ( manufacturer ) {
+        Transport() : year( 1900 ), manufacturer( "unknown" ) {
+        }
+
+        Transport ( int year, string manufacturer ) :
+                year ( year ), manufacturer ( manufacturer ) {
         }
 
@@ -189 +188 @@
 UIREGISTER ( Bike );
 
+class Teleport : public Transport {
+public:
+        void to_setting ( Setting &set ) const {
+                set.add ( "this throws", Setting::TypeNone );
+        }
+};
+
+UIREGISTER ( Teleport );
+
 TEST ( test_load ) {
         UIFile in ( "test_user_info_input.cfg" );
@@ -205 +213 @@
         shared_ptr<Transport> kati ( UI::build<Transport> ( in, "kati", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1980 by vecernicek, having 250000 kilometers on the clock." ), kati->to_string() );
+}
+
+TEST ( test_load_error ) {
+        UIFile in ( "test_user_info_input.cfg" );
+
+        try {
+                shared_ptr<Robot> failing ( UI::build<Robot> ( in, "elisky", UI::compulsory ) );
+                CHECK ( false );
+        } catch ( UIClassException &exc ) {
+                CHECK ( exc.what() );
+        }
 
         try {
@@ -210 +229 @@
                 CHECK ( false );
         } catch ( UIException &exc ) {
+                CHECK ( exc.what() );
+        }
+
+        UIFile erroneous ( "erroneous.cfg" );
+        try {
+                shared_ptr<Transport> jardovo ( UI::build<Transport> ( erroneous, "jardovo", UI::compulsory ) );
+                CHECK ( false );
+        } catch ( UISettingException &exc ) {
                 CHECK ( exc.what() );
         }
@@ -233 +260 @@
         CHECK_EQUAL ( expected, actual );
 }
+
+TEST ( test_save_error ) {
+        UIFile out;
+
+        Teleport teleport;
+        try {
+                UI::save ( &teleport, out, "unsaveable" );
+                CHECK ( false );
+        } catch ( UIException &exc ) {
+                CHECK ( exc.what() );
+        }
+}