Tests for XmlRpcValue and XML conversion. (#1216)

ros · Nov 3, 2017 · 06494a7 · 06494a7
1 parent 321e977
commit 06494a7
Show file tree

Hide file tree

Showing 7 changed files with 701 additions and 64 deletions.
diff --git a/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpc.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpc.h
@@ -36,67 +36,4 @@
 
 #include <stdexcept>
 
-namespace XmlRpc {
-
-
-  //! An interface allowing custom handling of error message reporting.
-  class XmlRpcErrorHandler {
-  public:
-    virtual ~XmlRpcErrorHandler() { }
-
-    //! Returns a pointer to the currently installed error handling object.
-    static XmlRpcErrorHandler* getErrorHandler() 
-    { return _errorHandler; }
-
-    //! Specifies the error handler.
-    static void setErrorHandler(XmlRpcErrorHandler* eh)
-    { _errorHandler = eh; }
-
-    //! Report an error. Custom error handlers should define this method.
-    virtual void error(const char* msg) = 0;
-
-  protected:
-    static XmlRpcErrorHandler* _errorHandler;
-  };
-
-  //! An interface allowing custom handling of informational message reporting.
-  class XmlRpcLogHandler {
-  public:
-    virtual ~XmlRpcLogHandler() { }
-
-    //! Returns a pointer to the currently installed message reporting object.
-    static XmlRpcLogHandler* getLogHandler() 
-    { return _logHandler; }
-
-    //! Specifies the message handler.
-    static void setLogHandler(XmlRpcLogHandler* lh)
-    { _logHandler = lh; }
-
-    //! Returns the level of verbosity of informational messages. 0 is no output, 5 is very verbose.
-    static int getVerbosity() 
-    { return _verbosity; }
-
-    //! Specify the level of verbosity of informational messages. 0 is no output, 5 is very verbose.
-    static void setVerbosity(int v) 
-    { _verbosity = v; }
-
-    //! Output a message. Custom error handlers should define this method.
-    virtual void log(int level, const char* msg) = 0;
-
-  protected:
-    static XmlRpcLogHandler* _logHandler;
-    static int _verbosity;
-  };
-
-  //! Returns log message verbosity. This is short for XmlRpcLogHandler::getVerbosity()
-  int getVerbosity();
-  //! Sets log message verbosity. This is short for XmlRpcLogHandler::setVerbosity(level)
-  void setVerbosity(int level);
-
-
-  //! Version identifier
-  extern const char XMLRPC_VERSION[];
-
-} // namespace XmlRpc
-
 #endif // _XMLRPC_H_
diff --git a/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcUtil.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcUtil.h
@@ -25,6 +25,63 @@
 
 namespace XmlRpc {
 
+  //! An interface allowing custom handling of error message reporting.
+  class XmlRpcErrorHandler {
+  public:
+    virtual ~XmlRpcErrorHandler() { }
+
+    //! Returns a pointer to the currently installed error handling object.
+    static XmlRpcErrorHandler* getErrorHandler()
+    { return _errorHandler; }
+
+    //! Specifies the error handler.
+    static void setErrorHandler(XmlRpcErrorHandler* eh)
+    { _errorHandler = eh; }
+
+    //! Report an error. Custom error handlers should define this method.
+    virtual void error(const char* msg) = 0;
+
+  protected:
+    static XmlRpcErrorHandler* _errorHandler;
+  };
+
+  //! An interface allowing custom handling of informational message reporting.
+  class XmlRpcLogHandler {
+  public:
+    virtual ~XmlRpcLogHandler() { }
+
+    //! Returns a pointer to the currently installed message reporting object.
+    static XmlRpcLogHandler* getLogHandler()
+    { return _logHandler; }
+
+    //! Specifies the message handler.
+    static void setLogHandler(XmlRpcLogHandler* lh)
+    { _logHandler = lh; }
+
+    //! Returns the level of verbosity of informational messages. 0 is no output, 5 is very verbose.
+    static int getVerbosity()
+    { return _verbosity; }
+
+    //! Specify the level of verbosity of informational messages. 0 is no output, 5 is very verbose.
+    static void setVerbosity(int v)
+    { _verbosity = v; }
+
+    //! Output a message. Custom error handlers should define this method.
+    virtual void log(int level, const char* msg) = 0;
+
+  protected:
+    static XmlRpcLogHandler* _logHandler;
+    static int _verbosity;
+  };
+
+  //! Returns log message verbosity. This is short for XmlRpcLogHandler::getVerbosity()
+  int getVerbosity();
+  //! Sets log message verbosity. This is short for XmlRpcLogHandler::setVerbosity(level)
+  void setVerbosity(int level);
+
+  //! Version identifier
+  extern const char XMLRPC_VERSION[];
+
   //! Utilities for XML parsing, encoding, and decoding and message handlers.
   class XMLRPCPP_DECL XmlRpcUtil {
   public:

diff --git a/utilities/xmlrpcpp/test/CMakeLists.txt b/utilities/xmlrpcpp/test/CMakeLists.txt
@@ -2,3 +2,12 @@ catkin_add_gtest(xmlrpcvalue_base64 xmlrpcvalue_base64.cpp)
 if(TARGET xmlrpcvalue_base64)
   target_link_libraries(xmlrpcvalue_base64 xmlrpcpp)
 endif()
+
+catkin_add_gtest(TestValues TestValues.cpp)
+target_link_libraries(TestValues xmlrpcpp)
+
+catkin_add_gtest(test_util test_util.cpp)
+target_link_libraries(test_util xmlrpcpp)
+
+catkin_add_gtest(TestXml TestXml.cpp)
+target_link_libraries(TestXml xmlrpcpp)