Changeset 480 for library/tests/test_user_info.cpp

Timestamp:

08/06/09 07:49:38 (15 years ago)

Author:

vbarta

Message:

fixed tests for new UI::get & UI::build

Files:

• library/tests/test_user_info.cpp (modified) (3 diffs)

library/tests/test_user_info.cpp

@@ -163 +163 @@
                 Transport::from_setting ( set );
 
-                UI::get ( electricLights, set, "electricLights" );
+                int elights;
+                if ( UI::get ( elights, set, "electricLights", UI::optional ) ) {
+                    electricLights = !!elights;
+                }
 
                 UI::get ( matr, set, "matr" );
@@ -189 +192 @@
 TEST ( test_load ) {
         UIFile in ( "test_user_info_input.cfg" );
-        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo" ) );
+        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1998 by audi, having 25000 kilometers on the clock.The names of passengers are as follows: Karlos Novak -1_CygWin_Matlab_Aimsun Karlosik Novacek " ), pepikovo->to_string() );
 
-        auto_ptr<Transport> jardovo ( UI::build<Transport> ( in, "jardovo" ) );
+        auto_ptr<Transport> jardovo ( UI::build<Transport> ( in, "jardovo", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1992 by liaz, having 1555000 kilometers on the clock." ), jardovo->to_string() );
 
-        auto_ptr<Transport> ondrejovo ( UI::build<Transport> ( in, "ondrejovo" ) );
+        auto_ptr<Transport> ondrejovo ( UI::build<Transport> ( in, "ondrejovo", UI::compulsory ) );
         CHECK_EQUAL ( string ( "a bike made in 1996 by author with electric lights included" ), ondrejovo->to_string() );
 
-        auto_ptr<Transport> elisky ( UI::build<Transport> ( in, "elisky" ) );
+        auto_ptr<Transport> elisky ( UI::build<Transport> ( in, "elisky", UI::compulsory ) );
         CHECK_EQUAL ( string ( "A car made in 1992 by liaz, having 1555000 kilometers on the clock." ), elisky->to_string() );
 
-        auto_ptr<Transport> kati ( UI::build<Transport> ( in, "kati" ) );
+        auto_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() );
 }
@@ -207 +210 @@
 TEST ( test_save ) {
         UIFile in ( "test_user_info_input.cfg" );
-        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo" ) );
+        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
 
         Car audi ( 1968, "zyl", 200 );