Unit tests can now use nested try blocks

Jean-Baptiste CAYROU
1 parent 60dc7bc1
Showing 6 changed files with 86 additions and 10 deletions
include/GException.hpp
include/GTestSuite.hpp
src/test/GException_test.cpp
src/test/GTestSuite.cpp
src/test/GTestSuites.cpp
src/test/Makefile.am
@@ -660,6 +660,12 @@ public:
                         std::string message = "");
     };
  
+    // Test exceptions
+    class test_nested_try_error : public GExceptionHandler {
+        public:
+            test_nested_try_error(std::string origin, std::string message = "");
+    };
+
 };
  
 #endif /* GEXCEPTION_HPP */
@@ -88,6 +88,7 @@ class GTestSuite{
     // Private members
     private:
         std::vector<GTestCase*> m_tests;    //!< Nomber of tests
+        std::vector<GTestCase*> m_stack_try; //!< Stack for nested try blocks
         int                     m_failures; //!< Nomber of failures
         int                     m_errors;   //!< Nomber of errors
         std::string             m_name;     //!< Name of the test suite
+/***************************************************************************
+ *               GException_test.cpp  -  Unit Test exception handlers      *
+ * ----------------------------------------------------------------------- *
+ *  copyright (C) 2012 by Jean-Baptiste Cayrou                             *
+ * ----------------------------------------------------------------------- *
+ *                                                                         *
+ *  This program is free software: you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation, either version 3 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *  You should have received a copy of the GNU General Public License      *
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ *                                                                         *
+ ***************************************************************************/
+/**
+ * @file GException_test.cpp
+ * @brief Implement exceptions for unit test module
+ * @author Jean-Baptiste Cayrou
+ */
+
+/* __ Includes ___________________________________________________________ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "GException.hpp"
+#include "GTools.hpp"
+
+
+/***********************************************************************//**
+ * @brief Test nested try error
+ * @param[in] message Optional error message.
+ ***************************************************************************/
+GException::test_nested_try_error::test_nested_try_error(std::string origin, std::string message)
+{
+    // Set origin and message
+    m_origin  = origin;
+    m_message = "Nested try error ("+message+")";
+
+    // Return
+    return;
+}
@@ -34,6 +34,8 @@
  
 /* __ Method name definitions ____________________________________________ */
 #define G_OP_ACCESS                         "GTestSuite::operator[](int&)"
+#define G_TRY_SUCCESS                       "GTestSuite::test_try_success()"
+#define G_TRY_FAILURE                       "GTestSuite::test_try_failure(std::string&,std::string&)"
  
 /* __ Macros _____________________________________________________________ */
  
@@ -299,7 +301,7 @@ void GTestSuite::test_try(const std::string&amp; name)
     GTestCase* testcase = new GTestCase(GTestCase::ERROR_TEST,name);
  
     //Add test case to container
-    m_tests.push_back(testcase);
+    m_stack_try.push_back(testcase);
  
     // Return
     return;
@@ -326,6 +328,16 @@ void GTestSuite::test_try(const std::string&amp; name)
  *
  ***************************************************************************/
 void GTestSuite::test_try_success(){
+    // If the stack is empty
+    if(m_stack_try.size()==0)
+        throw GException::test_nested_try_error(G_TRY_SUCCESS, "Error : test_try_success() without test_try()");
+    
+    // Add the test in the container
+    m_tests.push_back(m_stack_try.back());
+    
+    // Delete the test case of the stack
+    m_stack_try.pop_back();
+    
     // The try block test is ok
     m_log<<m_tests.back()->print_result();
  
@@ -358,21 +370,30 @@ void GTestSuite::test_try_success(){
  *
  ***************************************************************************/
 void GTestSuite::test_try_failure(const std::string& message, const std::string& type){
+    // If the stack is empty
+    if(m_stack_try.size()==0)
+        throw GException::test_nested_try_error(G_TRY_FAILURE,"test_try_success() call without test_try()");
+
     // Test is not ok
-    m_tests.back()->m_passed=false;
-    
+    m_stack_try.back()->m_passed=false;
+
     // Increment the number of errors
     m_errors++;
-    
+
     // Set a message
-    m_tests.back()->message(message);
- 
+    m_stack_try.back()->message(message);
+
     // Set a type of message
-    m_tests.back()->message_type(type);
+    m_stack_try.back()->message_type(type);
+
+    // Add the test in the container
+    m_tests.push_back(m_stack_try.back());
  
+    // Delete the test case of the stack
+    m_stack_try.pop_back();
+
     // Show the result ( ".","F" or, "E")
     m_log<<m_tests.back()->print_result();
-    
     //Return
     return;
 }
@@ -367,7 +367,7 @@ void GTestSuites::write(GXml&amp; xml)
         element_testsuite->attribute("skipped","");  // not used
         element_testsuite->attribute("tests",str(testsuite->tests()));
         element_testsuite->attribute("time","0");  // not used
-        element_testsuite->attribute("timestamp",str(testsuite->timestamp()));
+        element_testsuite->attribute("timestamp",str(testsuite->timestamp())); //FIXME timestamp does not work
  
         //Loop over all test cases contains in the test suite
         for (int j=0; j<testsuite->tests(); ++j)
@@ -8,7 +8,8 @@ INCLUDES = -I$(top_srcdir)/include \
 # Define sources for this directory
 sources = GTestCase.cpp \
 	  GTestSuite.cpp \
-	  GTestSuites.cpp
+	  GTestSuites.cpp \
+	  GException_test.cpp
  
 # Build libtool library
 noinst_LTLIBRARIES = libtest.la