[glom] Tests: Correct the return values.



commit fd8cac06b00b9b4b89ffeaf4c312957851a1ca40
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Aug 26 17:34:49 2009 +0200

    Tests: Correct the return values.
    
    * regression_tests/test_parsing_time.cc:
    * regression_tests/test_signal_reemit.cc: Return EXIT_SUCCESS or
    EXIT_FAILURE properly.

 ChangeLog                              |   10 +++++++++-
 regression_tests/test_parsing_time.cc  |   10 +++++-----
 regression_tests/test_signal_reemit.cc |   15 +++++++++++++--
 3 files changed, 27 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1876d81..74e6707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2009-08-26  Murray Cumming  <murrayc murrayc-desktop>
+2009-08-26  Murray Cumming  <murrayc murrayc com>
+
+	Tests: Correct the return values.
+
+	* regression_tests/test_parsing_time.cc:
+	* regression_tests/test_signal_reemit.cc: Return EXIT_SUCCESS or 
+	EXIT_FAILURE properly.
+
+2009-08-26  Murray Cumming  <murrayc murrayc com>
 
 	* glom/base_db.cc: remove_quotes(): Implement this simply, just removing 
 	start and end quotes. However, I do not think this should be 
diff --git a/regression_tests/test_parsing_time.cc b/regression_tests/test_parsing_time.cc
index 5b75bc1..19cd743 100644
--- a/regression_tests/test_parsing_time.cc
+++ b/regression_tests/test_parsing_time.cc
@@ -14,7 +14,7 @@ int main()
   if(!success)
   {
     std::cerr << "Failed: parse_value() failed." << std::endl;
-    return -1; //Failed.
+    return EXIT_FAILURE;
   }
 
   const Gnome::Gda::Time parsed_time = value.get_time();
@@ -29,7 +29,7 @@ int main()
   if(parsed_time.minute != 0)
   {
     std::cerr << "Failed: The parsed minute was " <<  parsed_time.minute << "instead of 0" << std::endl;
-    return -1; //Failed.
+    return EXIT_FAILURE;
   }
 
   const Glib::ustring time_text_parsed = 
@@ -37,11 +37,11 @@ int main()
 
 
   std::cout << "time_text_parsed=" << time_text_parsed << std::endl;
-  return 0; //Success.
+  return EXIT_SUCCESS;
 
   //This extra check would fail if :00 seconds are added to the text:
   //if(time_text_input == time_text_parsed)
-  //   return 0; //Success.
+  //   return EXIT_SUCCESS;
   //else
-  //   return -1; //Failed.
+  //   return EXIT_FAILURE;
 }
diff --git a/regression_tests/test_signal_reemit.cc b/regression_tests/test_signal_reemit.cc
index d424936..25ee5b2 100644
--- a/regression_tests/test_signal_reemit.cc
+++ b/regression_tests/test_signal_reemit.cc
@@ -1,14 +1,20 @@
 #include <glom/signal_reemitter.h>
 #include <iostream>
+#include <stdlib.h>
+
+bool success_reemit_void = false;
+bool success_reemit_int = false;
 
 void on_reemit_void()
 {
-  std::cout << "Success: signal_to_reemit_void was emitted when signal_first_emit was emitted." << std::endl;
+  //std::cout << "Success: signal_to_reemit_void was emitted when signal_first_emit was emitted." << std::endl;
+  success_reemit_void = true;
 }
 
 void on_reemit_int(int param)
 {
-  std::cout << "Success: signal_to_reemit_int was emitted when signal_first_emit was emitted. param=" << param << std::endl;
+  //std::cout << "Success: signal_to_reemit_int was emitted when signal_first_emit was emitted. param=" << param << std::endl;
+  success_reemit_int = true;
 }
 
 int main()
@@ -32,4 +38,9 @@ int main()
 
     signal_first_emit.emit(1);
   }
+
+  if(success_reemit_void && success_reemit_int)
+    return EXIT_SUCCESS;
+  else
+    return EXIT_FAILURE;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]