summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormneumann <mneumann@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-15 23:26:20 +0000
committermneumann <mneumann@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-15 23:26:20 +0000
commit438b2d26a1f2beb95c754c24b170b5347d22e228 (patch)
tree96f95f56b0a5b3cfa508a3b669b068c0705a644c
parentf232bdfbe0d14a7dc5a838601b1a3b4d880d52d5 (diff)
downloadruby-438b2d26a1f2beb95c754c24b170b5347d22e228.tar.gz
ruby-438b2d26a1f2beb95c754c24b170b5347d22e228.tar.xz
ruby-438b2d26a1f2beb95c754c24b170b5347d22e228.zip
* imported and refactored original test cases
* added methods XMLRPC::XMLParser.each_installed_parser and XMLRPC::XMLWriter.each_installed_writer to simply original test cases * use Object#allocate instead of defining an empty #initialize * module XMLRPC::Marshallable is now only used for tagging git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/xmlrpc/create.rb17
-rw-r--r--lib/xmlrpc/parser.rb38
-rw-r--r--lib/xmlrpc/utils.rb7
-rw-r--r--test/xmlrpc/data/bug_bool.expected1
-rw-r--r--test/xmlrpc/data/bug_bool.xml8
-rw-r--r--test/xmlrpc/data/bug_cdata.expected1
-rw-r--r--test/xmlrpc/data/bug_cdata.xml8
-rw-r--r--test/xmlrpc/data/bug_covert.expected1
-rw-r--r--test/xmlrpc/data/bug_covert.xml6
-rw-r--r--test/xmlrpc/data/fault.xml16
-rw-r--r--test/xmlrpc/data/value.expected1
-rw-r--r--test/xmlrpc/data/value.xml22
-rw-r--r--test/xmlrpc/data/xml1.expected1
-rw-r--r--test/xmlrpc/data/xml1.xml1
-rw-r--r--test/xmlrpc/test_datetime.rb160
-rw-r--r--test/xmlrpc/test_features.rb47
-rw-r--r--test/xmlrpc/test_marshal.rb94
-rw-r--r--test/xmlrpc/test_parser.rb77
18 files changed, 475 insertions, 31 deletions
diff --git a/lib/xmlrpc/create.rb b/lib/xmlrpc/create.rb
index 072e72ab4..0bfa4ab55 100644
--- a/lib/xmlrpc/create.rb
+++ b/lib/xmlrpc/create.rb
@@ -86,6 +86,18 @@ module XMLRPC
end # class XMLParser
+ Classes = [Simple, XMLParser]
+
+ # yields an instance of each installed XML writer
+ def self.each_installed_writer
+ XMLRPC::XMLWriter::Classes.each do |klass|
+ begin
+ yield klass.new
+ rescue LoadError
+ end
+ end
+ end
+
end # module XMLWriter
class Create
@@ -248,7 +260,10 @@ module XMLRPC
if Config::ENABLE_MARSHALLING and param.class.included_modules.include? XMLRPC::Marshallable
# convert Ruby object into Hash
ret = {"___class___" => param.class.name}
- param.__get_instance_variables.each {|name, val|
+ param.instance_variables.each {|v|
+ name = v[1..-1]
+ val = param.instance_variable_get(v)
+
if val.nil?
ret[name] = val if Config::ENABLE_NIL_CREATE
else
diff --git a/lib/xmlrpc/parser.rb b/lib/xmlrpc/parser.rb
index da214ba1c..ed0e9a66f 100644
--- a/lib/xmlrpc/parser.rb
+++ b/lib/xmlrpc/parser.rb
@@ -112,31 +112,13 @@ module XMLRPC
begin
mod = Module
klass.split("::").each {|const| mod = mod.const_get(const.strip)}
-
- Thread.critical = true
- # let initialize take 0 parameters
- mod.module_eval %{
- begin
- alias __initialize initialize
- rescue NameError
- end
- def initialize; end
- }
-
- obj = mod.new
-
- # restore old initialize
- mod.module_eval %{
- undef initialize
- begin
- alias initialize __initialize
- rescue NameError
- end
- }
- Thread.critical = false
+ obj = mod.allocate
+
hash.delete "___class___"
- hash.each {|k,v| obj.__set_instance_variable(k, v) }
+ hash.each {|key, value|
+ obj.instance_variable_set("@#{ key }", value) if key =~ /^([\w_][\w_0-9]*)$/
+ }
obj
rescue
hash
@@ -801,6 +783,16 @@ module XMLRPC
NQXMLStreamParser, NQXMLTreeParser,
REXMLStreamParser, XMLScanStreamParser]
+ # yields an instance of each installed parser
+ def self.each_installed_parser
+ XMLRPC::XMLParser::Classes.each do |klass|
+ begin
+ yield klass.new
+ rescue LoadError
+ end
+ end
+ end
+
end # module XMLParser
diff --git a/lib/xmlrpc/utils.rb b/lib/xmlrpc/utils.rb
index 14dd08b21..d542cfe4e 100644
--- a/lib/xmlrpc/utils.rb
+++ b/lib/xmlrpc/utils.rb
@@ -17,13 +17,6 @@ module XMLRPC
# key/value pair "___class___" => ClassName
#
module Marshallable
- def __get_instance_variables
- instance_variables.collect {|var| [var[1..-1], eval(var)] }
- end
-
- def __set_instance_variable(key, value)
- eval("@#$1 = value") if key =~ /^([\w_][\w_0-9]*)$/
- end
end
diff --git a/test/xmlrpc/data/bug_bool.expected b/test/xmlrpc/data/bug_bool.expected
new file mode 100644
index 000000000..094967631
--- /dev/null
+++ b/test/xmlrpc/data/bug_bool.expected
@@ -0,0 +1 @@
+[true, false]
diff --git a/test/xmlrpc/data/bug_bool.xml b/test/xmlrpc/data/bug_bool.xml
new file mode 100644
index 000000000..04ed00709
--- /dev/null
+++ b/test/xmlrpc/data/bug_bool.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<methodResponse>
+ <params>
+ <param>
+ <value><boolean>0</boolean></value>
+ </param>
+ </params>
+</methodResponse>
diff --git a/test/xmlrpc/data/bug_cdata.expected b/test/xmlrpc/data/bug_cdata.expected
new file mode 100644
index 000000000..5ccf7fc08
--- /dev/null
+++ b/test/xmlrpc/data/bug_cdata.expected
@@ -0,0 +1 @@
+[true, "test"]
diff --git a/test/xmlrpc/data/bug_cdata.xml b/test/xmlrpc/data/bug_cdata.xml
new file mode 100644
index 000000000..ba990e04f
--- /dev/null
+++ b/test/xmlrpc/data/bug_cdata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<methodResponse>
+ <params>
+ <param>
+ <value><string><![CDATA[test]]></string></value>
+ </param>
+ </params>
+</methodResponse>
diff --git a/test/xmlrpc/data/bug_covert.expected b/test/xmlrpc/data/bug_covert.expected
new file mode 100644
index 000000000..593f434ef
--- /dev/null
+++ b/test/xmlrpc/data/bug_covert.expected
@@ -0,0 +1 @@
+[true, "Site,SANs,Array\nConfigured Capacity,Array Reserved Capacity,Array Ava\nilable Capacity,Array % Reserved,Host Allocated,Host Used,Host Free,Host %\nUsed\n"]
diff --git a/test/xmlrpc/data/bug_covert.xml b/test/xmlrpc/data/bug_covert.xml
new file mode 100644
index 000000000..1d9abd2a0
--- /dev/null
+++ b/test/xmlrpc/data/bug_covert.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"
+encoding="ISO-8859-1"?><methodResponse><params><param><value>Site,SANs,Array
+Configured Capacity,Array Reserved Capacity,Array Ava
+ilable Capacity,Array % Reserved,Host Allocated,Host Used,Host Free,Host %
+Used
+</value></param></params></methodResponse>
diff --git a/test/xmlrpc/data/fault.xml b/test/xmlrpc/data/fault.xml
new file mode 100644
index 000000000..041c464eb
--- /dev/null
+++ b/test/xmlrpc/data/fault.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<methodResponse>
+ <fault>
+ <value><struct>
+ <member>
+ <name>faultCode</name>
+ <value><int>4</int></value>
+ </member>
+ <member>
+ <name>faultString</name>
+ <value>an error message</value>
+ </member>
+ </struct></value>
+ </fault>
+</methodResponse>
+
diff --git a/test/xmlrpc/data/value.expected b/test/xmlrpc/data/value.expected
new file mode 100644
index 000000000..3dc691544
--- /dev/null
+++ b/test/xmlrpc/data/value.expected
@@ -0,0 +1 @@
+["Test", ["Hallo Leute", " Hallo ", "", " "]]
diff --git a/test/xmlrpc/data/value.xml b/test/xmlrpc/data/value.xml
new file mode 100644
index 000000000..197861609
--- /dev/null
+++ b/test/xmlrpc/data/value.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<methodCall>
+ <methodName>Test</methodName>
+ <params>
+ <param>
+ <value>Hallo Leute</value>
+ </param>
+ <param>
+ <value> Hallo </value>
+ </param>
+ <param>
+ <value></value>
+ </param>
+ <param>
+ <value> </value>
+ </param>
+ </params>
+</methodCall>
+
+
+
+
diff --git a/test/xmlrpc/data/xml1.expected b/test/xmlrpc/data/xml1.expected
new file mode 100644
index 000000000..527a62c2f
--- /dev/null
+++ b/test/xmlrpc/data/xml1.expected
@@ -0,0 +1 @@
+[true, [{"subscriber"=>"MegaCorp", "lastName"=>"Baker", "telephone1"=>"1-508-791-1267", "telephone2"=>"1-800-445-2588", "password"=>"p1111", "OID"=>"1", "email"=>"hbaker@yahoo.com", "adminId"=>"hbaker", "objectName"=>"AdministratorDO"}, {"subscriber"=>"CornerStore", "lastName"=>"Dragon", "telephone1"=>"1-781-789-9089", "telephone2"=>"1-800-445-2588", "password"=>"p3333", "OID"=>"3", "email"=>"adragon@yahoo.com", "adminId"=>"adragon", "objectName"=>"AdministratorDO"}, {"subscriber"=>"Cyberdyne", "lastName"=>"Rodman", "telephone1"=>"1-617-789-1890", "telephone2"=>"1-800-445-2588", "password"=>"p4444", "OID"=>"4", "email"=>"mrodman@yahoo.com", "adminId"=>"mrodman", "objectName"=>"AdministratorDO"}, {"subscriber"=>"StarSports", "lastName"=>"Jordan", "telephone1"=>"1-617-890-7897", "telephone2"=>"1-800-445-2588", "password"=>"p5555", "OID"=>"5", "email"=>"mjordan@yahoo.com", "adminId"=>"mjordan", "objectName"=>"AdministratorDO"}, {"subscriber"=>"GreatBooks", "lastName"=>"Pippen", "telephone1"=>"1-781-789-9876", "telephone2"=>"1-800-445-2588", "password"=>"p6666", "OID"=>"6", "email"=>"gpippen@yahoo.com", "adminId"=>"gpippen", "objectName"=>"AdministratorDO"}, {"subscriber"=>"AxisChemicals", "lastName"=>"Andhrew", "telephone1"=>"1-781-678-8970", "telephone2"=>"1-800-445-2588", "password"=>"p7777", "OID"=>"7", "email"=>"aandrew@yahoo.com", "adminId"=>"aandrew", "objectName"=>"AdministratorDO"}, {"subscriber"=>"MediaShop", "lastName"=>"Vincent", "telephone1"=>"1-786-897-8908", "telephone2"=>"1-800-445-2588", "password"=>"p8888", "OID"=>"8", "email"=>"tvincent@yahoo.com", "adminId"=>"tvincent", "objectName"=>"AdministratorDO"}, {"subscriber"=>"SmartShop", "lastName"=>"Richard", "telephone1"=>"1-508-789-6789", "telephone2"=>"1-800-445-2588", "password"=>"p9999", "OID"=>"9", "email"=>"krichard@yahoo.com", "adminId"=>"krichard", "objectName"=>"AdministratorDO"}, {"subscriber"=>"HomeNeeds", "lastName"=>"Cornell", "telephone1"=>"1-617-789-8979", "telephone2"=>"1-800-445-2588", "password"=>"paaaa", "OID"=>"10", "email"=>"gconell@yahoo.com", "adminId"=>"gcornell", "objectName"=>"AdministratorDO"}, {"subscriber"=>"MegaCorp", "lastName"=>"HorstMann", "telephone1"=>"1-508-791-1267", "telephone2"=>"1-800-445-2588", "password"=>"p1111", "OID"=>"11", "email"=>"shorstmann@yahoo.com", "adminId"=>"shorstmann", "objectName"=>"AdministratorDO"}, {"subscriber"=>"CornerStore", "lastName"=>"Bob", "telephone1"=>"1-781-789-9089", "telephone2"=>"1-800-445-2588", "password"=>"p3333", "OID"=>"13", "email"=>"rbob@yahoo.com", "adminId"=>"rbob", "objectName"=>"AdministratorDO"}, {"subscriber"=>"Cyberdyne", "lastName"=>"Peter", "telephone1"=>"1-617-789-1890", "telephone2"=>"1-800-445-2588", "password"=>"p4444", "OID"=>"14", "email"=>"speter@yahoo.com", "adminId"=>"speter", "objectName"=>"AdministratorDO"}, {"subscriber"=>"StarSports", "lastName"=>"Novak", "telephone1"=>"1-617-890-7897", "telephone2"=>"1-800-445-2588", "password"=>"p5555", "OID"=>"15", "email"=>"pnovak@yahoo.com", "adminId"=>"pnovak", "objectName"=>"AdministratorDO"}, {"subscriber"=>"GreatBooks", "lastName"=>"Nancy", "telephone1"=>"1-781-789-9876", "telephone2"=>"1-800-445-2588", "password"=>"p6666", "OID"=>"16", "email"=>"pnancy@yahoo.com", "adminId"=>"pnancy", "objectName"=>"AdministratorDO"}, {"subscriber"=>"AxisChemicals", "lastName"=>"Michel", "telephone1"=>"1-781-678-8970", "telephone2"=>"1-800-445-2588", "password"=>"p7777", "OID"=>"17", "email"=>"hmichel@yahoo.com", "adminId"=>"hmichel", "objectName"=>"AdministratorDO"}, {"subscriber"=>"MediaShop", "lastName"=>"David", "telephone1"=>"1-786-897-8908", "telephone2"=>"1-800-445-2588", "password"=>"p8888", "OID"=>"18", "email"=>"kdavid@yahoo.com", "adminId"=>"kdavid", "objectName"=>"AdministratorDO"}, {"subscriber"=>"SmartShop", "lastName"=>"Valnoor", "telephone1"=>"1-508-789-6789", "telephone2"=>"1-800-445-2588", "password"=>"p9999", "OID"=>"19", "email"=>"pvalnoor@yahoo.com", "adminId"=>"pvalnoor", "objectName"=>"AdministratorDO"}, {"subscriber"=>"HomeNeeds", "lastName"=>"Smith", "telephone1"=>"1-617-789-8979", "telephone2"=>"1-800-445-2588", "password"=>"paaaa", "OID"=>"20", "email"=>"wsmith@yahoo.com", "adminId"=>"wsmith", "objectName"=>"AdministratorDO"}, {"subscriber"=>"MegaCorp", "lastName"=>"Caral", "telephone1"=>"1-781-789-9876", "telephone2"=>"1-800-445-2588", "password"=>"p6666", "OID"=>"21", "email"=>"gcaral@yahoo.com", "adminId"=>"gcaral", "objectName"=>"AdministratorDO"}, {"subscriber"=>"CornerStore", "lastName"=>"Hillary", "telephone1"=>"1-786-897-8908", "telephone2"=>"1-800-445-2588", "password"=>"p8888", "OID"=>"23", "email"=>"phillary@yahoo.com", "adminId"=>"phillary", "objectName"=>"AdministratorDO"}, {"subscriber"=>"Cyberdyne", "lastName"=>"Philip", "telephone1"=>"1-508-789-6789", "telephone2"=>"1-800-445-2588", "password"=>"p9999", "OID"=>"24", "email"=>"bphilip@yahoo.com", "adminId"=>"bphilip", "objectName"=>"AdministratorDO"}, {"subscriber"=>"StarSports", "lastName"=>"Andrea", "telephone1"=>"1-617-789-8979", "telephone2"=>"1-800-445-2588", "password"=>"paaaa", "OID"=>"25", "email"=>"sandrea@yahoo.com", "adminId"=>"sandrea", "objectName"=>"AdministratorDO"}, {"subscriber"=>"s4", "lastName"=>"null", "telephone1"=>"null", "telephone2"=>"null", "password"=>"s4", "OID"=>"26", "email"=>"null", "adminId"=>"s4", "objectName"=>"AdministratorDO"}, {"subscriber"=>"BigBank", "lastName"=>"administrator", "telephone1"=>"", "telephone2"=>"", "password"=>"admin", "OID"=>"82", "email"=>"", "adminId"=>"admin", "objectName"=>"AdministratorDO"}]]
diff --git a/test/xmlrpc/data/xml1.xml b/test/xmlrpc/data/xml1.xml
new file mode 100644
index 000000000..10aa55483
--- /dev/null
+++ b/test/xmlrpc/data/xml1.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><array><data><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>hbaker</value></member><member><name>email</name><value>hbaker@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-791-1267</value></member><member><name>OID</name><value>1</value></member><member><name>password</name><value>p1111</value></member><member><name>lastName</name><value>Baker</value></member><member><name>subscriber</name><value>MegaCorp</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>adragon</value></member><member><name>email</name><value>adragon@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9089</value></member><member><name>OID</name><value>3</value></member><member><name>password</name><value>p3333</value></member><member><name>lastName</name><value>Dragon</value></member><member><name>subscriber</name><value>CornerStore</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>mrodman</value></member><member><name>email</name><value>mrodman@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-1890</value></member><member><name>OID</name><value>4</value></member><member><name>password</name><value>p4444</value></member><member><name>lastName</name><value>Rodman</value></member><member><name>subscriber</name><value>Cyberdyne</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>mjordan</value></member><member><name>email</name><value>mjordan@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-890-7897</value></member><member><name>OID</name><value>5</value></member><member><name>password</name><value>p5555</value></member><member><name>lastName</name><value>Jordan</value></member><member><name>subscriber</name><value>StarSports</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>gpippen</value></member><member><name>email</name><value>gpippen@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9876</value></member><member><name>OID</name><value>6</value></member><member><name>password</name><value>p6666</value></member><member><name>lastName</name><value>Pippen</value></member><member><name>subscriber</name><value>GreatBooks</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>aandrew</value></member><member><name>email</name><value>aandrew@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-678-8970</value></member><member><name>OID</name><value>7</value></member><member><name>password</name><value>p7777</value></member><member><name>lastName</name><value>Andhrew</value></member><member><name>subscriber</name><value>AxisChemicals</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>tvincent</value></member><member><name>email</name><value>tvincent@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-786-897-8908</value></member><member><name>OID</name><value>8</value></member><member><name>password</name><value>p8888</value></member><member><name>lastName</name><value>Vincent</value></member><member><name>subscriber</name><value>MediaShop</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>krichard</value></member><member><name>email</name><value>krichard@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-789-6789</value></member><member><name>OID</name><value>9</value></member><member><name>password</name><value>p9999</value></member><member><name>lastName</name><value>Richard</value></member><member><name>subscriber</name><value>SmartShop</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>gcornell</value></member><member><name>email</name><value>gconell@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-8979</value></member><member><name>OID</name><value>10</value></member><member><name>password</name><value>paaaa</value></member><member><name>lastName</name><value>Cornell</value></member><member><name>subscriber</name><value>HomeNeeds</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>shorstmann</value></member><member><name>email</name><value>shorstmann@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-791-1267</value></member><member><name>OID</name><value>11</value></member><member><name>password</name><value>p1111</value></member><member><name>lastName</name><value>HorstMann</value></member><member><name>subscriber</name><value>MegaCorp</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>rbob</value></member><member><name>email</name><value>rbob@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9089</value></member><member><name>OID</name><value>13</value></member><member><name>password</name><value>p3333</value></member><member><name>lastName</name><value>Bob</value></member><member><name>subscriber</name><value>CornerStore</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>speter</value></member><member><name>email</name><value>speter@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-1890</value></member><member><name>OID</name><value>14</value></member><member><name>password</name><value>p4444</value></member><member><name>lastName</name><value>Peter</value></member><member><name>subscriber</name><value>Cyberdyne</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>pnovak</value></member><member><name>email</name><value>pnovak@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-890-7897</value></member><member><name>OID</name><value>15</value></member><member><name>password</name><value>p5555</value></member><member><name>lastName</name><value>Novak</value></member><member><name>subscriber</name><value>StarSports</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>pnancy</value></member><member><name>email</name><value>pnancy@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9876</value></member><member><name>OID</name><value>16</value></member><member><name>password</name><value>p6666</value></member><member><name>lastName</name><value>Nancy</value></member><member><name>subscriber</name><value>GreatBooks</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>hmichel</value></member><member><name>email</name><value>hmichel@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-678-8970</value></member><member><name>OID</name><value>17</value></member><member><name>password</name><value>p7777</value></member><member><name>lastName</name><value>Michel</value></member><member><name>subscriber</name><value>AxisChemicals</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>kdavid</value></member><member><name>email</name><value>kdavid@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-786-897-8908</value></member><member><name>OID</name><value>18</value></member><member><name>password</name><value>p8888</value></member><member><name>lastName</name><value>David</value></member><member><name>subscriber</name><value>MediaShop</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>pvalnoor</value></member><member><name>email</name><value>pvalnoor@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-789-6789</value></member><member><name>OID</name><value>19</value></member><member><name>password</name><value>p9999</value></member><member><name>lastName</name><value>Valnoor</value></member><member><name>subscriber</name><value>SmartShop</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>wsmith</value></member><member><name>email</name><value>wsmith@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-8979</value></member><member><name>OID</name><value>20</value></member><member><name>password</name><value>paaaa</value></member><member><name>lastName</name><value>Smith</value></member><member><name>subscriber</name><value>HomeNeeds</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>gcaral</value></member><member><name>email</name><value>gcaral@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9876</value></member><member><name>OID</name><value>21</value></member><member><name>password</name><value>p6666</value></member><member><name>lastName</name><value>Caral</value></member><member><name>subscriber</name><value>MegaCorp</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>phillary</value></member><member><name>email</name><value>phillary@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-786-897-8908</value></member><member><name>OID</name><value>23</value></member><member><name>password</name><value>p8888</value></member><member><name>lastName</name><value>Hillary</value></member><member><name>subscriber</name><value>CornerStore</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>bphilip</value></member><member><name>email</name><value>bphilip@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-789-6789</value></member><member><name>OID</name><value>24</value></member><member><name>password</name><value>p9999</value></member><member><name>lastName</name><value>Philip</value></member><member><name>subscriber</name><value>Cyberdyne</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>sandrea</value></member><member><name>email</name><value>sandrea@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-8979</value></member><member><name>OID</name><value>25</value></member><member><name>password</name><value>paaaa</value></member><member><name>lastName</name><value>Andrea</value></member><member><name>subscriber</name><value>StarSports</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>s4</value></member><member><name>email</name><value>null</value></member><member><name>telephone2</name><value>null</value></member><member><name>telephone1</name><value>null</value></member><member><name>OID</name><value>26</value></member><member><name>password</name><value>s4</value></member><member><name>lastName</name><value>null</value></member><member><name>subscriber</name><value>s4</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>admin</value></member><member><name>email</name><value></value></member><member><name>telephone2</name><value></value></member><member><name>telephone1</name><value></value></member><member><name>OID</name><value>82</value></member><member><name>password</name><value>admin</value></member><member><name>lastName</name><value>administrator</value></member><member><name>subscriber</name><value>BigBank</value></member></struct></value></data></array></value></param></params></methodResponse>
diff --git a/test/xmlrpc/test_datetime.rb b/test/xmlrpc/test_datetime.rb
new file mode 100644
index 000000000..d7fbb6650
--- /dev/null
+++ b/test/xmlrpc/test_datetime.rb
@@ -0,0 +1,160 @@
+$LOAD_PATH.unshift '../../lib'
+require 'test/unit'
+require "xmlrpc/datetime"
+
+class Test_DateTime < Test::Unit::TestCase
+
+ def test_new
+ dt = createDateTime()
+
+ assert_instance_of(XMLRPC::DateTime, dt)
+ end
+
+ def test_new_exception
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(4.5, 13, 32, 25, 60, 60) }
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 32, 25, 60, 60) }
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 31, 25, 60, 60) }
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 31, 24, 60, 60) }
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 31, 24, 59, 60) }
+ assert_nothing_raised(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 31, 24, 59, 59) }
+
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 0, 0, -1, -1, -1) }
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 0, -1, -1, -1) }
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 1, -1, -1, -1) }
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 1, 0, -1, -1) }
+ assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 1, 0, 0, -1) }
+ assert_nothing_raised(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 1, 0, 0, 0) }
+ end
+
+
+ def test_get_values
+ y, m, d, h, mi, s = 1970, 3, 24, 12, 0, 5
+ dt = XMLRPC::DateTime.new(y, m, d, h, mi, s)
+
+ assert_equal(y, dt.year)
+ assert_equal(m, dt.month)
+ assert_equal(m, dt.mon)
+ assert_equal(d, dt.day)
+
+ assert_equal(h, dt.hour)
+ assert_equal(mi,dt.min)
+ assert_equal(s, dt.sec)
+ end
+
+ def test_set_values
+ dt = createDateTime()
+ y, m, d, h, mi, s = 1950, 12, 9, 8, 52, 30
+
+ dt.year = y
+ dt.month = m
+ dt.day = d
+ dt.hour = h
+ dt.min = mi
+ dt.sec = s
+
+ assert_equal(y, dt.year)
+ assert_equal(m, dt.month)
+ assert_equal(m, dt.mon)
+ assert_equal(d, dt.day)
+
+ assert_equal(h, dt.hour)
+ assert_equal(mi,dt.min)
+ assert_equal(s, dt.sec)
+
+ dt.mon = 5
+ assert_equal(5, dt.month)
+ assert_equal(5, dt.mon)
+ end
+
+ def test_set_exception
+ dt = createDateTime()
+
+ assert_raises(ArgumentError) { dt.year = 4.5 }
+ assert_nothing_raised(ArgumentError) { dt.year = -2000 }
+
+ assert_raises(ArgumentError) { dt.month = 0 }
+ assert_raises(ArgumentError) { dt.month = 13 }
+ assert_nothing_raised(ArgumentError) { dt.month = 7 }
+
+ assert_raises(ArgumentError) { dt.mon = 0 }
+ assert_raises(ArgumentError) { dt.mon = 13 }
+ assert_nothing_raised(ArgumentError) { dt.mon = 7 }
+
+ assert_raises(ArgumentError) { dt.day = 0 }
+ assert_raises(ArgumentError) { dt.day = 32 }
+ assert_nothing_raised(ArgumentError) { dt.day = 16 }
+
+ assert_raises(ArgumentError) { dt.hour = -1 }
+ assert_raises(ArgumentError) { dt.hour = 25 }
+ assert_nothing_raised(ArgumentError) { dt.hour = 12 }
+
+ assert_raises(ArgumentError) { dt.min = -1 }
+ assert_raises(ArgumentError) { dt.min = 60 }
+ assert_nothing_raised(ArgumentError) { dt.min = 30 }
+
+ assert_raises(ArgumentError) { dt.sec = -1 }
+ assert_raises(ArgumentError) { dt.sec = 60 }
+ assert_nothing_raised(ArgumentError) { dt.sec = 30 }
+ end
+
+ def test_to_a
+ y, m, d, h, mi, s = 1970, 3, 24, 12, 0, 5
+ dt = XMLRPC::DateTime.new(y, m, d, h, mi, s)
+ a = dt.to_a
+
+ assert_instance_of(Array, a)
+ assert_equal(6, a.size, "Returned array has wrong size")
+
+ assert_equal(y, a[0])
+ assert_equal(m, a[1])
+ assert_equal(d, a[2])
+ assert_equal(h, a[3])
+ assert_equal(mi, a[4])
+ assert_equal(s, a[5])
+ end
+
+ def test_to_time1
+ y, m, d, h, mi, s = 1970, 3, 24, 12, 0, 5
+ dt = XMLRPC::DateTime.new(y, m, d, h, mi, s)
+ time = dt.to_time
+
+ assert_not_nil(time)
+
+ assert_equal(y, time.year)
+ assert_equal(m, time.month)
+ assert_equal(d, time.day)
+ assert_equal(h, time.hour)
+ assert_equal(mi, time.min)
+ assert_equal(s, time.sec)
+ end
+
+ def test_to_time2
+ dt = createDateTime()
+ dt.year = 1969
+
+ assert_nil(dt.to_time)
+ end
+
+ def test_to_date1
+ y, m, d, h, mi, s = 1970, 3, 24, 12, 0, 5
+ dt = XMLRPC::DateTime.new(y, m, d, h, mi, s)
+ date = dt.to_date
+
+ assert_equal(y, date.year)
+ assert_equal(m, date.month)
+ assert_equal(d, date.day)
+ end
+
+ def test_to_date2
+ dt = createDateTime()
+ dt.year = 666
+
+ assert_equal(666, dt.to_date.year)
+ end
+
+
+ def createDateTime
+ XMLRPC::DateTime.new(1970, 3, 24, 12, 0, 5)
+ end
+
+end
diff --git a/test/xmlrpc/test_features.rb b/test/xmlrpc/test_features.rb
new file mode 100644
index 000000000..5984b97a5
--- /dev/null
+++ b/test/xmlrpc/test_features.rb
@@ -0,0 +1,47 @@
+$LOAD_PATH.unshift '../../lib'
+require 'test/unit'
+require "xmlrpc/create"
+require "xmlrpc/parser"
+require "xmlrpc/config"
+
+#XMLRPC::Config.const_set(ENABLE_NIL_CREATE, true)
+#XMLRPC::Config.const_set(ENABLE_NIL_PARSER, true)
+
+class Test_Features < Test::Unit::TestCase
+
+ def setup
+ @params = [nil, {"test" => nil}, [nil, 1, nil]]
+ end
+
+ def test_nil_create
+ XMLRPC::XMLWriter.each_installed_writer do |writer|
+ c = XMLRPC::Create.new(writer)
+
+ XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, false)
+ assert_raises(RuntimeError) { str = c.methodCall("test", *@params) }
+
+ XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, true)
+ assert_nothing_raised { str = c.methodCall("test", *@params) }
+ end
+ end
+
+ def test_nil_parse
+ XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, true)
+
+ XMLRPC::XMLWriter.each_installed_writer do |writer|
+ c = XMLRPC::Create.new(writer)
+ str = c.methodCall("test", *@params)
+ XMLRPC::XMLParser.each_installed_parser do |parser|
+ para = nil
+
+ XMLRPC::Config.const_set(:ENABLE_NIL_PARSER, false)
+ assert_raises(RuntimeError) { para = parser.parseMethodCall(str) }
+
+ XMLRPC::Config.const_set(:ENABLE_NIL_PARSER, true)
+ assert_nothing_raised { para = parser.parseMethodCall(str) }
+ assert_equal(para[1], @params)
+ end
+ end
+ end
+
+end
diff --git a/test/xmlrpc/test_marshal.rb b/test/xmlrpc/test_marshal.rb
new file mode 100644
index 000000000..5424628d9
--- /dev/null
+++ b/test/xmlrpc/test_marshal.rb
@@ -0,0 +1,94 @@
+$LOAD_PATH.unshift '../../lib'
+require 'test/unit'
+require "xmlrpc/marshal"
+
+class Test_Marshal < Test::Unit::TestCase
+ # for test_parser_values
+ class Person
+ include XMLRPC::Marshallable
+ attr_reader :name
+ def initialize(name)
+ @name = name
+ end
+ end
+
+
+ def test1_dump_response
+ assert_nothing_raised(NameError) {
+ XMLRPC::Marshal.dump_response('arg')
+ }
+ end
+
+ def test1_dump_call
+ assert_nothing_raised(NameError) {
+ XMLRPC::Marshal.dump_call('methodName', 'arg')
+ }
+ end
+
+ def test2_dump_load_response
+ value = [1, 2, 3, {"test" => true}, 3.4]
+ res = XMLRPC::Marshal.dump_response(value)
+
+ assert_equal(value, XMLRPC::Marshal.load_response(res))
+ end
+
+ def test2_dump_load_call
+ methodName = "testMethod"
+ value = [1, 2, 3, {"test" => true}, 3.4]
+ exp = [methodName, [value, value]]
+
+ res = XMLRPC::Marshal.dump_call(methodName, value, value)
+
+ assert_equal(exp, XMLRPC::Marshal.load_call(res))
+ end
+
+ def test_parser_values
+ v1 = [
+ 1, -7778, # integers
+ 1.0, 0.0, -333.0, 2343434343.0, # floats
+ false, true, true, false, # booleans
+ "Hallo", "with < and >", "" # strings
+ ]
+
+ v2 = [
+ [v1, v1, v1],
+ {"a" => v1}
+ ]
+
+ v3 = [
+ XMLRPC::Base64.new("\001"*1000), # base64
+ :aSymbol, :anotherSym # symbols (-> string)
+ ]
+ v3_exp = [
+ "\001"*1000,
+ "aSymbol", "anotherSym"
+ ]
+ person = Person.new("Michael")
+
+ XMLRPC::XMLParser.each_installed_parser do |parser|
+ m = XMLRPC::Marshal.new(parser)
+
+ assert_equal( v1, m.load_response(m.dump_response(v1)) )
+ assert_equal( v2, m.load_response(m.dump_response(v2)) )
+ assert_equal( v3_exp, m.load_response(m.dump_response(v3)) )
+
+ pers = m.load_response(m.dump_response(person))
+
+ assert( pers.is_a?(Person) )
+ assert( person.name == pers.name )
+ end
+
+ # missing, Date, Time, DateTime
+ # Struct
+ end
+
+ def test_no_params_tag
+ # bug found by Idan Sofer
+
+ expect = %{<?xml version="1.0" ?><methodCall><methodName>myMethod</methodName><params/></methodCall>\n}
+
+ str = XMLRPC::Marshal.dump_call("myMethod")
+ assert_equal(expect, str)
+ end
+
+end
diff --git a/test/xmlrpc/test_parser.rb b/test/xmlrpc/test_parser.rb
new file mode 100644
index 000000000..3e55cdb35
--- /dev/null
+++ b/test/xmlrpc/test_parser.rb
@@ -0,0 +1,77 @@
+$LOAD_PATH.unshift '../../lib'
+require 'test/unit'
+require "xmlrpc/parser"
+
+module GenericParserTest
+ def setup
+ @xml1 = File.readlines("data/xml1.xml").to_s
+ @expected1 = File.readlines("data/xml1.expected").to_s.chomp
+
+ @xml2 = File.readlines("data/bug_covert.xml").to_s
+ @expected2 = File.readlines("data/bug_covert.expected").to_s.chomp
+
+ @xml3 = File.readlines("data/bug_bool.xml").to_s
+ @expected3 = File.readlines("data/bug_bool.expected").to_s.chomp
+
+ @xml4 = File.readlines("data/value.xml").to_s
+ @expected4 = File.readlines("data/value.expected").to_s.chomp
+
+ @cdata_xml = File.readlines("data/bug_cdata.xml").to_s.chomp
+ @cdata_expected = File.readlines("data/bug_cdata.expected").to_s.chomp
+
+ @fault_doc = File.readlines("data/fault.xml").to_s
+ end
+
+ # test parseMethodResponse --------------------------------------------------
+
+ def test_parseMethodResponse1
+ assert_equal(@expected1, @p.parseMethodResponse(@xml1).inspect)
+ end
+
+ def test_parseMethodResponse2
+ assert_equal(@expected2, @p.parseMethodResponse(@xml2).inspect)
+ end
+
+ def test_parseMethodResponse3
+ assert_equal(@expected3, @p.parseMethodResponse(@xml3).inspect)
+ end
+
+ def test_cdata
+ assert_equal(@cdata_expected, @p.parseMethodResponse(@cdata_xml).inspect)
+ end
+
+ # test parseMethodCall ------------------------------------------------------
+
+ def test_parseMethodCall
+ assert_equal(@expected4, @p.parseMethodCall(@xml4).inspect)
+ end
+
+ # test fault ----------------------------------------------------------------
+
+ def test_fault
+ flag, fault = @p.parseMethodResponse(@fault_doc)
+ assert_equal(flag, false)
+ unless fault.is_a? XMLRPC::FaultException
+ assert(false, "must be an instance of class XMLRPC::FaultException")
+ end
+ assert_equal(fault.faultCode, 4)
+ assert_equal(fault.faultString, "an error message")
+ end
+end
+
+# create test class for each installed parser
+XMLRPC::XMLParser.each_installed_parser do |parser|
+ klass = parser.class
+ name = klass.to_s.split("::").last
+
+ eval %{
+ class Test_#{name} < Test::Unit::TestCase
+ include GenericParserTest
+
+ def setup
+ super
+ @p = #{klass}.new
+ end
+ end
+ }
+end