omf_common 6.1.2.pre.3 → 6.1.2.pre.4

data/Rakefile

@@ -8,8 +8,7 @@ Rake::Task[:release].clear
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.pattern = "test/**/*_spec.rb"
-  #t.pattern = "test/**/message_spec.rb"
-  #t.pattern = "test/**/xmpp/topic_spec.rb"
+  t.pattern = "test/**/[^xmpp][^xml]*/topic_spec.rb"
+  t.pattern = "test/**/*/*_spec.rb"
   t.verbose = true
 end

data/bin/omf_monitor_topic

@@ -26,7 +26,7 @@ OP_MODE = :development
 opts = {
   communication: {
     #url: 'xmpp://srv.mytestbed.net',
-    #auth: {}
+    auth: {}
   },
   eventloop: { type: :em},
   logging: {

data/test/omf_common/comm/topic_spec.rb

@@ -48,7 +48,7 @@ describe OmfCommon::Comm::Topic do
       @comm = mock
 
       # TODO Again, can not create an abstract topic without init a message
-      OmfCommon::Message.init(type: :xml)
+      OmfCommon::Message.init(type: :json)
 
       OmfCommon.stubs(:comm).returns(@comm)
       @topic = OmfCommon::Comm::Topic.create(:bob)
@@ -58,8 +58,10 @@ describe OmfCommon::Comm::Topic do
 
     after do
       OmfCommon::Comm.reset
+      OmfCommon::Message.reset
       OmfCommon.unstub(:comm)
-      OmfCommon::Message::XML::Message.any_instance.unstub(:mid)
+      #OmfCommon::Message::XML::Message.any_instance.unstub(:mid)
+      OmfCommon::Message::Json::Message.any_instance.unstub(:mid)
     end
 
     it "must create and send frcp create message" do
@@ -140,7 +142,7 @@ describe OmfCommon::Comm::Topic do
       msg.stubs(:itype).with(:ruby).returns('creation_ok')
       msg.stubs(:cid).returns(:bob_id)
 
-      OmfCommon::Message::XML::Message.any_instance.stubs(:mid).returns(:bob_id)
+      OmfCommon::Message::Json::Message.any_instance.stubs(:mid).returns(:bob_id)
 
       cbk_called = [false, false, false, false]
 

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

@@ -13,7 +13,7 @@ describe "Using XMPP communicator" do
   include EventedSpec::SpecHelper
 
   # XMPP requires more time
-  default_timeout 3.1
+  default_timeout 10.1
 
   before do
     @xmpp_comm = OmfCommon::Comm::XMPP::Communicator.new

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

@@ -13,11 +13,12 @@ describe OmfCommon::Comm::XMPP::Topic do
   include EventedSpec::SpecHelper
 
   # XMPP requires more time
-  default_timeout 3.1
+  default_timeout 10.1
 
   before do
     @xmpp_comm = OmfCommon::Comm::XMPP::Communicator.new
     OmfCommon::Eventloop.init(type: :em)
+    OmfCommon::Message.init(type: :xml)
     OmfCommon.stubs(:comm).returns(@xmpp_comm)
   end
 
@@ -25,6 +26,7 @@ describe OmfCommon::Comm::XMPP::Topic do
     em do
       @xmpp_comm.init(url: 'xmpp://srv.mytestbed.net')
     end
+    OmfCommon::Message.reset
   end
 
   it "must allow you to subscribe/unsubscribe to a new pubsub topic" do

data/test/omf_common/message_spec.rb

@@ -14,6 +14,10 @@ describe OmfCommon::Message do
       @message = OmfCommon::Message.create(:create, { p1: 'p1_value', p2: 'p2_value' }, { rtype: :bob })
     end
 
+    after do
+      OmfCommon::Message.reset
+    end
+
     it "must be able to query internal properties" do
       @message.type.must_equal :create
       @message.operation.must_equal :create

data/test/test_helper.rb

@@ -51,3 +51,9 @@ class OmfCommon::Auth::CertificateStore
     @@instance = nil
   end
 end
+
+class OmfCommon::Message
+  def self.reset
+    @@message_class = nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.1.2.pre.3
+  version: 6.1.2.pre.4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest