Use XmlParser for XML-RPC.

3 files changed, 190 insertions, 176 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index a078ce95..b0bcab2d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -79,11 +79,11 @@ aria2c_SOURCES = AllTest.cc\
 	BufferedFileTest.cc\
 	GeomStreamPieceSelectorTest.cc\
 	SegListTest.cc\
-	ParamedStringTest.cc
+	ParamedStringTest.cc\
+	RpcHelperTest.cc
 
 if ENABLE_XML_RPC
-aria2c_SOURCES += XmlRpcRequestParserControllerTest.cc\
-	XmlRpcRequestProcessorTest.cc
+aria2c_SOURCES += XmlRpcRequestParserControllerTest.cc
 endif # ENABLE_XML_RPC
 
 if HAVE_SOME_FALLOCATE
diff --git a/test/RpcHelperTest.cc b/test/RpcHelperTest.cc
new file mode 100644
index 00000000..8f04c434
--- /dev/null
+++ b/test/RpcHelperTest.cc
@@ -0,0 +1,187 @@
+#include "rpc_helper.h"
+
+#include <cppunit/extensions/HelperMacros.h>
+
+#include "RpcRequest.h"
+#include "RecoverableException.h"
+#ifdef ENABLE_XML_RPC
+# include "XmlRpcRequestParserStateMachine.h"
+#endif // ENABLE_XML_RPC
+
+namespace aria2 {
+
+namespace rpc {
+
+class RpcHelperTest:public CppUnit::TestFixture {
+
+  CPPUNIT_TEST_SUITE(RpcHelperTest);
+#ifdef ENABLE_XML_RPC
+  CPPUNIT_TEST(testParseMemory);
+  CPPUNIT_TEST(testParseMemory_shouldFail);
+  CPPUNIT_TEST(testParseMemory_withoutStringTag);
+#endif // ENABLE_XML_RPC
+  CPPUNIT_TEST_SUITE_END();
+public:
+  void setUp() {}
+
+  void tearDown() {}
+
+#ifdef ENABLE_XML_RPC
+  void testParseMemory();
+  void testParseMemory_shouldFail();
+  void testParseMemory_withoutStringTag();
+#endif // ENABLE_XML_RPC
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(RpcHelperTest);
+
+#ifdef ENABLE_XML_RPC
+
+void RpcHelperTest::testParseMemory()
+{
+  std::string s =
+    "<?xml version=\"1.0\"?>"
+    "<methodCall>"
+    "  <methodName>aria2.addURI</methodName>"
+    "    <params>"
+    "      <param>"
+    "        <value><i4>100</i4></value>"
+    "      </param>"
+    "      <param>"
+    "       <value>"
+    "         <struct>"
+    "           <member>"
+    "             <name>max-count</name>"
+    "             <value><i4>65535</i4></value>"
+    "           </member>"
+    "           <member>"
+    "             <name>seed-ratio</name>"
+    "             <value><double>0.99</double></value>"
+    "           </member>"
+    "         </struct>"
+    "       </value>"
+    "     </param>"
+    "     <param>"
+    "       <value>"
+    "         <array>"
+    "           <data>"
+    "             <value><string>pudding</string></value>"
+    "             <value><base64>aGVsbG8gd29ybGQ=</base64></value>"
+    "           </data>"                    
+    "         </array>"
+    "       </value>"
+    "     </param>"
+    "   </params>"
+    "</methodCall>";
+  RpcRequest req = xmlParseMemory(s.c_str(), s.size());
+
+  CPPUNIT_ASSERT_EQUAL(std::string("aria2.addURI"), req.methodName);
+  CPPUNIT_ASSERT_EQUAL((size_t)3, req.params->size());
+  CPPUNIT_ASSERT_EQUAL((Integer::ValueType)100,
+                       downcast<Integer>(req.params->get(0))->i());
+  const Dict* dict = downcast<Dict>(req.params->get(1));
+  CPPUNIT_ASSERT_EQUAL((Integer::ValueType)65535,
+                       downcast<Integer>(dict->get("max-count"))->i());
+  // Current implementation handles double as string.
+  CPPUNIT_ASSERT_EQUAL(std::string("0.99"),
+                       downcast<String>(dict->get("seed-ratio"))->s());
+  const List* list = downcast<List>(req.params->get(2));
+  CPPUNIT_ASSERT_EQUAL(std::string("pudding"), downcast<String>(list->get(0))->s());
+  CPPUNIT_ASSERT_EQUAL(std::string("hello world"), downcast<String>(list->get(1))->s());
+}
+
+void RpcHelperTest::testParseMemory_shouldFail()
+{
+  try {
+    std::string s =
+      "<methodCall>"
+      "  <methodName>aria2.addURI</methodName>"
+      "    <params>"
+      "      <param>"
+      "        <value><i4>100</i4></value>"
+      "      </param>";
+    xmlParseMemory(s.c_str(), s.size());
+    CPPUNIT_FAIL("exception must be thrown.");
+  } catch(RecoverableException& e) {
+    // success
+  }
+  {
+    std::string s =
+      "<methodCall>"
+      "  <methodName>aria2.addURI</methodName>"
+      "    <params>"
+      "    </params>"
+      "</methodCall>";
+    RpcRequest req = xmlParseMemory(s.c_str(), s.size());
+    CPPUNIT_ASSERT(req.params);
+  }
+  try {
+    std::string s =
+      "<methodCall>"
+      "  <methodName>aria2.addURI</methodName>"
+      "</methodCall>";
+    xmlParseMemory(s.c_str(), s.size());
+    CPPUNIT_FAIL("exception must be thrown.");
+  } catch(RecoverableException& e) {
+    // success
+  }
+}
+
+void RpcHelperTest::testParseMemory_withoutStringTag()
+{
+  std::string s =
+    "<?xml version=\"1.0\"?>"
+    "<methodCall>"
+    "  <methodName>aria2.addUri</methodName>"
+    "    <params>"
+    "      <param>"
+    "        <value>http://aria2.sourceforge.net</value>"
+    "      </param>"
+    "      <param>"
+    "        <value>http://aria2.<foo/>sourceforge.net</value>"
+    "      </param>"
+    "      <param>"
+    "       <value>"
+    "         <struct>"
+    "           <member>"
+    "             <name>hello</name>"
+    "             <value>world</value>"
+    "           </member>"
+    "         </struct>"
+    "       </value>"
+    "     </param>"
+    "     <param>"
+    "       <value>"
+    "         <array>"
+    "           <data>"
+    "             <value>apple</value>"
+    "             <value>banana</value>"
+    "             <value><string>lemon</string>peanuts</value>"
+    "           </data>"
+    "         </array>"
+    "       </value>"
+    "     </param>"
+    "   </params>"
+    "</methodCall>";
+  RpcRequest req =
+    xmlParseMemory(s.c_str(), s.size());
+
+  CPPUNIT_ASSERT_EQUAL((size_t)4, req.params->size());
+  CPPUNIT_ASSERT_EQUAL(std::string("http://aria2.sourceforge.net"),
+                       downcast<String>(req.params->get(0))->s());
+  CPPUNIT_ASSERT_EQUAL(std::string("http://aria2.sourceforge.net"),
+                       downcast<String>(req.params->get(1))->s());
+  const Dict* dict = downcast<Dict>(req.params->get(2));
+  CPPUNIT_ASSERT_EQUAL(std::string("world"),
+                       downcast<String>(dict->get("hello"))->s());
+  const List* list = downcast<List>(req.params->get(3));
+  CPPUNIT_ASSERT_EQUAL(std::string("apple"), downcast<String>(list->get(0))->s());
+  CPPUNIT_ASSERT_EQUAL(std::string("banana"), downcast<String>(list->get(1))->s());
+  CPPUNIT_ASSERT_EQUAL(std::string("lemon"), downcast<String>(list->get(2))->s());
+}
+
+#endif // ENABLE_XML_RPC
+
+} // namespace rpc
+
+} // namespace aria2
diff --git a/test/XmlRpcRequestProcessorTest.cc b/test/XmlRpcRequestProcessorTest.cc
deleted file mode 100644
index 84a1a853..00000000
--- a/test/XmlRpcRequestProcessorTest.cc
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "XmlRpcRequestProcessor.h"
-
-#include <cppunit/extensions/HelperMacros.h>
-
-#include "XmlRpcRequestParserStateMachine.h"
-#include "RecoverableException.h"
-
-namespace aria2 {
-
-namespace rpc {
-
-class XmlRpcRequestProcessorTest:public CppUnit::TestFixture {
-
-  CPPUNIT_TEST_SUITE(XmlRpcRequestProcessorTest);
-  CPPUNIT_TEST(testParseMemory);
-  CPPUNIT_TEST(testParseMemory_shouldFail);
-  CPPUNIT_TEST(testParseMemory_withoutStringTag);
-  CPPUNIT_TEST_SUITE_END();
-public:
-  void setUp() {}
-
-  void tearDown() {}
-
-  void testParseMemory();
-  void testParseMemory_shouldFail();
-  void testParseMemory_withoutStringTag();
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION(XmlRpcRequestProcessorTest);
-
-void XmlRpcRequestProcessorTest::testParseMemory()
-{
-  XmlRpcRequestProcessor proc;
-  RpcRequest req =
-    proc.parseMemory("<?xml version=\"1.0\"?>"
-                     "<methodCall>"
-                     "  <methodName>aria2.addURI</methodName>"
-                     "    <params>"
-                     "      <param>"
-                     "        <value><i4>100</i4></value>"
-                     "      </param>"
-                     "      <param>"
-                     "       <value>"
-                     "         <struct>"
-                     "           <member>"
-                     "             <name>max-count</name>"
-                     "             <value><i4>65535</i4></value>"
-                     "           </member>"
-                     "           <member>"
-                     "             <name>seed-ratio</name>"
-                     "             <value><double>0.99</double></value>"
-                     "           </member>"
-                     "         </struct>"
-                     "       </value>"
-                     "     </param>"
-                     "     <param>"
-                     "       <value>"
-                     "         <array>"
-                     "           <data>"
-                     "             <value><string>pudding</string></value>"
-                     "             <value><base64>aGVsbG8gd29ybGQ=</base64></value>"
-                     "           </data>"                    
-                     "         </array>"
-                     "       </value>"
-                     "     </param>"
-                     "   </params>"
-                     "</methodCall>");
-
-  CPPUNIT_ASSERT_EQUAL(std::string("aria2.addURI"), req.methodName);
-  CPPUNIT_ASSERT_EQUAL((size_t)3, req.params->size());
-  CPPUNIT_ASSERT_EQUAL((Integer::ValueType)100,
-                       downcast<Integer>(req.params->get(0))->i());
-  const Dict* dict = downcast<Dict>(req.params->get(1));
-  CPPUNIT_ASSERT_EQUAL((Integer::ValueType)65535,
-                       downcast<Integer>(dict->get("max-count"))->i());
-  // Current implementation handles double as string.
-  CPPUNIT_ASSERT_EQUAL(std::string("0.99"),
-                       downcast<String>(dict->get("seed-ratio"))->s());
-  const List* list = downcast<List>(req.params->get(2));
-  CPPUNIT_ASSERT_EQUAL(std::string("pudding"), downcast<String>(list->get(0))->s());
-  CPPUNIT_ASSERT_EQUAL(std::string("hello world"), downcast<String>(list->get(1))->s());
-}
-
-void XmlRpcRequestProcessorTest::testParseMemory_shouldFail()
-{
-  XmlRpcRequestProcessor proc;
-  try {
-    proc.parseMemory("<methodCall>"
-                     "  <methodName>aria2.addURI</methodName>"
-                     "    <params>"
-                     "      <param>"
-                     "        <value><i4>100</i4></value>"
-                     "      </param>");
-    CPPUNIT_FAIL("exception must be thrown.");
-  } catch(RecoverableException& e) {
-    // success
-  }
-  {
-    RpcRequest req =
-      proc.parseMemory("<methodCall>"
-                       "  <methodName>aria2.addURI</methodName>"
-                     "    <params>"
-                     "    </params>"
-                       "</methodCall>");
-    CPPUNIT_ASSERT(req.params);
-  }
-  try {
-    RpcRequest req =
-      proc.parseMemory("<methodCall>"
-                       "  <methodName>aria2.addURI</methodName>"
-                       "</methodCall>");
-    CPPUNIT_FAIL("exception must be thrown.");
-  } catch(RecoverableException& e) {
-    // success
-  }
-}
-
-void XmlRpcRequestProcessorTest::testParseMemory_withoutStringTag()
-{
-  XmlRpcRequestProcessor proc;
-  RpcRequest req =
-    proc.parseMemory("<?xml version=\"1.0\"?>"
-                     "<methodCall>"
-                     "  <methodName>aria2.addUri</methodName>"
-                     "    <params>"
-                     "      <param>"
-                     "        <value>http://aria2.sourceforge.net</value>"
-                     "      </param>"
-                     "      <param>"
-                     "        <value>http://aria2.<foo/>sourceforge.net</value>"
-                     "      </param>"
-                     "      <param>"
-                     "       <value>"
-                     "         <struct>"
-                     "           <member>"
-                     "             <name>hello</name>"
-                     "             <value>world</value>"
-                     "           </member>"
-                     "         </struct>"
-                     "       </value>"
-                     "     </param>"
-                     "     <param>"
-                     "       <value>"
-                     "         <array>"
-                     "           <data>"
-                     "             <value>apple</value>"
-                     "             <value>banana</value>"
-                     "             <value><string>lemon</string>peanuts</value>"
-                     "           </data>"
-                     "         </array>"
-                     "       </value>"
-                     "     </param>"
-                     "   </params>"
-                     "</methodCall>");
-
-  CPPUNIT_ASSERT_EQUAL((size_t)4, req.params->size());
-  CPPUNIT_ASSERT_EQUAL(std::string("http://aria2.sourceforge.net"),
-                       downcast<String>(req.params->get(0))->s());
-  CPPUNIT_ASSERT_EQUAL(std::string("http://aria2.sourceforge.net"),
-                       downcast<String>(req.params->get(1))->s());
-  const Dict* dict = downcast<Dict>(req.params->get(2));
-  CPPUNIT_ASSERT_EQUAL(std::string("world"),
-                       downcast<String>(dict->get("hello"))->s());
-  const List* list = downcast<List>(req.params->get(3));
-  CPPUNIT_ASSERT_EQUAL(std::string("apple"), downcast<String>(list->get(0))->s());
-  CPPUNIT_ASSERT_EQUAL(std::string("banana"), downcast<String>(list->get(1))->s());
-  CPPUNIT_ASSERT_EQUAL(std::string("lemon"), downcast<String>(list->get(2))->s());
-}
-
-} // namespace rpc
-
-} // namespace aria2