ruby-dbus 0.10.0 → 0.11.0

data/test/bus_and_xml_backend_spec.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env rspec
+# Test the bus class
+require_relative "spec_helper"
+
+require 'rubygems'
+require 'nokogiri'
+require "dbus"
+
+describe "BusAndXmlBackendTest" do
+  before(:each) do
+    @bus = DBus::ASessionBus.new
+  end
+
+  it "tests introspection reading rexml" do
+    DBus::IntrospectXMLParser.backend = DBus::IntrospectXMLParser::REXMLParser
+    @svc = @bus.service("org.ruby.service")
+    obj = @svc.object("/org/ruby/MyInstance")
+    obj.default_iface = 'org.ruby.SampleInterface'
+    obj.introspect
+    # "should respond to :the_answer"
+    expect(obj.the_answer[0]).to eq(42)
+    # "should work with multiple interfaces"
+    expect(obj["org.ruby.AnotherInterface"].Reverse('foo')[0]).to eq("oof")
+  end
+
+  it "tests introspection reading nokogiri" do
+    # peek inside the object to see if a cleanup step worked or not
+    DBus::IntrospectXMLParser.backend = DBus::IntrospectXMLParser::NokogiriParser
+    @svc = @bus.service("org.ruby.service")
+    obj = @svc.object("/org/ruby/MyInstance")
+    obj.default_iface = 'org.ruby.SampleInterface'
+    obj.introspect
+    # "should respond to :the_answer"
+    expect(obj.the_answer[0]).to eq(42)
+    # "should work with multiple interfaces"
+    expect(obj["org.ruby.AnotherInterface"].Reverse('foo')[0]).to eq("oof")
+  end
+
+end

data/test/bus_driver_spec.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env rspec
+require_relative "spec_helper"
+require "dbus"
+
+describe DBus::Service do
+  let(:bus) { DBus::ASessionBus.new }
+
+  describe "#exists?" do
+    it "is true for an existing service" do
+      svc = bus.service("org.ruby.service")
+      svc.object("/").introspect # must activate the service first :-/
+      expect(svc.exists?).to be_true
+    end
+
+    it "is false for a nonexisting service" do
+      svc = bus.service("org.ruby.nosuchservice")
+      expect(svc.exists?).to be_false
+    end
+  end
+end

data/test/{bus_test.rb → bus_spec.rb}

@@ -1,19 +1,20 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 # Test the bus class
-require File.expand_path("../test_helper", __FILE__)
-require "test/unit"
+require_relative "spec_helper"
+
 require "dbus"
 
-class BusTest < Test::Unit::TestCase
-  def setup
+describe "BusTest" do
+  before(:each) do
     @bus = DBus::ASessionBus.new
     @svc = @bus.service("org.ruby.service")
     @svc.object("/").introspect
   end
 
-  def test_introspection_not_leaking
+  it "tests introspection not leaking" do
     # peek inside the object to see if a cleanup step worked or not
     some_hash = @bus.instance_eval { @method_call_replies || Hash.new }
-    assert_equal 0, some_hash.size, "there are leftover method handlers"
+    # fail: "there are leftover method handlers"
+    expect(some_hash.size).to eq(0)
   end
 end

data/test/byte_array_spec.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env rspec
+require_relative "spec_helper"
+
+require "dbus"
+
+describe "ByteArrayTest" do
+  before(:each) do
+    @bus = DBus::ASessionBus.new
+    @svc = @bus.service("org.ruby.service")
+    @obj = @svc.object("/org/ruby/MyInstance")
+    @obj.introspect
+    @obj.default_iface = "org.ruby.SampleInterface"
+  end
+
+
+  it "tests passing byte array" do
+    data = [0, 77, 255]
+    result = @obj.mirror_byte_array(data).first
+    expect(result).to eq(data)
+  end
+
+  it "tests passing byte array from string" do
+    data = "AAA"
+    result = @obj.mirror_byte_array(data).first
+    expect(result).to eq([65, 65, 65])
+  end
+
+  it "tests passing byte array from hash" do
+    # Hash is an Enumerable, but is caught earlier
+    data = { "this will" => "fail" }
+    expect { @obj.mirror_byte_array(data).first }.to raise_error(DBus::TypeException)
+  end
+
+  it "tests passing byte array from nonenumerable" do
+    data = Time.now
+    expect { @obj.mirror_byte_array(data).first }.to raise_error(DBus::TypeException)
+  end
+end

data/test/err_msg_spec.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env rspec
+# should report it missing on org.ruby.SampleInterface
+# (on object...) instead of on DBus::Proxy::ObjectInterface
+require_relative "spec_helper"
+require "dbus"
+
+describe "ErrMsgTest" do
+  before(:each) do
+    session_bus = DBus::ASessionBus.new
+    svc = session_bus.service("org.ruby.service")
+    @obj = svc.object("/org/ruby/MyInstance")
+    @obj.introspect                  # necessary
+    @obj.default_iface = "org.ruby.SampleInterface"
+  end
+
+  it "tests report dbus interface" do
+    # a specific exception...
+    # mentioning DBus and the interface
+    expect { @obj.NoSuchMethod }.to raise_error(NameError, /DBus interface.*#{@obj.default_iface}/)
+  end
+
+  it "tests report short struct" do
+    expect { @obj.test_variant ["(ss)", ["too few"] ] }.to raise_error(DBus::TypeException, /1 elements but type info for 2/)
+  end
+
+  it "tests report long struct" do
+    expect { @obj.test_variant ["(ss)", ["a", "b", "too many"] ] }.to raise_error(DBus::TypeException, /3 elements but type info for 2/)
+  end
+
+  it "tests report nil" do
+    nils = [
+            ["(s)", [nil] ],    # would get disconnected
+            ["i", nil ],
+            ["a{ss}", {"foo" => nil} ],
+           ]
+    nils.each do |has_nil|
+      # TODO want backtrace from the perspective of the caller:
+      # rescue/reraise in send_sync?
+      expect { @obj.test_variant has_nil }.to raise_error(DBus::TypeException, /Cannot send nil/)
+    end
+  end
+end

data/test/{introspect_xml_parser_test.rb → introspect_xml_parser_spec.rb}

@@ -1,10 +1,9 @@
-#!/usr/bin/env ruby
-require File.expand_path("../test_helper", __FILE__)
-require "test/unit"
+#!/usr/bin/env rspec
+require_relative "spec_helper"
 require "dbus"
 
-class IntrospectXMLParserTest < Test::Unit::TestCase
-  def test_split_interfaces
+describe "IntrospectXMLParserTest" do
+  it "tests split interfaces" do
     xml = <<EOS
 <node>
    <interface name="org.example.Foo">
@@ -22,6 +21,6 @@ EOS
     interfaces, _ = DBus::IntrospectXMLParser.new(xml).parse
 
     foo = interfaces.find {|i| i.name == "org.example.Foo" }
-    assert_equal 2, foo.methods.keys.size
+    expect(foo.methods.keys.size).to eq(2)
   end
 end

data/test/introspection_spec.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env rspec
+require_relative "spec_helper"
+require "dbus"
+
+describe "IntrospectionTest" do
+  before(:each) do
+    session_bus = DBus::ASessionBus.new
+    svc = session_bus.service("org.ruby.service")
+    @obj = svc.object("/org/ruby/MyInstance")
+    @obj.introspect
+    @obj.default_iface = "org.ruby.SampleInterface"
+  end
+
+  it "tests wrong number of arguments" do
+    expect { @obj.test_variant "too","many","args" }.to raise_error(ArgumentError)
+    # not enough
+    expect { @obj.test_variant }.to raise_error(ArgumentError)
+  end
+
+  it "tests shortcut methods" do
+    @obj.default_iface = nil
+    expect(@obj.bounce_variant("varargs")).to eq(["varargs"])
+    # test for a duplicated method name
+    expect { @obj.the_answer }.to raise_error(NoMethodError)
+    # ensure istance methods of ProxyObject aren't overwritten by remote
+    # methods
+    expect { @obj.interfaces }.not_to raise_error
+
+    @obj.default_iface = "org.ruby.SampleInterface"
+    expect(@obj.the_answer).to eq([42])
+  end
+end

data/test/{main_loop_test.rb → main_loop_spec.rb}

@@ -1,11 +1,10 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 # Test the main loop
-require File.expand_path("../test_helper", __FILE__)
-require "test/unit"
+require_relative "spec_helper"
 require "dbus"
 
-class MainLoopTest < Test::Unit::TestCase
-  def setup
+describe "MainLoopTest" do
+  before(:each) do
     @session_bus = DBus::ASessionBus.new
     svc = @session_bus.service("org.ruby.service")
     @obj = svc.object("/org/ruby/MyInstance")
@@ -40,7 +39,7 @@ class MainLoopTest < Test::Unit::TestCase
     end
   end
 
-  def test_loop_quit(delay = 1)
+  def test_loop_quit(delay)
     @obj.on_signal "LongTaskEnd" do
       DBus.logger.debug "Telling loop to quit"
       @loop.quit
@@ -72,8 +71,12 @@ class MainLoopTest < Test::Unit::TestCase
     @obj.on_signal "LongTaskEnd"
   end
 
+  it "tests loop quit" do
+    test_loop_quit 1
+  end
+
   # https://bugzilla.novell.com/show_bug.cgi?id=537401
-  def test_loop_drained_socket
+  it "tests loop drained socket" do
     test_loop_quit 0
   end
 end

data/test/property_spec.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env rspec
+require_relative "spec_helper"
+require "dbus"
+
+describe "PropertyTest" do
+  before(:each) do
+    session_bus = DBus::ASessionBus.new
+    svc = session_bus.service("org.ruby.service")
+    @obj = svc.object("/org/ruby/MyInstance")
+    @obj.introspect
+    @iface = @obj["org.ruby.SampleInterface"]
+  end
+
+  it "tests property reading" do
+    expect(@iface["ReadMe"]).to eq("READ ME")
+  end
+
+  it "tests property nonreading" do
+    expect { @iface["WriteMe"] }.to raise_error(DBus::Error, /not readable/)
+  end
+
+  it "tests property writing" do
+    @iface["ReadOrWriteMe"] = "VALUE"
+    expect(@iface["ReadOrWriteMe"]).to eq("VALUE")
+  end
+
+  # https://github.com/mvidner/ruby-dbus/pull/19
+  it "tests service select timeout" do
+    @iface["ReadOrWriteMe"] = "VALUE"
+    expect(@iface["ReadOrWriteMe"]).to eq("VALUE")
+    # wait for the service to become idle
+    sleep 6
+    # fail:  "Property value changed; perhaps the service died and got restarted"
+    expect(@iface["ReadOrWriteMe"]).to eq("VALUE")
+  end
+
+  it "tests property nonwriting" do
+    expect { @iface["ReadMe"] = "WROTE" }.to raise_error(DBus::Error, /not writable/)
+  end
+
+  it "tests get all" do
+    all = @iface.all_properties
+    expect(all.keys.sort).to eq(["ReadMe", "ReadOrWriteMe"])
+  end
+
+  it "tests unknown property reading" do
+    expect { @iface["Spoon"] }.to raise_error(DBus::Error, /not found/)
+  end
+
+  it "tests unknown property writing" do
+    expect { @iface["Spoon"] = "FPRK" }.to raise_error(DBus::Error, /not found/)
+  end
+end

data/test/server_robustness_spec.rb

@@ -0,0 +1,66 @@
+#!/usr/bin/env rspec
+# Test that a server survives various error cases
+require_relative "spec_helper"
+require "dbus"
+
+describe "ServerRobustnessTest" do
+  before(:each) do
+    @bus = DBus::ASessionBus.new
+    @svc = @bus.service("org.ruby.service")
+  end
+
+  # https://trac.luon.net/ruby-dbus/ticket/31
+  # the server should not crash
+  it "tests no such path with introspection" do
+    obj = @svc.object "/org/ruby/NotMyInstance"
+    expect { obj.introspect }.to raise_error(DBus::Error) do |e|
+      expect(e).to_not match(/timeout/)
+    end
+  end
+
+  it "tests no such path without introspection" do
+    obj = @svc.object "/org/ruby/NotMyInstance"
+    ifc = DBus::ProxyObjectInterface.new(obj, "org.ruby.SampleInterface")
+    ifc.define_method("the_answer", "out n:i")
+    expect { ifc.the_answer }.to raise_error(DBus::Error) do |e|
+      expect(e).to_not match(/timeout/)
+    end
+  end
+
+  it "tests a method that raises" do
+    obj = @svc.object "/org/ruby/MyInstance"
+    obj.introspect
+    obj.default_iface = "org.ruby.SampleInterface"
+    expect { obj.will_raise }.to raise_error(DBus::Error) do |e|
+      expect(e).to_not match(/timeout/)
+    end
+  end
+
+  it "tests a method that raises name error" do
+    obj = @svc.object "/org/ruby/MyInstance"
+    obj.introspect
+    obj.default_iface = "org.ruby.SampleInterface"
+    expect { obj.will_raise_name_error }.to raise_error(DBus::Error) do |e|
+      expect(e).to_not match(/timeout/)
+    end
+  end
+
+  # https://trac.luon.net/ruby-dbus/ticket/31#comment:3
+  it "tests no such method without introspection" do
+    obj = @svc.object "/org/ruby/MyInstance"
+    ifc = DBus::ProxyObjectInterface.new(obj, "org.ruby.SampleInterface")
+    ifc.define_method("not_the_answer", "out n:i")
+    expect { ifc.not_the_answer }.to raise_error(DBus::Error) do |e|
+      expect(e).to_not match(/timeout/)
+    end
+  end
+
+  it "tests no such interface without introspection" do
+    obj = @svc.object "/org/ruby/MyInstance"
+    ifc = DBus::ProxyObjectInterface.new(obj, "org.ruby.NoSuchInterface")
+    ifc.define_method("the_answer", "out n:i")
+    expect { ifc.the_answer }.to raise_error(DBus::Error) do |e|
+      expect(e).to_not match(/timeout/)
+    end
+  end
+end

data/test/{server_test.rb → server_spec.rb}

@@ -1,7 +1,6 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 # Test that a server survives various error cases
-require File.expand_path("../test_helper", __FILE__)
-require "test/unit"
+require_relative "spec_helper"
 require "dbus"
 
 class Foo < DBus::Object
@@ -24,28 +23,28 @@ rescue DBus::InvalidMethodName
   # raised by the preceding signal declaration
 end
 
-class ServerTest < Test::Unit::TestCase
-  def setup
+describe "ServerTest" do
+  before(:each) do
     @bus = DBus::ASessionBus.new
     @svc = @bus.request_service "org.ruby.server-test"
   end
 
-  def teardown
+  after(:each) do
     @bus.proxy.ReleaseName "org.ruby.server-test"
   end
 
-  def test_unexporting_an_object
+  it "tests unexporting an object" do
     obj = Foo.new "/org/ruby/Foo"
     @svc.export obj
-    assert @svc.unexport(obj)
+    expect(@svc.unexport(obj)).to be_true
   end
 
-  def test_unexporting_an_object_not_exported
+  it "tests unexporting an object not exported" do
     obj = Foo.new "/org/ruby/Foo"
-    assert !@svc.unexport(obj)
+    expect(@svc.unexport(obj)).to be_false
   end
 
-  def test_emiting_signals
+  it "tests emiting signals" do
     obj = Foo.new "/org/ruby/Foo"
     @svc.export obj
     obj.signal_without_arguments    

data/test/service_newapi.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
-require File.expand_path("../test_helper", __FILE__)
+require_relative "spec_helper"
 SimpleCov.command_name "Service Tests" if Object.const_defined? "SimpleCov"
 # find the library without external help
 $:.unshift File.expand_path("../../lib", __FILE__)

data/test/session_bus_spec_manual.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env rspec
+require_relative "spec_helper"
+require "dbus"
+
+describe DBus::ASessionBus do
+  context "when DBUS_SESSION_BUS_ADDRESS is unset in ENV (Issue#4)" do
+    ENV.delete "DBUS_SESSION_BUS_ADDRESS"
+
+    it "can connect" do
+      bus = DBus::ASessionBus.new
+      svc = bus.service("org.freedesktop.DBus")
+      expect(svc.exists?).to be_true
+    end
+  end
+end