rhoconnect 3.4.5 → 4.0.0.beta.10

data/spec/sync_states_spec.rb

@@ -4,7 +4,11 @@ describe "Sync Server States" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
     before(:each) do   
       @s = Source.load(@s_fields[:name],@s_params) 
-      @cs = ClientSync.new(@s,@c,2)
+      @model = Rhoconnect::Model::Base.create(@s)
+      rhcud = lambda { @model.send(params[:operation].to_sym, params["#{params[:operation]}_object".to_sym]) }
+      @sscud = Rhoconnect::Handler::Changes::Runner.new(['create', 'update', 'delete'], @model, @c, rhcud, {})
+      rh = lambda { @model.query(params[:query]) } 
+      @ssq = Rhoconnect::Handler::Query::Runner.new(@model, @c, rh, {})
     end
 
     describe "client creates objects" do
@@ -13,34 +17,36 @@ describe "Sync Server States" do
         @product1['link'] = 'temp1'
         params = {'create'=>{'1'=>@product1}}
         backend_data = {'backend_id'=>@product1}
-        set_state(@cs.client.docname(:cd_size) => 0,
-          @s.docname(:md_size) => 0)
+        set_doc_state(@sscud.client, :cd_size => 0)
+        set_doc_state(@s, :md_size => 0)
         @s.read_state.refresh_time = Time.now.to_i + 3600
-        @cs.receive_cud(params)
-        verify_result(@c.docname(:create) => {},
-          @c.docname(:cd_size) => "1",
-          @s.docname(:md_size) => "1",
-          @c.docname(:cd) => backend_data,
-          @c.docname(:create_links) => {'1'=>{'l'=>'backend_id'}},
-          @s.docname(:md) => backend_data)
+        @sscud.params = params
+        @sscud.run
+        verify_source_queue_data(@s, :create => [])
+        verify_doc_result(@c, {:cd_size => "1",
+                               :cd => backend_data,
+                               :create_links => {'1'=>{'l'=>'backend_id'}}})
+        verify_doc_result(@s, {:md_size => "1",
+                               :md => backend_data})
       end
 
       it "should create object and send link to client" do
         @product1['link'] = 'temp1'
         params = {'create'=>{'1'=>@product1}}
         backend_data = {'backend_id'=>@product1}
-        set_state(@cs.client.docname(:cd_size) => 0,
-          @s.docname(:md_size) => 0)
+        set_doc_state(@sscud.client, :cd_size => 0)
+        set_doc_state(@s, :md_size => 0)
         @s.read_state.refresh_time = Time.now.to_i + 3600
-        @cs.receive_cud(params)
-        verify_result(@c.docname(:create) => {},
-          @c.docname(:cd_size) => "1",
-          @s.docname(:md_size) => "1",
-          @c.docname(:cd) => backend_data,
-          @c.docname(:create_links) => {'1'=>{'l'=>'backend_id'}},
-          @s.docname(:md) => backend_data)
-        res = @cs.send_cud
-        res.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>res[1]['token']}, 
+        @sscud.params = params
+        @sscud.run
+        verify_source_queue_data(@s, :create => [])
+        verify_doc_result(@c, {:cd_size => "1",
+                               :cd => backend_data,
+                               :create_links => {'1'=>{'l'=>'backend_id'}}})
+        verify_doc_result(@s, {:md_size => "1",
+                               :md => backend_data})
+        res = @ssq.run
+        res.should == [{'version'=>Rhoconnect::SYNC_VERSION},{"token"=>res[1]['token']}, 
           {"count"=>0}, {"progress_count"=>0}, {"total_count"=>1}, 
           {"links"=> {'1'=>{'l'=>'backend_id'}}}]
 
@@ -52,19 +58,20 @@ describe "Sync Server States" do
         params = {'delete'=>{'1'=>@product1}}
         data = {'1'=>@product1,'2'=>@product2,'3'=>@product3}
         expected = {'2'=>@product2,'3'=>@product3}
-        set_state(@cs.client.docname(:cd) => data,
-          @cs.client.docname(:cd_size) => data.size,
-          @s.docname(:md) => data,
-          @s.docname(:md_size) => data.size)
+        set_doc_state(@sscud.client, {:cd => data,
+                                  :cd_size => data.size})
+        set_doc_state(@s, {:md => data,
+                           :md_size => data.size})
         @s.read_state.refresh_time = Time.now.to_i + 3600
-        @cs.receive_cud(params)
-        verify_result(@cs.client.docname(:delete) => {},
-          @cs.client.docname(:cd) => expected,
-          @s.docname(:md) => expected,
-          @cs.client.docname(:delete_page) => {},
-          @cs.client.docname(:cd_size) => "2",
-          @s.docname(:md_size) => "2",
-          'test_delete_storage' => {'1'=>@product1})
+        @sscud.params = params
+        @sscud.run
+        verify_source_queue_data(@s, :delete => [])
+        verify_doc_result(@sscud.client, {:cd => expected,
+                                       :delete_page => {},
+                                       :cd_size => "2"})
+        verify_doc_result(@s, {:md => expected,
+                               :md_size => "2"})
+        verify_result('test_delete_storage' => {'1'=>@product1})
       end
     end
   end  

data/spec/test_methods_spec.rb

@@ -17,8 +17,12 @@ describe "TestMethods" do
     it "should setup_test_for an adapter and user" do
       @u.is_a?(User).should == true
       @s.is_a?(Source).should == true
-      @ss.is_a?(SourceSync).should == true
-      @ss.adapter.is_a?(SampleAdapter).should == true
+      @query_engine.is_a?(Rhoconnect::Handler::Query::Engine).should == true
+      @cud_engine.is_a?(Rhoconnect::Handler::Changes::Engine).should == true
+      @search_engine.is_a?(Rhoconnect::Handler::Search::Engine).should == true
+      @query_engine.model.is_a?(SampleAdapter).should == true
+      @cud_engine.model.is_a?(SampleAdapter).should == true
+      @search_engine.model.is_a?(SampleAdapter).should == true
       @u.login.should == 'user1'
       @s.name.should == 'SampleAdapter'
       @c.id.size.should == 32
@@ -33,7 +37,7 @@ describe "TestMethods" do
       mock_schema_method([SampleAdapter]) do
         expected = {'1'=>@product1,'2'=>@product2}
         set_state('test_db_storage' => expected)
-        @ss.process_query
+        @query_engine.do_sync
         JSON.parse(test_schema).should == JSON.parse(schema_string)
       end
     end  
@@ -42,7 +46,7 @@ describe "TestMethods" do
       mock_metadata_method([SampleAdapter]) do
         expected = {'1'=>@product1,'2'=>@product2}
         set_state('test_db_storage' => expected)
-        @ss.process_query
+        @query_engine.do_sync
         JSON.parse(test_metadata).should == JSON.parse(foo_bar)
       end
     end
@@ -62,7 +66,7 @@ describe "TestMethods" do
 
     it "should include query_errors helper" do
       expected =  {"query-error"=>{'message'=>'failed'}}
-      set_state(@s.docname(:errors) => expected)
+      set_doc_state(@s, :errors => expected)
       query_errors.should == expected
     end
 
@@ -78,55 +82,55 @@ describe "TestMethods" do
 
     it "should include create_errors helper" do
       expected =  {"create-error"=>{'message'=>'failed'}}
-      set_state(@c.docname(:create_errors) => expected)
+      set_doc_state(@c, :create_errors => expected)
       create_errors.should == expected
     end
 
     it "should include test_update helper" do
       record = {'4'=> { 'price' => '199.99' }}
       test_update(record)
-      verify_zresult(@s.docname(:update) => [])
+      verify_source_queue_data(@s, :update => [])
     end
     
     it "should include test_update helper when pass through" do
       record = {'4'=> { 'price' => '199.99' }}
       @s.pass_through = 'true'
       test_update(record).should == {'processed' => ["4"]}.to_json
-      verify_zresult(@s.docname(:update) => [])
+      verify_source_queue_data(@s, :update => [])
     end
 
     it "should include update_errors helper" do
       expected =  {"update-error"=>{'message'=>'failed'}}
-      set_state(@c.docname(:update_errors) => expected)
+      set_doc_state(@c, :update_errors => expected)
       update_errors.should == expected
     end
 
     it "should include test_delete helper" do
       record = {'4'=> { 'price' => '199.99' }}
       test_delete(record)
-      verify_zresult(@s.docname(:delete) => [])
+      verify_source_queue_data(@s, :delete => [])
     end
     
     it "should include test_delete helper when pass through" do
       record = {'4'=> { 'price' => '199.99' }}
       @s.pass_through = 'true'
       test_delete(record).should == {'processed' => ["4"]}.to_json
-      verify_zresult(@s.docname(:delete) => [])
+      verify_source_queue_data(@s, :delete => [])
     end
 
     it "should include delete_errors helper" do
       expected =  {"delete-error"=>{'message'=>'failed'}}
-      set_state(@c.docname(:delete_errors) => expected)
+      set_doc_state(@c, :delete_errors => expected)
       delete_errors.should == expected
     end
 
     it "should include md helper" do
-      set_state(@s.docname(:md) => @data)
+      set_doc_state(@s, :md => @data)
       md.should == @data
     end
 
     it "should include cd helper" do
-      set_state(@c.docname(:cd) => @data)
+      set_doc_state(@c, :cd => @data)
       cd.should == @data
     end
     

data/spec/user_spec.rb

@@ -6,20 +6,20 @@ STATS_RECORD_SIZE = 8 unless defined? STATS_RECORD_SIZE
 describe "User" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
     it "should not allow user created with reserved login" do
-      Store.get_value('user:count').should == "1"
+      Store.get_value('user:count').should == "2"
       lambda {
         User.create({:login => '__shared__'})
         }.should raise_error(ArgumentError, 'Reserved user id __shared__')
-      Store.get_value('user:count').should == "1"
+      Store.get_value('user:count').should == "2"
     end
-      
-    it "should create user with fields" do
+
+    it "should load user with fields" do
       @u.id.should == @u_fields[:login]
       @u1 = User.load(@u_fields[:login])
       @u1.id.should == @u.id
       @u1.login.should == @u_fields[:login]
       @u1.email.should == @u_fields[:email]
-      Store.get_value('user:count').should == "1"
+      Store.get_value('user:count').should == "2"
     end
 
     it "should delete seats for user's clients" do
@@ -44,18 +44,17 @@ describe "User" do
     end
 
     it "should use token provisioned in settings if one" do
-      token = @u.create_token
+      token = User.load('rhoadmin').token_id
       token.should == Rhoconnect.api_token
       ApiToken.is_exist?(token).should == true
     end
-    
+
     it "should delete token if one exists" do
-      token = @u.create_token
-      token.should == Rhoconnect.api_token
-      ApiToken.is_exist?(token).should == true
       token = @u.create_token
       ApiToken.is_exist?(token).should == true
-      @u.delete
+      token2 = @u.create_token
+      ApiToken.is_exist?(token).should == false
+      ApiToken.is_exist?(token2).should == true
     end
 
     it "should assign token to existing user" do
@@ -83,9 +82,9 @@ describe "User" do
 
     it "should delete user and user clients" do
       @c.put_data(:cd,@data)
-      cid = @c.id    
+      cid = @c.id
       @u.delete
-      Store.get_value('user:count').should == "0"
+      Store.get_value('user:count').should == "1"
       User.is_exist?(@u_fields[:login]).should == false
       Client.is_exist?(cid).should == false
       @c.get_data(:cd).should == {}
@@ -103,24 +102,12 @@ describe "User" do
         Store.stub!(:lock).and_yield
       end
 
-      before(:each) do
-        Rhoconnect::Stats::Record.reset('users')
-      end
-
-      after(:each) do
-        Rhoconnect::Stats::Record.reset('users')
-      end
-
-      after(:all) do
-        Store.flash_data('stat:users*')
-      end
-
       it "should increment user stats on create" do
         Time.stub!(:now).and_return(10)
         Rhoconnect.stats = true
         User.create({:login => 'testuser2'})
-        Rhoconnect::Stats::Record.range('users',0,-1).should == ["2:10"]
-        Store.get_value('user:count').should == "2"
+        Rhoconnect::Stats::Record.range('users',0,-1).should == ["3:10"]
+        Store.get_value('user:count').should == "3"
         Rhoconnect.stats = false
       end
 
@@ -128,10 +115,10 @@ describe "User" do
         Time.stub!(:now).and_return(10)
         Rhoconnect.stats = true
         u = User.create({:login => 'testuser1'})
-        Rhoconnect::Stats::Record.range('users',0,-1).should == ["2:10"]
+        Rhoconnect::Stats::Record.range('users',0,-1).should == ["3:10"]
         u.delete
-        Rhoconnect::Stats::Record.range('users',0,-1).should == ["1:10"]
-        Store.get_value('user:count').should == "1"
+        Rhoconnect::Stats::Record.range('users',0,-1).should == ["2:10"]
+        Store.get_value('user:count').should == "2"
         Rhoconnect.stats = false
       end
     end