add support for QMF TYPE_LIST in engine, ruby and python wrappers

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@929244 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 50 insertions, 2 deletions

diff --git a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb b/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
index 86eefc59a6..92065031a2 100755
--- a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
+++ b/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
@@ -44,6 +44,7 @@ class Model
     @parent_class.add_property(Qmf::SchemaProperty.new("lstrval", Qmf::TYPE_LSTR))
 
     @parent_class.add_property(Qmf::SchemaProperty.new("mapval", Qmf::TYPE_MAP))
+    @parent_class.add_property(Qmf::SchemaProperty.new("listval", Qmf::TYPE_LIST))
 
     @parent_class.add_statistic(Qmf::SchemaStatistic.new("queryCount", Qmf::TYPE_UINT32, :unit => "query", :desc => "Query count"))
 
@@ -246,6 +247,11 @@ class App < Qmf::AgentHandler
     @parent.int16val = 0
     @parent.int8val  = 0
 
+    # a list containing a list that contains a map (so there!)
+    @parent.listval = ['a', 1, 'b', 2,
+                       ['c', true, 3.1415,
+                        {"hi" => 10, "lo" => 5}]]
+
     @parent_oid = @agent.alloc_object_id(1)
     @parent.set_object_id(@parent_oid)
 
diff --git a/qpid/cpp/bindings/qmf/tests/python_agent.py b/qpid/cpp/bindings/qmf/tests/python_agent.py
index 83531830b1..4974e0ec90 100644
--- a/qpid/cpp/bindings/qmf/tests/python_agent.py
+++ b/qpid/cpp/bindings/qmf/tests/python_agent.py
@@ -45,6 +45,7 @@ class Model:
         self.parent_class.add_property(qmf.SchemaProperty("lstrval", qmf.TYPE_LSTR))
 
         self.parent_class.add_property(qmf.SchemaProperty("mapval", qmf.TYPE_MAP))
+        self.parent_class.add_property(qmf.SchemaProperty("listval", qmf.TYPE_LIST))
 
 
         self.parent_class.add_statistic(qmf.SchemaStatistic("queryCount", qmf.TYPE_UINT32, {"unit":"query", "desc":"Query count"}))
@@ -274,7 +275,7 @@ class App(qmf.AgentHandler):
 
         ## @todo how do we force a test failure?
         # verify the properties() and statistics() object methods:
-        assert len(self._parent.properties()) == 13
+        assert len(self._parent.properties()) == 14
         assert len(self._parent.statistics()) == 1
 
         self._parent.set_attr("name", "Parent One")
@@ -290,6 +291,11 @@ class App(qmf.AgentHandler):
         self._parent.set_attr("int16val", 0)
         self._parent.set_attr("int8val",  0)
 
+        # a list containing a list that contains a map (so there!)
+        self._parent.set_attr("listval", ['a', 1, 'b', 2,
+                                          ['c', True, 3.1415,
+                                           {"hi": 10, "lo": 5}]])
+
         self._parent_oid = self._agent.alloc_object_id(1)
         self._parent.set_object_id(self._parent_oid)
 
diff --git a/qpid/cpp/bindings/qmf/tests/python_console.py b/qpid/cpp/bindings/qmf/tests/python_console.py
index fe27c33c4b..efd25a1d26 100755
--- a/qpid/cpp/bindings/qmf/tests/python_console.py
+++ b/qpid/cpp/bindings/qmf/tests/python_console.py
@@ -202,7 +202,26 @@ class QmfInteropTests(TestBase010):
         self.assertEqual(queue[3].arguments["strval"], "TEST")
         self.assertEqual(queue[4].arguments["uint32val"], 0)
         self.assertEqual(queue[4].arguments["strval"], "LONG_TEST")
-        
+
+
+    def test_G_basic_map_list_data(self):
+        self.startQmf();
+        qmf = self.qmf
+
+        parents = qmf.getObjects(_class="parent")
+        self.assertEqual(len(parents), 1)
+        parent = parents[0]
+
+        # see agent for structure of listval
+
+        self.assertTrue(isinstance(parent.listval, list))
+        self.assertEqual(len(parent.listval), 5)
+        self.assertTrue(isinstance(parent.listval[4], list))
+        self.assertEqual(len(parent.listval[4]), 4)
+        self.assertTrue(isinstance(parent.listval[4][3], dict))
+        self.assertEqual(parent.listval[4][3]["hi"], 10)
+        self.assertEqual(parent.listval[4][3]["lo"], 5)
+
 
     def getProperty(self, msg, name):
         for h in msg.headers:
diff --git a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb b/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
index 3a771aaafd..9ef0ef57a8 100755
--- a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
+++ b/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
@@ -266,6 +266,23 @@ class ConsoleTest < ConsoleTestBase
     end
   end
 
+
+
+  def test_G_basic_map_list_data
+    parent = @qmfc.object(:class => "parent")
+    assert(parent, "Number of 'parent' objects")
+
+    # see agent for structure of listval
+
+    assert(parent.listval.class == Array)
+    assert_equal(parent.listval.length, 5)
+    assert(parent.listval[4].class == Array)
+    assert_equal(parent.listval[4].length, 4)
+    assert(parent.listval[4][3].class == Hash)
+    assert_equal(parent.listval[4][3]["hi"], 10)
+    assert_equal(parent.listval[4][3]["lo"], 5)
+  end
+
 end
 
 app = ConsoleTest.new