omf_common 6.1.2.pre.2 → 6.1.2.pre.3

data/test/omf_common/comm/xmpp/topic_spec.rb

@@ -4,168 +4,212 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
 require 'test_helper'
-require 'fixture/pubsub'
+#require 'fixture/pubsub'
 
 require 'omf_common/comm/xmpp/communicator'
 require 'omf_common/comm/xmpp/topic'
 
 describe OmfCommon::Comm::XMPP::Topic do
-  before do
-    @client = Blather::Client.new
-    @stream = MiniTest::Mock.new
-    @stream.expect(:send, true, [Blather::Stanza])
-    @client.post_init @stream, Blather::JID.new('n@d/r')
-    @xmpp = OmfCommon::Comm::XMPP::Communicator.new
-
-    OmfCommon.stub :comm, @xmpp do
-      Blather::Client.stub :new, @client do
-        @stream.expect(:send, true, [Blather::Stanza::PubSub::Create])
-        @topic = OmfCommon::Comm::XMPP::Topic.create(:test_topic)
-      end
-    end
-  end
-
-  describe "when calling operation method" do
-    include EM::MiniTest::Spec
-
-    it "must send create message" do
-      skip
-      OmfCommon.stub :comm, @xmpp do
-        Blather::Client.stub :new, @client do
-          published = Blather::XMPPNode.parse(published_xml)
+  include EventedSpec::SpecHelper
 
-          write_callback = proc do |event|
-            event.must_be_kind_of Blather::Stanza::PubSub::Publish
-            published.id = event.id
-            @client.receive_data published
-          end
+  # XMPP requires more time
+  default_timeout 3.1
 
-          @client.stub :write, write_callback do
-            @xmpp.stub :local_address, 'test_addr' do
-              @topic.create(:bob, { hrn: 'bob' })
-            end
-          end
-        end
-      end
-    end
-
-    it "must trigger operation callbacks" do
-      skip
-      OmfCommon.stub :comm, @xmpp do
-        Blather::Client.stub :new, @client do
-          @client.stub :write, proc {} do
-            @xmpp.stub :local_address, 'test_addr' do
-              omf_create = OmfCommon::Message.create(:create, { type: 'engine' })
-              omf_create.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
-                warn omf_create.mid
-                OmfCommon::Message.stub :create, omf_create do
-                  @topic.create(:bob, { hrn: 'bob' }) do |reply_msg|
-                    error 'bob'
-                    #reply_msg.cid.must_equal "bf840fe9-c176-4fae-b7de-6fc27f183f76"
-                    done!
-                  end
-
-                  @client.receive_data Blather::XMPPNode.parse(omf_created_xml)
-                end
-              end
-            end
-          end
-        end
-      end
+  before do
+    @xmpp_comm = OmfCommon::Comm::XMPP::Communicator.new
+    OmfCommon::Eventloop.init(type: :em)
+    OmfCommon.stubs(:comm).returns(@xmpp_comm)
+  end
 
-      wait!
+  after do
+    em do
+      @xmpp_comm.init(url: 'xmpp://srv.mytestbed.net')
     end
   end
 
-  describe "when informed message received" do
-    include EM::MiniTest::Spec
-
-    it "must react to omf created message" do
-      skip
-      OmfCommon.stub :comm, @xmpp do
-        Blather::Client.stub :new, @client do
-          omf_create = OmfCommon::Message.create(:create, { type: 'engine' })
-          omf_create.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
-            omf_created = Blather::XMPPNode.parse(omf_created_xml)
-            @client.receive_data omf_created
-            @topic.on_creation_ok(omf_create) do |n|
-              OmfCommon::Message.parse(omf_created.items.first.payload) do |parsed_msg|
-                n.stub :ts, parsed_msg.ts do
-                  n.must_equal parsed_msg
-                end
-                done!
-              end
-            end
-          end
-        end
-      end
-      wait!
-    end
+  it "must allow you to subscribe/unsubscribe to a new pubsub topic" do
+    @xmpp_comm.on_connected do |c|
+      t_name = SecureRandom.uuid.to_sym
+      c.subscribe(t_name) do |topic|
+        assert_kind_of OmfCommon::Comm::XMPP::Topic, topic
+        assert_match /xmpp:\/\/#{t_name}@/, topic.address
 
-    it "must react to omf status message" do
-      skip
-      OmfCommon.stub :comm, @xmpp do
-        Blather::Client.stub :new, @client do
-          omf_request = OmfCommon::Message.create(:request, [:bob])
-          omf_request.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
-            omf_status = Blather::XMPPNode.parse(omf_status_xml)
-            @client.receive_data omf_status
-            @topic.on_status(omf_request) do |n|
-              OmfCommon::Message.parse(omf_status.items.first.payload) do |parsed_msg|
-                n.stub :ts, parsed_msg.ts do
-                  n.must_equal parsed_msg
-                end
-                done!
-              end
-            end
-          end
-        end
+        topic.unsubscribe(t_name)
+        done
       end
-      wait!
     end
+  end
 
-    it "must react to omf release message" do
-      skip
-      OmfCommon.stub :comm, @xmpp do
-        Blather::Client.stub :new, @client do
-          omf_release = OmfCommon::Message.create(:release, nil, { res_id: '100' })
-          omf_release.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
-            omf_released = Blather::XMPPNode.parse(omf_released_xml)
-            @client.receive_data omf_released
-            @topic.on_released(omf_release) do |n|
-              OmfCommon::Message.parse(omf_released.items.first.payload) do |parsed_msg|
-                n.stub :ts, parsed_msg.ts do
-                  n.must_equal parsed_msg
-                end
-                done!
-              end
-            end
-          end
-        end
-      end
-      wait!
-    end
+  it "must allow you to send and monitor messages" do
+    @xmpp_comm.on_connected do |c|
+      t_name = SecureRandom.uuid.to_sym
+      c.subscribe(t_name) do |topic|
+        topic.inform('STATUS', attr_1: 'xxx')
 
-    it "must react to omf failed message" do
-      skip
-      OmfCommon.stub :comm, @xmpp do
-        Blather::Client.stub :new, @client do
-          omf_create = OmfCommon::Message.create(:create, { type: 'engine' })
-          omf_create.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
-            omf_failed = Blather::XMPPNode.parse(omf_failed_xml)
-            @client.receive_data omf_failed
-            @topic.on_creation_failed(omf_create) do |n|
-              OmfCommon::Message.parse(omf_failed.items.first.payload) do |parsed_msg|
-                n.stub :ts, parsed_msg.ts do
-                  n.must_equal parsed_msg
-                end
-                done!
-              end
-            end
-          end
+        topic.on_message do |msg|
+          assert_equal 'xxx', msg[:attr_1]
+          done
         end
       end
-      wait!
     end
   end
 end
+#  before do
+#    @client = Blather::Client.new
+#    @stream = MiniTest::Mock.new
+#    @stream.expect(:send, true, [Blather::Stanza])
+#    @client.post_init @stream, Blather::JID.new('n@d/r')
+#    @xmpp = OmfCommon::Comm::XMPP::Communicator.new
+#
+#    OmfCommon.stub :comm, @xmpp do
+#      Blather::Client.stub :new, @client do
+#        @stream.expect(:send, true, [Blather::Stanza::PubSub::Create])
+#        @topic = OmfCommon::Comm::XMPP::Topic.create(:test_topic)
+#      end
+#    end
+#  end
+#
+#  describe "when calling operation method" do
+#    include EM::MiniTest::Spec
+#
+#    it "must send create message" do
+#      skip
+#      OmfCommon.stub :comm, @xmpp do
+#        Blather::Client.stub :new, @client do
+#          published = Blather::XMPPNode.parse(published_xml)
+#
+#          write_callback = proc do |event|
+#            event.must_be_kind_of Blather::Stanza::PubSub::Publish
+#            published.id = event.id
+#            @client.receive_data published
+#          end
+#
+#          @client.stub :write, write_callback do
+#            @xmpp.stub :local_address, 'test_addr' do
+#              @topic.create(:bob, { hrn: 'bob' })
+#            end
+#          end
+#        end
+#      end
+#    end
+#
+#    it "must trigger operation callbacks" do
+#      skip
+#      OmfCommon.stub :comm, @xmpp do
+#        Blather::Client.stub :new, @client do
+#          @client.stub :write, proc {} do
+#            @xmpp.stub :local_address, 'test_addr' do
+#              omf_create = OmfCommon::Message.create(:create, { type: 'engine' })
+#              omf_create.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
+#                warn omf_create.mid
+#                OmfCommon::Message.stub :create, omf_create do
+#                  @topic.create(:bob, { hrn: 'bob' }) do |reply_msg|
+#                    error 'bob'
+#                    #reply_msg.cid.must_equal "bf840fe9-c176-4fae-b7de-6fc27f183f76"
+#                    done!
+#                  end
+#
+#                  @client.receive_data Blather::XMPPNode.parse(omf_created_xml)
+#                end
+#              end
+#            end
+#          end
+#        end
+#      end
+#
+#      wait!
+#    end
+#  end
+#
+#  describe "when informed message received" do
+#    include EM::MiniTest::Spec
+#
+#    it "must react to omf created message" do
+#      skip
+#      OmfCommon.stub :comm, @xmpp do
+#        Blather::Client.stub :new, @client do
+#          omf_create = OmfCommon::Message.create(:create, { type: 'engine' })
+#          omf_create.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
+#            omf_created = Blather::XMPPNode.parse(omf_created_xml)
+#            @client.receive_data omf_created
+#            @topic.on_creation_ok(omf_create) do |n|
+#              OmfCommon::Message.parse(omf_created.items.first.payload) do |parsed_msg|
+#                n.stub :ts, parsed_msg.ts do
+#                  n.must_equal parsed_msg
+#                end
+#                done!
+#              end
+#            end
+#          end
+#        end
+#      end
+#      wait!
+#    end
+#
+#    it "must react to omf status message" do
+#      skip
+#      OmfCommon.stub :comm, @xmpp do
+#        Blather::Client.stub :new, @client do
+#          omf_request = OmfCommon::Message.create(:request, [:bob])
+#          omf_request.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
+#            omf_status = Blather::XMPPNode.parse(omf_status_xml)
+#            @client.receive_data omf_status
+#            @topic.on_status(omf_request) do |n|
+#              OmfCommon::Message.parse(omf_status.items.first.payload) do |parsed_msg|
+#                n.stub :ts, parsed_msg.ts do
+#                  n.must_equal parsed_msg
+#                end
+#                done!
+#              end
+#            end
+#          end
+#        end
+#      end
+#      wait!
+#    end
+#
+#    it "must react to omf release message" do
+#      skip
+#      OmfCommon.stub :comm, @xmpp do
+#        Blather::Client.stub :new, @client do
+#          omf_release = OmfCommon::Message.create(:release, nil, { res_id: '100' })
+#          omf_release.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
+#            omf_released = Blather::XMPPNode.parse(omf_released_xml)
+#            @client.receive_data omf_released
+#            @topic.on_released(omf_release) do |n|
+#              OmfCommon::Message.parse(omf_released.items.first.payload) do |parsed_msg|
+#                n.stub :ts, parsed_msg.ts do
+#                  n.must_equal parsed_msg
+#                end
+#                done!
+#              end
+#            end
+#          end
+#        end
+#      end
+#      wait!
+#    end
+#
+#    it "must react to omf failed message" do
+#      skip
+#      OmfCommon.stub :comm, @xmpp do
+#        Blather::Client.stub :new, @client do
+#          omf_create = OmfCommon::Message.create(:create, { type: 'engine' })
+#          omf_create.stub :mid, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
+#            omf_failed = Blather::XMPPNode.parse(omf_failed_xml)
+#            @client.receive_data omf_failed
+#            @topic.on_creation_failed(omf_create) do |n|
+#              OmfCommon::Message.parse(omf_failed.items.first.payload) do |parsed_msg|
+#                n.stub :ts, parsed_msg.ts do
+#                  n.must_equal parsed_msg
+#                end
+#                done!
+#              end
+#            end
+#          end
+#        end
+#      end
+#      wait!
+#    end
+#  end
+#end

data/test/omf_common/comm_spec.rb

@@ -57,14 +57,12 @@ describe OmfCommon::Comm do
       lambda { OmfCommon::Comm.init(provider: { constructor: {}, require: {} }) }.must_raise TypeError
     end
 
-    it 'must fail if already initialised' do
+    it 'wont fail if already initialised' do
       OmfCommon::Comm::Local::Communicator.any_instance.stubs(:on_connected)
       OmfCommon::Message.stubs(:init)
-      error = lambda do
-        OmfCommon::Comm.init(type: :local)
-        OmfCommon::Comm.init(type: :local)
-      end.call rescue $!
-      error.message.must_match /Comms layer already initialised/
+
+      OmfCommon::Comm.init(type: :local)
+      OmfCommon::Comm.init(type: :local)
     end
 
     it 'must handle auth options and be able to return singleton instance' do

data/test/omf_common/message/xml/message_spec.rb

@@ -11,10 +11,9 @@ include OmfCommon
 describe OmfCommon::Message::XML::Message do
   describe "when create message initialised" do
     before do
-      # We will test prop value other than just strings
       @message = Message::XML::Message.create(:create,
-                                     { type: 'bob', p1: 'p1_value', p2: { unit: 'u', precision: 2 } },
-                                     { rtype: 'bob', guard: { p1: 'p1_value' } })
+                                              { type: 'bob', p1: 'p1_value', p2: { unit: 'u', precision: 2 } },
+                                              { rtype: 'bob', guard: { p1: 'p1_value' } })
     end
 
     it "must to be validated using relaxng schema" do

data/test/omf_common/message_spec.rb

@@ -9,6 +9,8 @@ describe OmfCommon::Message do
   describe "when initialised" do
     before do
       @internal_attr = %w(type operation guard mid ts replyto cid itype)
+      # TODO Abstract message class does NOT provide most of method implementation
+      OmfCommon::Message.init(type: :xml)
       @message = OmfCommon::Message.create(:create, { p1: 'p1_value', p2: 'p2_value' }, { rtype: :bob })
     end
 
@@ -38,6 +40,7 @@ describe OmfCommon::Message do
     end
 
     it "must evaluate erb code when read property with evaluate option is true" do
+      # TODO need to find a way to pass remote eval expression
       skip
       @message[:p3] = "1 + 1 = <%= 1 + 1 %>"
       @message[:p4] = "1 + 1 = <%= two %>"

data/test/test_helper.rb

@@ -4,22 +4,30 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
 require 'simplecov'
+# Generate coverage
 SimpleCov.start { add_filter "/test" }
 
+# Setup MiniTest
 gem 'minitest'
+
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'minitest/spec'
 require 'minitest/mock'
-require 'em/minitest/spec'
+
+# Spec helper to test async
+require 'evented-spec'
+
+# Use mocha for Mocking and Stubbing
 require 'mocha/setup'
 
-require 'omf_common'
-require 'blather/client/dsl'
+require 'securerandom'
+
+#require 'em/minitest/spec'
 
-require 'singleton'
+require 'omf_common'
 
-OmfCommon::Message.init(type: :xml)
+#require 'blather/client/dsl'
 
 # Shut up all the loggers
 Logging.logger.root.clear_appenders

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.1.2.pre.2
+  version: 6.1.2.pre.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -28,21 +28,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-minitest-spec
+  name: evented-spec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.beta
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.beta
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -302,14 +302,12 @@ files:
 - lib/omf_common/message/json/json_message.rb
 - lib/omf_common/message/xml/message.rb
 - lib/omf_common/message/xml/relaxng_schema.rb
-- lib/omf_common/message/xml/topic_message.rb
 - lib/omf_common/protocol/6.0.rnc
 - lib/omf_common/protocol/6.0.rng
 - lib/omf_common/version.rb
 - omf_common.gemspec
 - test/fixture/1st_level.pem
 - test/fixture/2nd_level.pem
-- test/fixture/3rd_level.pem
 - test/fixture/alice-cert.pem
 - test/fixture/alice-key.pem
 - test/fixture/omf_test.cert.pem
@@ -322,6 +320,7 @@ files:
 - test/omf_common/auth/certificate_spec.rb
 - test/omf_common/auth/certificate_store_spec.rb
 - test/omf_common/auth/ssh_pub_key_convert_spec.rb
+- test/omf_common/comm/amqp/communicator_spec.rb
 - test/omf_common/comm/topic_spec.rb
 - test/omf_common/comm/xmpp/communicator_spec.rb
 - test/omf_common/comm/xmpp/topic_spec.rb
@@ -352,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_common
-rubygems_version: 1.8.28
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Common library of OMF