orient_db_client 0.0.3 → 0.0.4

data/test/unit/protocols/protocol9_test.rb

@@ -46,6 +46,9 @@ class TestProtocol9 < MiniTest::Unit::TestCase
         :type => 'LOGICAL' } ]
 
     @socket = mock()
+    @socket.stubs(:pos)
+    @socket.stubs(:write)
+    @socket.stubs(:read).with(0).returns('')
   end
 
   def socket_receives(request)
@@ -55,21 +58,14 @@ class TestProtocol9 < MiniTest::Unit::TestCase
   def test_command
     command_string = 'SELECT FROM OUser'
 
-    command = OrientDbClient::NetworkMessage.new { |m|
-      m.add :string,  'q'
-      m.add :string,  command_string
-      m.add :integer, -1
-      m.add :integer, 0
-    }.pack
+    command = @protocol::QueryMessage.new :query_class_name => 'q',
+                                          :text => command_string
 
-    request = OrientDbClient::NetworkMessage.new { |m| 
-      m.add :byte,    @protocol::Operations::COMMAND
-      m.add :integer, @session
-      m.add :byte,    's'
-      m.add :string,  command
-    }.pack
-
-    socket_receives(request)
+    inputs = sequence('inputs')
+    @socket.expects(:write).with(pack_byte(@protocol::Operations::COMMAND)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_integer(@session)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_byte('s'.ord)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string(command.to_binary_s)).in_sequence(inputs)
 
     chain = [
       pack_byte(@protocol::Statuses::OK),
@@ -93,15 +89,12 @@ class TestProtocol9 < MiniTest::Unit::TestCase
     storage_type = 'local'
     database_type = 'document'
 
-    request = OrientDbClient::NetworkMessage.new { |m|
-      m.add :byte,    @protocol::Operations::DB_CREATE
-      m.add :integer, @session
-      m.add :string,  @database
-      m.add :string,  database_type
-      m.add :string,  storage_type
-    }.pack
-
-    socket_receives(request)
+    inputs = sequence('inputs')
+    @socket.expects(:write).with(pack_byte(@protocol::Operations::DB_CREATE)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_integer(@session)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string(@database)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string(database_type)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string(storage_type)).in_sequence(inputs)
 
     chain = [
       pack_byte(@protocol::Statuses::OK),
@@ -118,20 +111,70 @@ class TestProtocol9 < MiniTest::Unit::TestCase
     assert_equal @session, result[:session]
   end
 
+  def test_db_open
+    inputs = sequence('inputs')
+    @socket.expects(:write).with(pack_byte(@protocol::Operations::DB_OPEN)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_integer(@protocol::NEW_SESSION)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string(@driver_name)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string(@driver_version)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_short(@protocol_version)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string(@database)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string('document')).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string(@user)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_string(@password)).in_sequence(inputs)
+
+    # recv chain
+    chain = [
+      { :param => Sizes::BYTE,    :return => pack_byte(@protocol::Statuses::OK) },
+      { :param => Sizes::INTEGER, :return => pack_integer(@protocol::NEW_SESSION) },
+      { :param => Sizes::INTEGER, :return => pack_integer(@session) },
+      { :param => Sizes::SHORT,   :return => pack_short(@clusters.length) }
+    ]
+
+    @clusters.each do |cluster|
+      chain.concat [
+        { :param => Sizes::INTEGER,         :return => pack_integer(cluster[:name].length) },
+        { :param => cluster[:name].length,  :return => pack_string(cluster[:name]) },
+        { :param => Sizes::SHORT,           :return => pack_short(cluster[:id]) },
+        { :param => Sizes::INTEGER,         :return => pack_integer(cluster[:type].length) },
+        { :param => cluster[:type].length,  :return => pack_string(cluster[:type]) }
+      ]
+    end
+
+    chain << { :param => Sizes::INTEGER,    :return => pack_integer(0) }
+
+    chain.map! &SOCKET_RECV_EXPECTATION
+    # End recv chain
+
+    expect_sequence @socket, chain, 'response'
+
+    result = @protocol.db_open(@socket, @database, {
+      :user => @user,
+      :password => @password
+    })
+
+    assert_equal @protocol::NEW_SESSION, result[:session]
+    assert_equal @session, result[:message_content][:session]
+    assert_equal @clusters.length, result[:message_content][:clusters].length
+
+    @clusters.each_with_index do |c, i|
+      assert_equal @clusters[i][:id], result[:message_content][:clusters][i][:id]
+      assert_equal @clusters[i][:name], result[:message_content][:clusters][i][:name]
+      assert_equal @clusters[i][:type], result[:message_content][:clusters][i][:type]
+    end
+  end
+
   def test_record_load
     cluster_id = 3
     cluster_position = 6
 
-    request = OrientDbClient::NetworkMessage.new { |m|
-      m.add :byte,    @protocol::Operations::RECORD_LOAD
-      m.add :integer, @session
-      m.add :short,   cluster_id
-      m.add :long,    cluster_position
-      m.add :string,  ""
-      m.add :byte,    0
-    }.pack
-
-    socket_receives(request)
+    inputs = sequence('inputs')
+    @socket.expects(:write).with(pack_byte(@protocol::Operations::RECORD_LOAD)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_integer(@session)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_short(cluster_id)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_long(cluster_position)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_integer(0)).in_sequence(inputs)
+    @socket.expects(:write).with(pack_byte(0)).in_sequence(inputs)
 
     chain = [
       pack_byte(@protocol::Statuses::OK),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orient_db_client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bindata
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +94,6 @@ files:
 - lib/orient_db_client/exceptions.rb
 - lib/orient_db_client/network_message.rb
 - lib/orient_db_client/protocol_factory.rb
-- lib/orient_db_client/protocols/.DS_Store
 - lib/orient_db_client/protocols/protocol7.rb
 - lib/orient_db_client/protocols/protocol9.rb
 - lib/orient_db_client/rid.rb
@@ -125,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2784375670515319189
+      hash: 4049052301386901195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2784375670515319189
+      hash: 4049052301386901195
 requirements: []
 rubyforge_project: orient_db_client
 rubygems_version: 1.8.21