Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
Cleaned-up unit_tests AGAIN (removed duplicate entries).

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033

Cleaned-up unit_tests AGAIN (removed duplicate entries).
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/unit_tests/unit_test_list.h'
--- src/unit_tests/unit_test_list.h	2013-01-24 02:27:45 +0000
+++ src/unit_tests/unit_test_list.h	2013-01-25 21:40:28 +0000
@@ -29,22 +29,18 @@
   int runDebuggerProtocolTest(int argc, char* argv[]);
 
   int test_base64( int, char*[] );
-
   int test_base64_streambuf( int, char*[] );
-
   int test_fs_iterator( int, char*[] );
+  int test_hashmaps( int argc, char* argv[] );
 
 #ifndef ZORBA_NO_ICU
   int test_icu_streambuf( int, char*[] );
 #endif /* ZORBA_NO_ICU */
 
   int test_json_parser( int, char*[] );
-
   int test_string( int, char*[] );
   int test_time_parse( int, char*[] );
 
-  int test_unique_ptr( int, char*[] );
-
 #ifdef ZORBA_WITH_FILE_ACCESS
   int test_fs_iterator( int, char*[] );
 #endif /* ZORBA_WITH_FILE_ACCESS */
@@ -59,8 +55,6 @@
   int test_unique_ptr( int, char*[] );
 #endif /* ZORBA_HAVE_UNIQUE_PTR */
 
-  int test_uuid( int, char*[] );
-
 #ifndef ZORBA_HAVE_UNORDERED_MAP
   int test_unordered_map( int, char*[] );
 #endif /* ZORBA_HAVE_UNORDERED_MAP */
@@ -69,7 +63,7 @@
   int test_unordered_set( int, char*[] );
 #endif /* ZORBA_HAVE_UNORDERED_SET */
 
-  int test_hashmaps(int argc, char* argv[]);
+  int test_uuid( int, char*[] );
 
   void initializeTestList();
 

=== modified file 'src/unit_tests/unit_tests.cpp'
--- src/unit_tests/unit_tests.cpp	2013-01-24 02:27:45 +0000
+++ src/unit_tests/unit_tests.cpp	2013-01-25 21:40:28 +0000
@@ -38,19 +38,19 @@
 void initializeTestList() 
 {
   libunittests["base64"] = test_base64;
-
   libunittests["base64_streambuf"] = test_base64_streambuf;
 
 #ifdef ZORBA_WITH_FILE_ACCESS
   libunittests["fs_iterator"] = test_fs_iterator;
 #endif /* ZORBA_WITH_FILE_ACCESS */
 
+  libunittests["hashmaps"] = test_hashmaps;
+
 #ifndef ZORBA_NO_ICU
   libunittests["icu_streambuf"] = test_icu_streambuf;
 #endif /* ZORBA_NO_ICU */
 
   libunittests["json_parser"] = test_json_parser;
-
   libunittests["string"] = test_string;
   libunittests["time_parse"] = test_time_parse;
 
@@ -74,8 +74,6 @@
   libunittests["unordered_set"] = test_unordered_set;
 #endif /* ZORBA_HAVE_UNORDERED_SET */
 
-  libunittests["hashmaps"] = test_hashmaps;
-
   libunittests["uri"] = runUriTest;
 
 #ifdef ZORBA_WITH_DEBUGGER

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to