omf_rc 6.0.2.pre.2 → 6.0.2

data/test/omf_rc/resource_proxy/abstract_resource_spec.rb

@@ -1,108 +1,135 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'em/minitest/spec'
 require 'omf_rc/resource_factory'
-require 'blather'
 
 include OmfRc::ResourceProxy
 
 module OmfRc::ResourceProxy
-  module Node
+  module Parent
     include OmfRc::ResourceProxyDSL
-    register_proxy :node
-
-    request :name
-    configure :name
-  end
+    register_proxy :parent
 
-  module Interface
-    include OmfRc::ResourceProxyDSL
-    register_proxy :interface
+    request :test_exception do
+      raise StandardError
+    end
   end
 
-  module Wifi
+  module Child
     include OmfRc::ResourceProxyDSL
-    register_proxy :wifi
+    register_proxy :child, create_by: :parent
+    property :p1
   end
 
-  module Mock
+  module RandomResource
     include OmfRc::ResourceProxyDSL
-    register_proxy :mock
+    register_proxy :random_resource, create_by: :nobody
   end
 end
 
 describe AbstractResource do
   before do
-    @xmpp = MiniTest::Mock.new
-    @xmpp.expect(:subscribe, true, [String])
-    OmfCommon.stub :comm, @xmpp do
-      @node = OmfRc::ResourceFactory.new(:node, { hrn: 'default_node' }, { create_children_resources: true })
+    # Things we need to mock
+    # * communicator
+    # * topic
+    # * calling communicator callbacks
+    @comm = mock
+    @topics = {
+      parent: OmfCommon::Comm::Topic.create(:parent),
+      child:  OmfCommon::Comm::Topic.create(:child)
+    }
+    [:inform, :publish, :unsubscribe].each do |m_name|
+      OmfCommon::Comm::Topic.any_instance.stubs(m_name)
+    end
+
+    # Return child topic by default unless specified
+    @comm.stubs(:create_topic).returns(@topics[:child])
+
+    [:parent, :child].each do |t_name|
+      @topics[t_name].stubs(:address).returns("xmpp://localhost/#{t_name.to_s}")
+      @comm.stubs(:create_topic).with("xmpp://localhost/#{t_name}").returns(@topics[t_name])
+    end
+
+    @comm.class_eval do
+      define_method(:subscribe) do |*args, &block|
+        block.call(self.create_topic("xmpp://localhost/#{args[0]}"))
+      end
     end
+
+    OmfCommon.stubs(:comm).returns(@comm)
+    @parent = OmfRc::ResourceFactory.create(:parent, { uid: :parent, hrn: 'default_node' }, { create_children_resources: true })
   end
 
-  describe "when intialised" do
-    it "must convert configuration hash into instance methods, and assign the values" do
-      @node.type.must_equal :node
+  after do
+    @comm.class_eval do
+      undef_method(:subscribe)
+    end
+    OmfCommon.unstub(:comm)
+    [:inform, :publish, :unsubscribe].each do |m_name|
+      OmfCommon::Comm::Topic.any_instance.unstub(m_name)
     end
+    @parent = nil
+  end
 
-    it "must have an unique id generated" do
-      @node.uid.must_match /.{8}-.{4}-.{4}-.{4}-.{12}/
-      @node.request_uid.must_match /.{8}-.{4}-.{4}-.{4}-.{12}/
+  describe "when created itself (bootstrap)" do
+    it "must have an unique id generated if not given" do
+      OmfRc::ResourceFactory.create(:parent).uid.must_match /.{8}-.{4}-.{4}-.{4}-.{12}/
     end
 
-    it "could keep state inside 'property' instnace variable" do
-      @node.property.bob = "test"
-      @node.property.bob.must_equal "test"
+    it "must be able to keep state inside 'property' instnace variable" do
+      @parent.property.bob = "test"
+      @parent.property.bob.must_equal "test"
     end
 
     it "must be able to access creation options" do
-      @node.creation_opts[:create_children_resources].must_equal true
+      @parent.creation_opts[:create_children_resources].must_equal true
     end
-  end
 
-  describe "when asked to create another resource" do
-    it "must return the newly created resource" do
-      OmfCommon.stub :comm, @xmpp do
-        @xmpp.expect(:subscribe, true, [String])
-        @node.create(:interface).must_be_kind_of AbstractResource
-      end
+    it "must returned all the properties can be requested & configured" do
+      @parent.request_available_properties.configure.must_equal [:membership]
+      @parent.request_available_properties.request.must_equal(
+        [:test_exception, :supported_children_type, :uid, :type, :hrn, :name, :membership, :child_resources]
+      )
     end
 
-    it "must add the resource to its created resource list" do
-      skip
-      OmfCommon.stub :comm, @xmpp do
-        @xmpp.expect(:subscribe, true, [String])
-        child = @node.create(:wifi, { hrn: 'default_wifi' })
-        @node.children.must_include child
-        @node.request_child_resources.find { |v| v.uid == child.uid }.name.must_equal 'default_wifi'
-      end
+    it "must return types of child resources it can create" do
+      @parent.request_supported_children_type.must_include :child
     end
-  end
 
-  describe "when destroyed" do
-    it "must destroy itself together with any resources created by it" do
-      skip
-      OmfCommon.stub :comm, @xmpp do
-        @xmpp.expect(:delete_topic, nil)
-        @xmpp.expect(:subscribe, true, [String])
-        child = @node.create(:wifi, { hrn: 'default_wifi' })
-        @node.children.wont_be_empty
-        @node.release(child.uid)
-        @node.children.must_be_empty
-      end
+    it "must be able to query core properties" do
+      @parent.request_type.must_equal :parent
+      @parent.request_name.must_equal 'default_node'
+      @parent.request_hrn.must_equal 'default_node'
+      @parent.request_membership.must_equal []
+    end
+
+    it "must be able to configure membership (join group)" do
+      @parent.configure_membership(:test_group)
+      @parent.request_membership.must_include :test_group
     end
   end
 
-  describe "when asked for the funcitonalities it supports" do
-    it "must returned all the properties can be requested & configured" do
-      @node.request_available_properties.must_be_kind_of Hashie::Mash
-      @node.request_available_properties.configure.must_include :name
-      @node.request_available_properties.request.must_include :name
+  describe "when parent asked to create child resource" do
+    it "must return the newly created resource add the resource to its created resource list" do
+      child = @parent.create(:child)
+      @parent.children.must_include child
+      @parent.request_child_resources.must_include({ uid: child.uid, address: child.resource_address })
     end
 
-    it "must be able to request and configure some common properties" do
-      @node.request_hrn.must_equal 'default_node'
-      @node.configure_hrn('bob')
-      @node.request_hrn.must_equal 'bob'
+    it "must raise error if child is not designed to be created by parent" do
+      lambda { @parent.create(:random_resource) }.must_raise StandardError
+    end
+  end
+
+  describe "when parent asked to release child resource" do
+    it "must release the child resource" do
+      child = @parent.create(:child)
+      @parent.release(child.uid).must_equal child
+      @parent.children.must_be_empty
     end
   end
 
@@ -121,30 +148,30 @@ describe AbstractResource do
       skip
       # FIXME
       @xmpp.stub :publish, proc { |replyto, message| message.valid?.must_equal true} do
-        @node.inform(:creation_ok, res_id: 'bob', cid: 'id', replyto: 'topic')
-        @node.inform(:released, res_id: 'bob', cid: 'id', replyto: 'topic')
-        @node.inform(:status, status: { key: 'value' }, cid: 'id', replyto: 'topic')
-        @node.inform(:creation_ok, res_id: 'bob', cid: 'id', replyto: 'topic')
-        @node.inform(:warn, 'going to fail')
-        @node.inform(:error, 'failed')
-        @node.inform(:warn, Exception.new('going to fail'))
-        @node.inform(:error, Exception.new('failed'))
-        @node.inform(:creation_failed, Exception.new('failed'))
+        @parent.inform(:creation_ok, res_id: 'bob', cid: 'id', replyto: 'topic')
+        @parent.inform(:released, res_id: 'bob', cid: 'id', replyto: 'topic')
+        @parent.inform(:status, status: { key: 'value' }, cid: 'id', replyto: 'topic')
+        @parent.inform(:creation_ok, res_id: 'bob', cid: 'id', replyto: 'topic')
+        @parent.inform(:warn, 'going to fail')
+        @parent.inform(:error, 'failed')
+        @parent.inform(:warn, Exception.new('going to fail'))
+        @parent.inform(:error, Exception.new('failed'))
+        @parent.inform(:creation_failed, Exception.new('failed'))
       end
 
-      lambda { @node.inform(:creation_failed, 'bob') }.must_raise ArgumentError
-      lambda { @node.inform(:creation_ok, 'topic') }.must_raise ArgumentError
-      lambda { @node.inform(:status, 'topic') }.must_raise ArgumentError
+      lambda { @parent.inform(:creation_failed, 'bob') }.must_raise ArgumentError
+      lambda { @parent.inform(:creation_ok, 'topic') }.must_raise ArgumentError
+      lambda { @parent.inform(:status, 'topic') }.must_raise ArgumentError
     end
 
     it "must be able to connect & disconnect" do
       skip
       Blather::Client.stub :new, @client do
         Blather::Stream::Client.stub(:start, @client) do
-          @node = OmfRc::ResourceFactory.new(:node, { hrn: 'default_node', user: 'bob', password: 'pw', server: 'example.com'}, @xmpp)
+          @parent = OmfRc::ResourceFactory.create(:node, { hrn: 'default_node', user: 'bob', password: 'pw', server: 'example.com'}, @xmpp)
           @client.stub(:connected?, true) do
-            @node.connect
-            @node.comm.conn_info.must_equal({proto: :xmpp, user: 'bob', doamin: 'example.com'})
+            @parent.connect
+            @parent.comm.conn_info.must_equal({proto: :xmpp, user: 'bob', doamin: 'example.com'})
           end
         end
       end
@@ -154,19 +181,54 @@ describe AbstractResource do
   describe "when request/configure property not pre-defined in proxy" do
     it "must try property hash" do
       skip
-      @node.property[:bob] = "bob"
-      @node.property[:false] = false
+      @parent.property[:bob] = "bob"
+      @parent.property[:false] = false
 
-      @node.methods.must_include :request_bob
-      @node.methods.must_include :configure_bob
+      @parent.methods.must_include :request_bob
+      @parent.methods.must_include :configure_bob
 
-      @node.request_bob.must_equal "bob"
-      @node.request_false.must_equal false
+      @parent.request_bob.must_equal "bob"
+      @parent.request_false.must_equal false
+
+      @parent.configure_bob("not_bob")
+      @parent.request_bob.must_equal "not_bob"
+      proc { @parent.request_bobs_cousin }.must_raise OmfRc::UnknownPropertyError
+      proc { @parent.bobs_cousin }.must_raise NoMethodError
+    end
+  end
+
+  describe "when FRCP incoming messages received" do
+    before do
+      @create_msg = OmfCommon::Message.create(:create, { uid: 'child_001', type: :child, p1: 'p1_value' })
+      @configure_msg = OmfCommon::Message.create(:configure, { p1: 'p1_value' })
+      @request_msg = OmfCommon::Message.create(:request, { name: nil })
+      @release_msg = OmfCommon::Message.create(:release, {}, { res_id: 'child_001' })
+    end
+
+    it "must accept FRCP messages" do
+      @parent.process_omf_message(@request_msg, @topics[:parent])
+    end
+
+    it "must resuce exception if occured" do
+      @parent.process_omf_message(OmfCommon::Message.create(:request, { test_exception: nil }), @topics[:parent])
+    end
+
+    it "must handle CREATE/RELEASE message" do
+      @parent.handle_message(@create_msg, @parent)
+      @parent.request_child_resources.must_include({ uid: 'child_001', address: 'xmpp://localhost/child' })
+
+      @parent.handle_message(@release_msg, @parent)
+      @parent.request_child_resources.wont_include({ uid: 'child_001', address: 'xmpp://localhost/child' })
+    end
+
+    it "must handle REQUEST message" do
+      @parent.handle_message(@request_msg, @parent.create(:child))
+    end
 
-      @node.configure_bob("not_bob")
-      @node.request_bob.must_equal "not_bob"
-      proc { @node.request_bobs_cousin }.must_raise OmfRc::UnknownPropertyError
-      proc { @node.bobs_cousin }.must_raise NoMethodError
+    it "must handle CONFIGURE message" do
+      c = @parent.create(:child)
+      @parent.handle_message(@configure_msg, c)
+      c.request_p1.must_equal 'p1_value'
     end
   end
 end

data/test/omf_rc/resource_proxy/application_spec.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_rc/resource_proxy/application'
 
@@ -10,7 +15,7 @@ describe OmfRc::ResourceProxy::Application do
     @xmpp.expect(:publish, true, [String, OmfCommon::Message])
 
     OmfCommon.stub :comm, @xmpp do
-      @app_test = OmfRc::ResourceFactory.new(:application, { hrn: 'an_application' })
+      @app_test = OmfRc::ResourceFactory.create(:application, { hrn: 'an_application' })
     end
   end
 
@@ -186,27 +191,21 @@ describe OmfRc::ResourceProxy::Application do
       end
     end
 
-    it "must switch its state to :completed if the event is of a type 'DONE' and the application is not installing itself" do
+    it "must switch its state to :completed if the event is of a type 'EXIT' and the application is not installing itself" do
       skip
       OmfCommon.stub :comm, @xmpp do
         @app_test.stub :inform, true do
-          @app_test.on_app_event('DONE.OK', 'app_instance_id', 'Some text here')
-          @app_test.request_state.to_sym.must_equal :completed
-        end
-      end
-      OmfCommon.stub :comm, @xmpp do
-        @app_test.stub :inform, true do
-          @app_test.on_app_event('DONE.ERROR', 'app_instance_id', 'Some text here')
+          @app_test.on_app_event('EXIT', 'app_instance_id', 'Some text here')
           @app_test.request_state.to_sym.must_equal :completed
         end
       end
     end
 
-    it "must set installed property to true if the event is 'DONE.OK' and the application was installing itself" do
+    it "must set installed property to true if the event is 'EXIT' and the application was installing itself" do
       skip
       OmfCommon.stub :comm, @xmpp do
         @app_test.stub :inform, true do
-          @app_test.on_app_event('DONE.OK', 'app_instance_id_INSTALL', 'Some text here')
+          @app_test.on_app_event('EXIT', 'app_instance_id_INSTALL', 'Some text here')
           @app_test.request_state.to_sym.must_equal :stopped
           @app_test.request_installed.must_equal true
         end

data/test/omf_rc/resource_proxy/node_spec.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_rc/resource_proxy/node'
 
@@ -7,7 +12,7 @@ describe OmfRc::ResourceProxy::Node do
     @xmpp.expect(:subscribe, true, [String])
 
     OmfCommon.stub :comm, @xmpp do
-      @node = OmfRc::ResourceFactory.new(:node, hrn: 'node_test')
+      @node = OmfRc::ResourceFactory.create(:node, hrn: 'node_test')
     end
   end
 

data/test/omf_rc/resource_proxy_dsl_spec.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_rc/resource_proxy_dsl'
 
@@ -9,7 +14,9 @@ describe OmfRc::ResourceProxyDSL do
     module OmfRc::Util::MockUtility
       include OmfRc::ResourceProxyDSL
 
-      property :mock_prop, :default => 1
+      property :mock_prop, default: 1
+      property :read_only_prop, default: 1, access: :read_only
+      property :init_only_prop, default: 1, access: :init_only
 
       configure :alpha
 
@@ -79,7 +86,7 @@ describe OmfRc::ResourceProxyDSL do
           OmfRc::ResourceProxy::MockProxy.method_defined?(m.to_sym).must_equal true
         end
 
-        mock_proxy = OmfRc::ResourceFactory.new(:mock_proxy)
+        mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy)
         mock_proxy.request_alpha.must_equal mock_proxy.uid
         mock_proxy.request_delta.must_equal "printing"
         mock_proxy.request_charlie.must_equal "working on printing"
@@ -111,18 +118,36 @@ describe OmfRc::ResourceProxyDSL do
     it "must check new proxy's create_by option when ask a proxy create a new proxy" do
       OmfCommon.stub :comm, @xmpp do
         @xmpp.expect(:subscribe, true, [String])
-        OmfRc::ResourceFactory.new(:mock_root_proxy).create(:mock_proxy)
+        OmfRc::ResourceFactory.create(:mock_root_proxy).create(:mock_proxy)
         2.times { @xmpp.expect(:subscribe, true, [String]) }
-        OmfRc::ResourceFactory.new(:mock_root_proxy).create(:useless_proxy)
+        OmfRc::ResourceFactory.create(:mock_root_proxy).create(:useless_proxy)
         2.times { @xmpp.expect(:subscribe, true, [String]) }
-        lambda { OmfRc::ResourceFactory.new(:useless_proxy).create(:mock_proxy) }.must_raise StandardError
+        lambda { OmfRc::ResourceFactory.create(:useless_proxy).create(:mock_proxy) }.must_raise StandardError
       end
     end
 
     it "must be able to define property with default vlaue" do
       OmfCommon.stub :comm, @xmpp do
-        mock_proxy = OmfRc::ResourceFactory.new(:mock_proxy)
+        mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy)
         mock_proxy.property.mock_prop.must_equal 1
+        mock_proxy.request_mock_prop.must_equal 1
+        mock_proxy.configure_mock_prop(2)
+        mock_proxy.request_mock_prop.must_equal 2
+      end
+    end
+
+
+    it "must define associate methods when access option given to property definition" do
+      OmfCommon.stub :comm, @xmpp do
+        mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy)
+        # Ready only
+        mock_proxy.request_read_only_prop.must_equal 1
+        lambda { mock_proxy.init_read_only_prop }.must_raise NoMethodError
+        lambda { mock_proxy.configure_read_only_prop }.must_raise NoMethodError
+        # Init only
+        mock_proxy.request_init_only_prop.must_equal 1
+        lambda { mock_proxy.init_init_only_prop }.must_raise NoMethodError
+        lambda { mock_proxy.configure_init_only_prop }.must_raise NoMethodError
       end
     end
   end

data/test/omf_rc/util/common_tools_spec.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_rc/util/common_tools'
 
@@ -17,7 +22,7 @@ describe OmfRc::Util::CommonTools do
 
     it "must be able to log and inform error/warn messages" do
       OmfCommon.stub :comm, @xmpp do
-        @test = OmfRc::ResourceFactory.new(:test)
+        @test = OmfRc::ResourceFactory.create(:test)
         2.times { @xmpp.expect(:publish, true, [String, OmfCommon::Message]) }
         @test.log_inform_error "bob"
         @test.log_inform_warn "bob"

data/test/omf_rc/util/ip_spec.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'minitest/mock'
 require 'test_helper'
 
@@ -18,7 +23,7 @@ describe OmfRc::Util::Ip do
       @command = MiniTest::Mock.new
 
       OmfCommon.stub :comm, @xmpp do
-        @wlan00 = OmfRc::ResourceFactory.new(:ip_test, hrn: 'wlan00')
+        @wlan00 = OmfRc::ResourceFactory.create(:ip_test, hrn: 'wlan00')
       end
     end
 
@@ -44,8 +49,9 @@ describe OmfRc::Util::Ip do
       end
     end
 
-    it "could configure the device's prorperty" do
-      lambda { @wlan00.configure_ip_addr("192.168.1.124/24") }.must_raise Cocaine::ExitStatusError
+    it "could configure the device's property" do
+      # cdw: disabled this call since it actually tried to run "ip" on my system !?
+      # lambda { @wlan00.configure_ip_addr("192.168.1.124/24") }.must_raise Cocaine::ExitStatusError
       Cocaine::CommandLine.stub(:new, @command) do
         3.times do
           @command.expect(:run, "")

data/test/omf_rc/util/iw_spec.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'minitest/mock'
 require 'test_helper'
 require 'cocaine'
@@ -15,15 +20,20 @@ Cocaine::CommandLine.stub(:new, @command) do
 
         module OmfRc::ResourceProxy::IwTest
           include OmfRc::ResourceProxyDSL
+
           register_proxy :iw_test
+
           utility :iw
+
+          property :if_name
+          property :phy
         end
 
         @xmpp = MiniTest::Mock.new
         @xmpp.expect(:subscribe, true, [String])
 
         OmfCommon.stub :comm, @xmpp do
-          @wlan00 = OmfRc::ResourceFactory.new(:iw_test, hrn: 'wlan00', property: { phy: 'phy00', if_name: 'wlan1' })
+          @wlan00 = OmfRc::ResourceFactory.create(:iw_test, hrn: 'wlan00', property: { phy: 'phy00', if_name: 'wlan1' })
         end
       end
 
@@ -49,7 +59,7 @@ Cocaine::CommandLine.stub(:new, @command) do
         end
       end
 
-      it "could configure the device's prorperty" do
+      it "could configure the device's property" do
         Cocaine::CommandLine.stub(:new, @command) do
           @command.expect(:run, true)
           @wlan00.configure_power_save(true)
@@ -59,14 +69,14 @@ Cocaine::CommandLine.stub(:new, @command) do
 
       it "must could initialise wpa config/pid file path" do
         @wlan00.init_ap_conf_pid
-        @wlan00.property.ap_conf.must_match /tmp\/hostapd\.wlan1.+\.conf/
-        @wlan00.property.ap_pid.must_match /tmp\/hostapd\.wlan1.+\.pid/
+        @wlan00.property.ap_conf.must_match /\/hostapd\.wlan1.+\.conf/
+        @wlan00.property.ap_pid.must_match /\/hostapd\.wlan1.+\.pid/
       end
 
       it "must could initialise wpa config/pid file path" do
         @wlan00.init_wpa_conf_pid
-        @wlan00.property.wpa_conf.must_match /tmp\/wpa\.wlan1.+\.conf/
-        @wlan00.property.wpa_pid.must_match /tmp\/wpa\.wlan1.+\.pid/
+        @wlan00.property.wpa_conf.must_match /\/wpa\.wlan1.+\.conf/
+        @wlan00.property.wpa_pid.must_match /\/wpa\.wlan1.+\.pid/
       end
 
       it "could delete current interface" do

data/test/omf_rc/util/mod_spec.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_rc/util/mod'
 
@@ -18,10 +23,10 @@ describe OmfRc::Util::Mod do
       OmfCommon.stub :comm, @xmpp do
         Cocaine::CommandLine.stub(:new, @command) do
           @command.expect(:run, fixture("lsmod"))
-          OmfRc::ResourceFactory.new(:mod_test).request_modules.must_include "kvm"
+          OmfRc::ResourceFactory.create(:mod_test).request_modules.must_include "kvm"
           @command.expect(:run, fixture("lsmod"))
           @xmpp.expect(:subscribe, true, [String])
-          OmfRc::ResourceFactory.new(:mod_test).request_modules.wont_include "Module"
+          OmfRc::ResourceFactory.create(:mod_test).request_modules.wont_include "Module"
           @command.verify
         end
       end
@@ -31,7 +36,7 @@ describe OmfRc::Util::Mod do
       OmfCommon.stub :comm, @xmpp do
         Cocaine::CommandLine.stub(:new, @command) do
           @command.expect(:run, true)
-          OmfRc::ResourceFactory.new(:mod_test).configure_load_module(name: 'magic_module').must_equal "magic_module loaded"
+          OmfRc::ResourceFactory.create(:mod_test).configure_load_module(name: 'magic_module').must_equal "magic_module loaded"
           @command.verify
         end
       end

data/test/test_helper.rb

@@ -1,9 +1,15 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'simplecov'
 SimpleCov.start { add_filter "/test" }
 
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/pride'
+require 'mocha/setup'
 
 require 'omf_rc'
 require 'omf_rc/resource_factory'