Fixes to the QMF Ruby API - added missing methods and reduced use of "get_" convention.

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

3 files changed, 22 insertions, 20 deletions

diff --git a/cpp/bindings/qmf/tests/ruby_console.rb b/cpp/bindings/qmf/tests/ruby_console.rb
index 90672b2447..d4df4ebc5d 100755
--- a/cpp/bindings/qmf/tests/ruby_console.rb
+++ b/cpp/bindings/qmf/tests/ruby_console.rb
@@ -25,12 +25,12 @@ require 'socket'
 class App < Qmf::ConsoleHandler
 
   def dump_schema
-    packages = @qmfc.get_packages
+    packages = @qmfc.packages
     puts "----- Packages -----"
     packages.each do |p|
       puts p
       puts "    ----- Object Classes -----"
-      classes = @qmfc.get_classes(p)
+      classes = @qmfc.classes(p)
       classes.each do |c|
         puts "    #{c.name}"
 
@@ -59,7 +59,7 @@ class App < Qmf::ConsoleHandler
       end
 
       puts "    ----- Event Classes -----"
-      classes = @qmfc.get_classes(p, Qmf::CLASS_EVENT)
+      classes = @qmfc.classes(p, Qmf::CLASS_EVENT)
       classes.each do |c|
         puts "    #{c.name}"
         puts "        ---- Args ----"
@@ -74,8 +74,8 @@ class App < Qmf::ConsoleHandler
 
   def main
     @settings = Qmf::ConnectionSettings.new
-    @settings.set_attr("host", ARGV[0]) if ARGV.size > 0
-    @settings.set_attr("port", ARGV[1].to_i) if ARGV.size > 1
+    @settings.host = ARGV[0] if ARGV.size > 0
+    @settings.port = ARGV[1].to_i if ARGV.size > 1
     @connection = Qmf::Connection.new(@settings)
     @qmfc = Qmf::Console.new
 
@@ -84,7 +84,7 @@ class App < Qmf::ConsoleHandler
 
     dump_schema
 
-    agents = @qmfc.get_agents()
+    agents = @qmfc.agents()
     puts "---- Agents ----"
     agents.each do |a|
       puts "  => #{a.label}"
@@ -92,23 +92,25 @@ class App < Qmf::ConsoleHandler
     puts "----"
 
     for idx in 0...20
-      blist = @qmfc.get_objects(Qmf::Query.new(:class => "broker"))
+      blist = @qmfc.objects(Qmf::Query.new(:class => "broker"))
       puts "---- Brokers ----"
       blist.each do |b|
         puts "    ---- Broker ----"
         puts "    systemRef: #{b.systemRef}"
         puts "    port     : #{b.port}"
         puts "    uptime   : #{b.uptime / 1000000000}"
+        puts "  properties : #{b.properties}"
+        puts "  statistics : #{b.statistics}"
 
         for rep in 0...1
           puts "    Pinging..."
           ret = b.echo(45, 'text string')
-          puts "        status=#{ret.status} text=#{ret.exception.asString} seq=#{ret.arguments['sequence']} body=#{ret.arguments['body']}"
+          puts "        status=#{ret.status} text=#{ret.exception.asString} seq=#{ret.args.sequence} body=#{ret.args.body}"
         end
       end
       puts "----"
 
-      qlist = @qmfc.get_objects(Qmf::Query.new(:package => "org.apache.qpid.broker",
+      qlist = @qmfc.objects(Qmf::Query.new(:package => "org.apache.qpid.broker",
                                                :class => "queue"))
       puts "---- Queues ----"
       qlist.each do |q|
diff --git a/cpp/bindings/qmf/tests/ruby_console_test.rb b/cpp/bindings/qmf/tests/ruby_console_test.rb
index 6c6547efbb..29f7be9db0 100755
--- a/cpp/bindings/qmf/tests/ruby_console_test.rb
+++ b/cpp/bindings/qmf/tests/ruby_console_test.rb
@@ -27,18 +27,18 @@ class ConsoleTest < ConsoleTestBase
     agents = []
     count = 0
     while agents.size == 0
-      agents = @qmfc.get_objects(Qmf::Query.new(:class => "agent"))
+      agents = @qmfc.objects(Qmf::Query.new(:class => "agent"))
       sleep(1)
       count += 1
       fail("Timed out waiting for remote agent") if count > 10
     end
 
-    agentList = @qmfc.get_agents
+    agentList = @qmfc.agents
     assert_equal(agentList.size, 2, "Number of agents reported by Console")
   end
 
   def test_B_basic_method_invocation
-    parents = @qmfc.get_objects(Qmf::Query.new(:class => "parent"))
+    parents = @qmfc.objects(Qmf::Query.new(:class => "parent"))
     assert_equal(parents.size, 1, "Number of 'parent' objects")
     parent = parents[0]
     for seq in 0...10
@@ -54,7 +54,7 @@ class ConsoleTest < ConsoleTestBase
   end
 
   def test_C_basic_types_numeric_big
-    parents = @qmfc.get_objects(Qmf::Query.new(:class =>"parent"))
+    parents = @qmfc.objects(Qmf::Query.new(:class =>"parent"))
     assert_equal(parents.size, 1, "Number of parent objects")
     parent = parents[0]
 
@@ -76,7 +76,7 @@ class ConsoleTest < ConsoleTestBase
   end
 
   def test_C_basic_types_numeric_small
-    parents = @qmfc.get_objects(Qmf::Query.new(:class =>"parent"))
+    parents = @qmfc.objects(Qmf::Query.new(:class =>"parent"))
     assert_equal(parents.size, 1, "Number of parent objects")
     parent = parents[0]
 
@@ -98,7 +98,7 @@ class ConsoleTest < ConsoleTestBase
   end
 
   def test_C_basic_types_numeric_negative
-    parents = @qmfc.get_objects(Qmf::Query.new(:class =>"parent"))
+    parents = @qmfc.objects(Qmf::Query.new(:class =>"parent"))
     assert_equal(parents.size, 1, "Number of parent objects")
     parent = parents[0]
 
@@ -120,7 +120,7 @@ class ConsoleTest < ConsoleTestBase
   end
 
   def test_C_basic_types_string_short
-    parents = @qmfc.get_objects(Qmf::Query.new(:class =>"parent"))
+    parents = @qmfc.objects(Qmf::Query.new(:class =>"parent"))
     assert_equal(parents.size, 1, "Number of parent objects")
     parent = parents[0]
 
@@ -148,7 +148,7 @@ class ConsoleTest < ConsoleTestBase
   end
 
   def test_C_basic_types_string_long
-    parents = @qmfc.get_objects(Qmf::Query.new(:class =>"parent"))
+    parents = @qmfc.objects(Qmf::Query.new(:class =>"parent"))
     assert_equal(parents.size, 1, "Number of parent objects")
     parent = parents[0]
 
@@ -174,7 +174,7 @@ class ConsoleTest < ConsoleTestBase
   end
 
   def test_D_userid_for_method
-    parents = @qmfc.get_objects(Qmf::Query.new(:class => "parent"))
+    parents = @qmfc.objects(Qmf::Query.new(:class => "parent"))
     assert_equal(parents.size, 1, "Number of parent objects")
     parent = parents[0]
 
diff --git a/cpp/bindings/qmf/tests/test_base.rb b/cpp/bindings/qmf/tests/test_base.rb
index 8bf433611e..80cc43a12d 100644
--- a/cpp/bindings/qmf/tests/test_base.rb
+++ b/cpp/bindings/qmf/tests/test_base.rb
@@ -25,8 +25,8 @@ require 'socket'
 class ConsoleTestBase < Qmf::ConsoleHandler
   def initialize
     @settings = Qmf::ConnectionSettings.new
-    @settings.set_attr("host", ARGV[0]) if ARGV.size > 0
-    @settings.set_attr("port", ARGV[1].to_i) if ARGV.size > 1
+    @settings.host = ARGV[0] if ARGV.size > 0
+    @settings.port = ARGV[1].to_i if ARGV.size > 1
     @connection = Qmf::Connection.new(@settings)
     @qmfc = Qmf::Console.new