rhcp 0.1.9 → 0.2.14

data/test/rhcp/context_test.rb

@@ -0,0 +1,16 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','..','lib')
+
+require 'test/unit'
+
+require 'rhcp'
+require 'rhcp/context'
+
+class ContextTest < Test::Unit::TestCase
+
+  def test_the_context
+    context = RHCP::Context.new({'nice' => 'sun'})
+    p context
+    puts context.to_s
+  end
+
+end

data/test/rhcp/dispatching_broker_test.rb

@@ -1,40 +1,34 @@
 
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+$:.unshift File.join(File.dirname(__FILE__),'..','..','lib')
 
 require 'test/unit'
-#require 'rhcp/dispatching_broker'
-#require 'rhcp/broker'
-#require 'rhcp/command'
-#require 'rhcp/command_param'
 require 'rhcp'
+require 'rhcp/tests_for_brokers'
 
 class DispatchingBrokerTest < Test::Unit::TestCase
-  
+
+  include TestsForBrokers
+
   def setup
-    @broker1 = RHCP::Broker.new()
-    @broker1.register_command RHCP::Command.new("test", "just testing (broker1)", lambda{})
-    @broker1.register_command RHCP::Command.new("test_more", "another fancy command from broker1", lambda{})
+    @broker = RHCP::Broker.new()
+
     @broker2 = RHCP::Broker.new()
+
+    @test_broker = RHCP::DispatchingBroker.new()
+    @test_broker.add_broker(@broker)
+    @test_broker.add_broker(@broker2)
+  end
+
+  def test_duplicate_commands
+    @broker.register_command RHCP::Command.new("funky_stuff", "just testing (broker1)", lambda{})
+    assert_equal 1, @test_broker.get_command_list().size()
     @broker2.register_command RHCP::Command.new("echo", "says hello (broker2)", lambda{})
     @broker2.register_command RHCP::Command.new("help", "is no help at all (broker2)", lambda{})
     @broker2.register_command RHCP::Command.new("red button", "don't press it (broker2)", lambda{})
-  end
-  
-  def test_add_brokers
-    dispatcher = RHCP::DispatchingBroker.new()
-    assert_not_nil dispatcher
-    assert_equal 0, dispatcher.get_command_list.size
-    dispatcher.add_broker(@broker1)
-    assert_equal 2, dispatcher.get_command_list.size
-    dispatcher.add_broker(@broker2)    
-    assert_equal 5, dispatcher.get_command_list.size
-  end
-  
-  def test_duplicate_commands
-    dispatcher = RHCP::DispatchingBroker.new()
-    dispatcher.add_broker(@broker1)
-    assert_equal 2, dispatcher.get_command_list.size
-    assert_raise(RHCP::RhcpException) { dispatcher.add_broker(@broker1) }
+    assert_equal 4, @test_broker.get_command_list().size()
+
+    assert_raise(RHCP::RhcpException) { @test_broker.add_broker(@broker2) }
+    #assert_equal 4, @test_broker.get_command_list().size()
   end
   
 end

data/test/rhcp/http_broker_test.rb

@@ -0,0 +1,33 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','..','lib')
+
+require 'test/unit'
+require 'rhcp'
+
+require 'test/unit'
+require 'rhcp/tests_for_brokers'
+
+class HttpBrokerTest < Test::Unit::TestCase
+
+  include TestsForBrokers
+
+  def self.suite
+    @@broker = RHCP::Broker.new()
+
+    @@exporter = RHCP::HttpExporter.new(@@broker, :port => 42001)
+    @@exporter.start()
+    super
+  end
+
+  def setup
+    RHCP::ModuleHelper.instance.logger.level = Logger::DEBUG
+    $logger.level = Logger::DEBUG
+    @broker = @@broker
+    @broker.clear
+    url = URI.parse("http://localhost:42001")
+    @test_broker = RHCP::Client::HttpBroker.new(url)
+    #@test_broker = RHCP::Client::ContextAwareBroker.new(broker)
+  end
+
+  # TODO test with a real second VM
+
+end

data/test/rhcp/http_exporter_test.rb

@@ -1,12 +1,13 @@
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+$:.unshift File.join(File.dirname(__FILE__),'..','..','lib')
 
+require 'test_base'
 require 'test/unit'
 require 'net/http'
 
 require 'rhcp'
 
-class HttpExporterTest < Test::Unit::TestCase
-  
+
+class HttpExporterTest < TestBase
   
   def self.suite    
     puts "gonna setup"
@@ -20,6 +21,10 @@ class HttpExporterTest < Test::Unit::TestCase
         }))
     )
     
+    command = RHCP::Command.new("host_command", "a test command that is enabled for hosts only", lambda {})
+    command.enabled_through_context_keys = ['host']
+    broker.register_command command
+    
     @@broker = broker
 
     # TODO test other setup options
@@ -55,7 +60,7 @@ class HttpExporterTest < Test::Unit::TestCase
     assert_equal "200", res.code
     commands = JSON.parse(res.body)
     
-    # +commands+ is an array => convert it back to a has
+    # +commands+ is an array => convert it back to a hash
     command_hash = Hash.new()
     commands.each do |command_string|
       command = RHCP::Client::CommandStub.reconstruct_from_json(command_string)
@@ -66,8 +71,33 @@ class HttpExporterTest < Test::Unit::TestCase
     assert_kind_of RHCP::Command, command_hash["reverse"]
   end
   
+  # we should be able to activate another command by setting the 'host' context cookie
+  def test_get_commands_with_context
+    context = RHCP::Context.new()
+    context.cookies['host'] = 'deepthought'
+    
+    res = Net::HTTP.new(@url.host, @url.port).start { |http| http.post("/rhcp/get_commands", context.to_json) }   
+    
+    assert_equal "200", res.code
+    commands = JSON.parse(res.body)
+    
+    # +commands+ is an array => convert it back to a hash
+    command_hash = Hash.new()
+    commands.each do |command_string|
+      command = RHCP::Client::CommandStub.reconstruct_from_json(command_string)
+      command_hash[command.name] = command
+    end
+    
+    assert_equal [ "test", "reverse", "host_command" ].sort, command_hash.keys.sort
+  end
+  
   def test_get_lookup_values
-    res = Net::HTTP.new(@url.host, @url.port).start { |http| http.get("/rhcp/get_lookup_values?command=reverse&param=input") }   
+    context = RHCP::Context.new()
+    context.cookies['host'] = 'deepthought'
+    command = RHCP::Command.new('reverse', '', lambda { |req,res|})
+    request = RHCP::Request.new(command, {}, context)
+    
+    res = Net::HTTP.new(@url.host, @url.port).start { |http| http.post("/rhcp/get_lookup_values?command=reverse&param=input", request.to_json) }
     puts res.body
     assert_equal "200", res.code
     lookups = JSON.parse(res.body)
@@ -75,11 +105,16 @@ class HttpExporterTest < Test::Unit::TestCase
   end
   
   def test_get_lookup_values_invalid_command
-    res = Net::HTTP.new(@url.host, @url.port).start { |http| http.get("/rhcp/get_lookup_values?command=do_the_twist") }   
+    context = RHCP::Context.new()
+    context.cookies['host'] = 'deepthought'
+    command = RHCP::Command.new('do_the_twist', '', lambda { |req,res|})
+    request = RHCP::Request.new(command, {}, context)
+
+    res = Net::HTTP.new(@url.host, @url.port).start { |http| http.post("/rhcp/get_lookup_values?command=do_the_twist", request.to_json ) }
     puts "error response #{res.body}"
     assert_equal "500", res.code
-    result = JSON.parse(res.body)
-    assert(/^no such command/.match(result[0]))
+    response = RHCP::Response.reconstruct_from_json(res.body)
+    assert(/^no such command/.match(response.error_text))
   end
   
   def test_get_lookup_values_without_params
@@ -88,7 +123,9 @@ class HttpExporterTest < Test::Unit::TestCase
     assert_equal "500", res.code    
   end
   
+  # TODO reactivate
   def test_get_lookup_values_partial
+    return
     res = Net::HTTP.new(@url.host, @url.port).start { |http| http.get("/rhcp/get_lookup_values?command=reverse&param=input&partial=zap") }   
     puts res.body
     assert_equal "200", res.code

data/test/rhcp/http_test_server.rb

@@ -8,7 +8,13 @@ require 'logger'
 $logger = Logger.new($stdout)
 
 broker = RHCP::Broker.new()
-broker.register_command(RHCP::Command.new("test", "just a test command", lambda { |req,res| "testing" }))
+test_command = RHCP::Command.new("test", "just a test command", lambda { |req,res| "testing" })
+broker.register_command(test_command)
+
+hello_command = RHCP::Command.new("hello", "another test command", lambda { |req, res| "hello world" })
+hello_command.mark_as_read_only()
+broker.register_command(hello_command)
+
 broker.register_command(
   RHCP::Command.new("reverse", "reversing input strings", 
     lambda { |req,res| req.get_param_value("input").reverse }
@@ -30,8 +36,23 @@ broker.register_command RHCP::Command.new("cook", "cook something nice out of so
       }
   )
 )
+
+def colorize(text, color_code)
+  "\e[#{color_code}m#{text}\e[0m"
+end
+
+def red(text)
+  colorize(text, 31)
+end
+
+def green(text)
+  colorize(text, 32)
+end
+
+
 command = RHCP::Command.new("list_stuff", "this command lists stuff", 
   lambda { |req,res|
+    res.set_context({"prompt" => green("what have the romans brought us $ ")})
     [ "peace", "aquaeduct", "education" ]
   }
 )
@@ -54,7 +75,25 @@ command.result_hints[:overview_columns] = [ "the_first_name", "last_name" ]
 command.result_hints[:column_titles] = [ "First Name", "Last Name" ]
 broker.register_command command
 
-exporter = RHCP::HttpExporter.new(broker, :port => 42000)
+logging_broker = RHCP::LoggingBroker.new(broker)
+context_aware_broker = RHCP::Client::ContextAwareBroker.new(logging_broker)
+
+complicated_command = RHCP::Command.new("complicated", "just testing",
+  lambda { |req, res|
+    request = RHCP::Request.new(test_command, Hash.new())
+    context_aware_broker.execute(request)
+
+    hello_request = RHCP::Request.new(hello_command, Hash.new())
+    context_aware_broker.execute(hello_request)
+
+    hello_request2 = RHCP::Request.new(hello_command, Hash.new())
+    context_aware_broker.execute(hello_request2)
+  }
+)
+broker.register_command complicated_command
+
+
+exporter = RHCP::HttpExporter.new(logging_broker, :port => 42000)
 
 trap("INT") {
   exporter.stop

data/test/rhcp/logging_broker_test.rb

@@ -0,0 +1,22 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','..','lib')
+
+require 'test/unit'
+require 'rhcp'
+
+require 'test/unit'
+require 'rhcp/tests_for_brokers'
+require 'rhcp/tests_for_writable_brokers'
+
+class LoggingBrokerTest < Test::Unit::TestCase
+
+  include TestsForBrokers
+  include TestsForWritableBrokers
+
+  def setup
+    broker = RHCP::Broker.new()
+
+    @broker = broker
+    @test_broker = RHCP::LoggingBroker.new(broker)
+  end
+
+end

data/test/rhcp/request_test.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+$:.unshift File.join(File.dirname(__FILE__),'..','..','lib')
 
 require 'test/unit'
 require 'rhcp'
@@ -46,33 +46,11 @@ class RequestTest < Test::Unit::TestCase
     assert ! request.has_param_value("third_param")
   end
   
-  def test_invalid_param_name
-    command = RHCP::Command.new("test", "another test", lambda {})
-    command.add_param(RHCP::CommandParam.new("real_param", "this param does exist"))
-    assert_not_nil RHCP::Request.new(command, { "real_param" =>  [ "value for the real param" ] })
-    assert_raise(RHCP::RhcpException) { RHCP::Request.new(command, { 
-          "does_not_exist" =>  [ "single value for non-existing param" ]
-    }) }
-  end
-  
-  def test_invalid_param_values
-    command = RHCP::Command.new("test", "another test", lambda {})
-    command.add_param(RHCP::CommandParam.new("real_param", "this param does exist"))
-    assert_raise(RHCP::RhcpException) { RHCP::Request.new(command, { 
-          "real_param" =>  [ "value for the real param", "another value for the real param" ]
-    }) }
-  end
-  
-  def test_missing_mandatory_param
+  def test_partial_request
     command = RHCP::Command.new("test", "another test", lambda {})
     command.add_param(RHCP::CommandParam.new("first_param", "this is the first param", { :mandatory => true }))
-    command.add_param(RHCP::CommandParam.new("second_param", "this param is optional", { :mandatory => false }))
-    
-    # test1 : we should not have to specify optional parameters
-    assert_not_nil RHCP::Request.new(command, { "first_param" => [ "bla" ]})
-    
-    # test2 : but we need to specify mandatory params
-    assert_raise(RHCP::RhcpException) { RHCP::Request.new(command, {})}
+    partial_request = RHCP::Request.new(command, {})
+    assert_not_nil partial_request
   end
   
   def test_json
@@ -86,7 +64,10 @@ class RequestTest < Test::Unit::TestCase
       { 
         "first_param" => ["foo"],
         "second_param" => ["foo", "bar", "baz"]
-      }
+      },
+      RHCP::Context.new({
+        "juliet" => "naked"
+      })
     )
     json = r.to_json
     puts "request as JSON : >>#{json}<<"
@@ -95,6 +76,7 @@ class RequestTest < Test::Unit::TestCase
     assert_instance_of RHCP::Request, r2
     assert_equal r.command, r2.command
     assert_equal r.param_values, r2.param_values
+    assert_equal r.context.cookies, r2.context.cookies
   end
   
   def test_execute
@@ -120,5 +102,59 @@ class RequestTest < Test::Unit::TestCase
     assert_not_nil res
     assert_equal "***lucky bastard***", res.data
   end
+
+  def test_request_with_context
+    command = RHCP::Command.new("gimme_context", "you provide the food, i provide the context", lambda { |req,res| req.get_param_value("the_host") })
+    command.add_param(RHCP::CommandParam.new("the_host", "the value that will be filled throught the context", {
+      :mandatory => true,
+      :autofill_context_key => 'host'
+    }))
+    command.add_param(RHCP::CommandParam.new("second_param", "second param", {
+      :mandatory => true
+    }))
+
+    r= RHCP::Request.new(
+      command,
+      {
+        "the_host" => "deepthought",
+        "second_param" => "bla"
+      }
+    )
+    res = r.execute()
+    assert_not_nil res
+    assert_equal "deepthought", res.data
+
+    
+    r= RHCP::Request.new(
+      command, 
+      {"second_param" => "bla"},
+      RHCP::Context.new({'host' => "endeavour"})
+    )
+    res = r.execute()
+    assert_not_nil res
+    assert_equal "endeavour", res.data
+  end
+
+  # if a parameter is specified both in the context and in the parameter values,
+  # the parameter values shall rule
+  def test_param_values_context_precedence
+    command = RHCP::Command.new("gimme_context", "you provide the food, i provide the context", lambda { |req,res| req.get_param_value("the_host") })
+    command.add_param(RHCP::CommandParam.new("the_host", "the value that will be filled throught the context", {
+      :mandatory => true,
+      :autofill_context_key => 'host'
+    }))
+    command.add_param(RHCP::CommandParam.new("second_param", "second param", {
+      :mandatory => true
+    }))
+
+    r= RHCP::Request.new(
+      command,
+      {"second_param" => "bla", "the_host" => "deepthought"},
+      RHCP::Context.new({'host' => "endeavour"})
+    )
+    res = r.execute()
+    assert_not_nil res
+    assert_equal "deepthought", res.data
+  end
   
 end

data/test/rhcp/response_test.rb

@@ -1,9 +1,4 @@
-# 
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
- 
-
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+$:.unshift File.join(File.dirname(__FILE__),'..','..','lib')
 
 require 'test/unit'
 require 'rhcp/response'
@@ -41,5 +36,20 @@ class ResponseTest < Test::Unit::TestCase
     assert_equal "things got really fucked up", r2.error_detail
     assert_equal "some data", r2.data
   end
+
+  def test_with_context
+    response = RHCP::Response.new()
+    response.set_payload("some data")
+    response.set_context({'cookies' => 'good'})
+    assert_equal 'good', response.context['cookies']
+  end
+
+  def test_json_with_context
+    response = RHCP::Response.new()
+    response.set_payload("some data")
+    response.set_context({'cookies' => 'good'})
+    r2 = RHCP::Response.reconstruct_from_json(response.to_json())
+    assert_equal response.context, r2.context
+  end
   
 end