Changeset 527 for library/tests/user_info_test.cpp

Timestamp:

08/13/09 15:58:32 (15 years ago)

Author:

vbarta

Message:

using shared_ptr in UI (optionally so far; loading & saving Array<T *> still works but should be phased out); testsuite run leaks down from 8822 to 480 bytes

Files:

• library/tests/user_info_test.cpp (modified) (5 diffs)

library/tests/user_info_test.cpp

@@ -1 @@
-#include <memory>
 #include <string>
 #include <string.h>
@@ -103 +102 @@
 public:
         int kilometers;
-        Array<Passenger*> passengers;
+        Array<shared_ptr<Passenger> > passengers;
 
         Car() : Transport() {
@@ -192 +191 @@
 TEST ( test_load ) {
         UIFile in ( "test_user_info_input.cfg" );
-        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
+        shared_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", UI::compulsory ) );
+        shared_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", UI::compulsory ) );
+        shared_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", UI::compulsory ) );
+        shared_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", UI::compulsory ) );
+        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() );
 }
@@ -210 +209 @@
 TEST ( test_save ) {
         UIFile in ( "test_user_info_input.cfg" );
-        auto_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
+        shared_ptr<Transport> pepikovo ( UI::build<Transport> ( in, "pepikovo", UI::compulsory ) );
 
         Car audi ( 1968, "zyl", 200 );
@@ -220 +219 @@
         UI::save ( &liaz, out, "bohousovo" );
         UI::save ( &author, out, "karlovo" );
-        UI::save ( pepikovo.get(), out, "pepikovo" );
+        UI::save ( pepikovo, out, "pepikovo" );
         out.save ( "testUI_out.cfg" );