rhodes 2.3.2 → 2.4.0.beta.1

data/spec/framework_spec/app/spec/shared/file/writable.rb

@@ -8,7 +8,12 @@ describe :file_writable, :shared => true do
   end
 
   it "returns true if named file is writable by the effective user id of the process, otherwise false" do
-    @object.send(@method, '/etc/passwd').should == false
+    platform_is_not :android do
+      @object.send(@method, '/etc/passwd').should == false
+    end
+    platform_is :android do
+      @object.send(@method, '/etc/hosts').should == false
+    end
     File.open(@file,'w') { @object.send(@method, @file).should == true }
   end
 end

data/spec/phone_spec/app/spec/rho_controller_spec.rb

@@ -66,7 +66,12 @@ describe "url_for and link_to" do
 
     it "should generate urls for create or index actions" do
       @c.url_for(:action => :index, :id => '{12}').should == '/application/model'
+if !defined?(RHO_WP7)    
       @c.url_for(:action => :create).should == '/application/model'
+else
+      @c.url_for(:action => :create).should == '/application/model/create'
+end
+
     end
 
     it "should generate urls for an model, action, and id" do
@@ -85,8 +90,14 @@ describe "url_for and link_to" do
     end
 
     it "should generate urls with a query" do
+if !defined?(RHO_WP7)    
       @c.url_for(:action => :create, :query => {:name => 'John Smith', 
         'address' => "http://john.smith.com"}).should == '/application/model?name=John%20Smith&address=http%3A%2F%2Fjohn.smith.com'
+else
+      @c.url_for(:action => :create, :query => {:name => 'John Smith', 
+        'address' => "http://john.smith.com"}).should == '/application/model/create?name=John%20Smith&address=http%3A%2F%2Fjohn.smith.com'
+end
+
     end
 
     it "should generate urls with a fragment" do

data/spec/phone_spec/app/spec/rho_spec.rb

@@ -39,12 +39,14 @@ describe "RhoConfig" do
     Rho::RhoConfig.options_path = '/app/Settings'
   end
   
+if !defined?(RHO_WP7)
   it "should populate configuration in sources table" do
     sources = ::Rho::RHO.get_user_db().select_from_table('sources','*')
     sources.size.should == 0
     
     Rho::RhoConfig.sources().size.should > 0
   end
+end
   
   it "should have start_path" do
     Rho::RhoConfig.start_path.should == '/app'
@@ -82,6 +84,7 @@ describe "RhoConfig" do
     Rho::RhoConfig.start_path.should == oldpath
   end  
   
+if !defined?(RHO_WP7)
   it "should read log" do
   #  log_text = Rho::RhoConfig.read_log
   #  log_text.length.should > 0
@@ -92,6 +95,7 @@ describe "RhoConfig" do
     log_text = Rho::RhoConfig.read_log(1000)
     log_text.length.should == 1000
   end  
+end
   
 end
 
@@ -113,6 +117,7 @@ describe "RhoError" do
 
 end
 
+if !defined?(RHO_WP7)
 describe "RhomSource" do
 
   it "should find first source" do
@@ -149,6 +154,7 @@ describe "RhomSource" do
   end
 
 end
+end
 
 describe "RhoRuby" do
 
@@ -292,19 +298,24 @@ end
   it "should array count" do
     ary = [1, 2, 4, 2]
     ary.count.should == 4
+if !defined?(RHO_WP7)
     ary.count(2).should == 2
     ary.count{|x|x%2==0}.should == 3
+end
   end
 
+if !defined?(RHO_WP7)
   it "should array group_by" do
     res = [1,2,3,4,5,6].group_by {|i| i%3}
     res.should == {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
   end
 
+
   it "should range group_by" do
     res = (1..6).group_by {|i| i%3}
     res.should == {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
   end
+end
 
   it "should split with regex"  do
     str = "http://www.abc.com/abc/servlet/SearchServlet?act=viewDetail&LanguageCountry=en_US&searchLang=en_US&caseLang=en_US&orgPrefix=NCMC&caseNum=1234567&seqNum=1"

data/spec/phone_spec/app/spec/rhom_object_spec.rb

@@ -21,7 +21,7 @@ require 'rhom'
 require 'rho/rhoutils'
 
 USE_HSQLDB = !System.get_property('has_sqlite')
-USE_COPY_FILES = !defined? RHO_ME
+USE_COPY_FILES = !defined? RHO_ME && !defined? RHO_WP7
 
 def getAccount
     return Account_s if $spec_settings[:schema_model]
@@ -223,17 +223,20 @@ describe "Rhom::RhomObject" do
     getAccount.find(:count, :conditions => {'name'=>'Aeroprise'}).should == 1
   end
 
+if !defined?(RHO_WP7)
   it "should raise RecordNotFound error if nil given as find argument" do
   
     bExc = false
     begin
       getAccount.find(nil)
     rescue Exception => e
+	    puts "Exception : #{e}"
         bExc = e.is_a?(::Rhom::RecordNotFound)
     end  
     bExc.should == true
     
   end
+end
 
   it "should save string with zero" do
     val = "\1\2\3\0\5\8\6\7\34"
@@ -946,7 +949,7 @@ describe "Rhom::RhomObject" do
     @accts[1].industry.should == "Technology"
     
   end
-  
+
   it "should order by multiple columns" do
     getAccount.create(:name=>'ZMobile', :industry => 'IT', :modified_by_name => 'user')
     getAccount.create(:name=>'Aeroprise', :industry => 'Accounting', :modified_by_name => 'admin')
@@ -976,7 +979,7 @@ describe "Rhom::RhomObject" do
     @accts[2].industry.should == "Technology"
     
   end
-  
+
   it "should delete_all" do
     vars = {"name"=>"foobarthree", "industry"=>"entertainment"}
     account = getAccount.create(vars)
@@ -1202,7 +1205,7 @@ describe "Rhom::RhomObject" do
     accts.length.should == 0    
  end
       
-
+if !defined?(RHO_WP7)
   it "should support blob type" do
     
     #TODO: fix blob for schema models    
@@ -1232,6 +1235,7 @@ describe "Rhom::RhomObject" do
         File.exists?(file_name).should == false
     end        
   end
+end
 
   it "should include only selected column" do
     @accts = getAccount.find(:all, :select => ['name'], :order => 'name', :orderdir => 'DESC' )
@@ -1328,8 +1332,100 @@ describe "Rhom::RhomObject" do
         @accts[0].name.should == "Aeroprise"
     end        
   end
-  
-#=end
+
+  it "should find by sql" do
+    if $spec_settings[:schema_model]
+    
+        @accts = getAccount.find_by_sql("SELECT * FROM " + getAccount_str() )
+        @accts.length.should == 2
+        
+        @accts[0].name.should_not be_nil
+        @accts[1].name.should_not be_nil
+    end    
+  end  
+
+  it "should find by number" do
+    getAccount.create('rating'=>1)
+    getAccount.create('rating'=>2)
+    getAccount.create('rating'=>3)
+    getAccount.create('rating'=>4)    
+    getAccount.create('rating'=>11)
+    getAccount.create('rating'=>12)
+    getAccount.create('rating'=>13)
+    getAccount.create('rating'=>14)
+    
+    size = 3
+    @accts = getAccount.find(:all, :conditions => { {:func=> 'CAST', :name=>'rating as INTEGER', :op=>'<'} => size } )    
+    @accts.length.should == 2
+    @accts[0].rating.to_i.should < size
+    @accts[1].rating.to_i.should < size
+    
+    size = 11
+    @accts = getAccount.find(:all, :conditions => { {:func=> 'CAST', :name=>'rating as INTEGER', :op=>'>'} => size } )    
+    @accts.length.should == 3
+    @accts[0].rating.to_i.should > size
+    @accts[1].rating.to_i.should > size    
+    @accts[2].rating.to_i.should > size
+  end
+  
+  it "should find with sql by number" do
+    getAccount.create('rating'=>1)
+    getAccount.create('rating'=>2)
+    getAccount.create('rating'=>3)
+    getAccount.create('rating'=>4)    
+    getAccount.create('rating'=>11)
+    getAccount.create('rating'=>12)
+    getAccount.create('rating'=>13)
+    getAccount.create('rating'=>14)
+    
+    size = 3
+    @accts = getAccount.find(:all, :conditions => ["CAST(rating as INTEGER)< ?", "#{size}"], :select => ['rating'] )    
+    @accts.length.should == 2
+    @accts[0].rating.to_i.should < size
+    @accts[1].rating.to_i.should < size
+    
+    size = 11
+    @accts = getAccount.find(:all, :conditions => ["CAST(rating as INTEGER)> ?", "#{size}"], :select => ['rating'] )    
+    @accts.length.should == 3
+    @accts[0].rating.to_i.should > size
+    @accts[1].rating.to_i.should > size    
+    @accts[2].rating.to_i.should > size
+  end
+
+  it "should complex find by number" do
+    getAccount.create('rating'=>1)
+    getAccount.create('rating'=>2)
+    getAccount.create('rating'=>3)
+    getAccount.create('rating'=>4)    
+    getAccount.create('rating'=>11)
+    getAccount.create('rating'=>12)
+    getAccount.create('rating'=>13)
+    getAccount.create('rating'=>14)
+    
+    size = 3
+    @accts = getAccount.find(:all, 
+        :conditions => { 
+         {:func=> 'CAST', :name=>'rating as INTEGER', :op=>'<'} => size,
+         {:func=>'UPPER', :name=>'industry', :op=>'LIKE'} => '%ZERO%'},
+         :op => 'OR' )    
+        
+    @accts.length.should == 2
+    @accts[0].rating.to_i.should < size
+    @accts[1].rating.to_i.should < size
+    
+    size = 11
+    @accts = getAccount.find(:all, 
+        :conditions => { 
+         {:func=> 'CAST', :name=>'rating as INTEGER', :op=>'>'} => size,
+         {:func=>'UPPER', :name=>'industry', :op=>'LIKE'} => '%ZERO%'}, 
+         :op => 'OR' )
+         
+    @accts.length.should == 3
+    @accts[0].rating.to_i.should > size
+    @accts[1].rating.to_i.should > size    
+    @accts[2].rating.to_i.should > size
+  end
+      
 end
 #=begin
 describe "Rhom#paginate" do

data/spec/phone_spec/app/spec/string/end_with_spec.rb

@@ -10,10 +10,11 @@ ruby_version_is '1.8.7' do
       s.end_with?('llo').should be_true
       s.end_with?('ll').should be_false
     end
-
+if !defined?(RHO_WP7)
     it "returns true only if any ending match" do
       "hello".end_with?('x', 'y', 'llo', 'z').should be_true
     end
+end
 
 #    it "converts its argument using :to_str" do
 #      s = "hello"
@@ -24,9 +25,11 @@ ruby_version_is '1.8.7' do
 
     it "ignores arguments not convertible to string" do
       "hello".end_with?().should be_false
+if !defined?(RHO_WP7)
       "hello".end_with?(1).should be_false
       "hello".end_with?(["o"]).should be_false
       "hello".end_with?(1, nil, "o").should be_true
+end
     end
 
 #    it "uses only the needed arguments" do

data/spec/phone_spec/app/spec/string/slice_spec.rb

@@ -30,8 +30,12 @@ end
 describe "String#slice! with index" do
   it "deletes and return the char at the given position" do
     a = "hello"
+if !defined?(RHO_WP7)
     a.slice!(1).should == ?e
-    a.should == "hllo"
+else
+	a.slice!(1).should == 101
+end
+	a.should == "hllo"
     #a.slice!(-1).should == ?o
     #a.should == "hll"
   end

data/spec/phone_spec/app/spec/string/start_with_spec.rb

@@ -12,7 +12,9 @@ ruby_version_is '1.8.7' do
     end
 
     it "returns true only if any beginning match" do
+if !defined?(RHO_WP7)
       "hello".start_with?('x', 'y', 'he', 'z').should be_true
+end
     end
 
 #    it "converts its argument using :to_str" do
@@ -24,9 +26,11 @@ ruby_version_is '1.8.7' do
 
     it "ignores arguments not convertible to string" do
       "hello".start_with?().should be_false
+if !defined?(RHO_WP7)
       "hello".start_with?(1).should be_false
       "hello".start_with?(["h"]).should be_false
       "hello".start_with?(1, nil, "h").should be_true
+end
     end
 
 #    it "uses only the needed arguments" do

data/spec/phone_spec/app/spec/syncengine_spec.rb

@@ -82,7 +82,7 @@ describe "SyncEngine_test" do
     ::Rho::RHO.get_user_db().delete_all_from_table('changed_values')
     
   end
-    
+if !defined?(RHO_WP7)    
   it "should update syncserver at runtime" do
   
     dbRes = ::Rho::RHO.get_user_db().select_from_table('client_info','token,token_sent')
@@ -99,7 +99,7 @@ describe "SyncEngine_test" do
     SyncEngine.set_syncserver(saveSrv)
     Rho::RhoConfig.syncserver.should == saveSrv
   end
-
+end
   it "should not sync without login" do
     SyncEngine.logged_in.should == 0
   
@@ -229,7 +229,7 @@ describe "SyncEngine_test" do
     cust22.first.should == cust2.first
     
   end
-
+if !defined?(RHO_WP7)
   it "should process error sync" do
 
     records = ::Rho::RHO.get_user_db().select_from_table('changed_values','*')
@@ -257,7 +257,7 @@ describe "SyncEngine_test" do
     records.length.should == 0
     
   end
-  
+end  
   it "should modify Product" do
     SyncEngine.logged_in.should == 1
   
@@ -376,6 +376,7 @@ describe "SyncEngine_test" do
     res['server_errors']['create-error'].should_not be_nil
     res['server_errors']['create-error'][item.object].should_not be_nil    
     res['server_errors']['create-error'][item.object]['message'].should == "error create"
+    res['server_errors']['create-error'][item.object]['attributes']['name'].should == "wrongname"
 
     records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
     records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
@@ -425,6 +426,7 @@ describe "SyncEngine_test" do
     res['server_errors']['create-error'].should_not be_nil
     res['server_errors']['create-error'][item.object].should_not be_nil    
     res['server_errors']['create-error'][item.object]['message'].should == "error create"
+    res['server_errors']['create-error'][item.object]['attributes']['name'].should == "wrongname"
 
     records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
     records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
@@ -477,6 +479,7 @@ describe "SyncEngine_test" do
     res['server_errors']['create-error'].should_not be_nil
     res['server_errors']['create-error'][item.object].should_not be_nil    
     res['server_errors']['create-error'][item.object]['message'].should == "error create"
+    res['server_errors']['create-error'][item.object]['attributes']['name'].should == "wrongname"
 
     records2 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'create')
     records2.length.should == ($spec_settings[:schema_model] ? 7 : 3)
@@ -493,7 +496,8 @@ describe "SyncEngine_test" do
     records2[0]['attrib'].should_not == 'object'        
     records2[0]['sent'].should == 0
 
-    getProduct.on_sync_create_error( res['server_errors']['create-error'].keys(), :recreate)
+    #getProduct.on_sync_create_error( res['server_errors']['create-error'].keys(), :recreate)
+    SyncEngine.on_sync_create_error( getProduct_str(), res['server_errors']['create-error'], :recreate)
     
     records3 = getTestDB().select_from_table('changed_values','*', 'object' => item.object)
     records3.length.should == 0
@@ -517,7 +521,39 @@ describe "SyncEngine_test" do
     res['server_errors']['update-error'].should_not be_nil
     res['server_errors']['update-error']['broken_object_id'].should_not be_nil    
     res['server_errors']['update-error']['broken_object_id']['message'].should == "error update"
+    res['server_errors']['update-error']['broken_object_id']['attributes']['name'].should == "wrongname"    
+
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'update')
+    records.length.should == 0
     
+    getProduct.on_sync_update_error( res['server_errors']['update-error'], :retry)
+    
+    records1 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'update')
+    records1.length.should == 2
+    if ( records1[0]["attrib"] == "name" )
+        records1[0]["object"].should == "broken_object_id"
+        records1[0]["attrib"].should == "name"
+        records1[0]["value"].should == "wrongname"
+        records1[0]["update_type"].should == "update"
+    else
+        records1[1]["object"].should == "broken_object_id"
+        records1[1]["attrib"].should == "name"
+        records1[1]["value"].should == "wrongname"
+        records1[1]["update_type"].should == "update"
+    end
+
+    if ( records1[1]["attrib"] == "an_attribute" )    
+        records1[1]["object"].should == "broken_object_id"
+        records1[1]["attrib"].should == "an_attribute"
+        records1[1]["value"].should == "error update"
+        records1[1]["update_type"].should == "update"
+    else
+        records1[0]["object"].should == "broken_object_id"
+        records1[0]["attrib"].should == "an_attribute"
+        records1[0]["value"].should == "error update"
+        records1[0]["update_type"].should == "update"
+    end
+        
   end
 
   it "should process delete-error" do    
@@ -531,7 +567,39 @@ describe "SyncEngine_test" do
     res['server_errors']['delete-error'].should_not be_nil
     res['server_errors']['delete-error']['broken_object_id'].should_not be_nil    
     res['server_errors']['delete-error']['broken_object_id']['message'].should == "Error delete record"
+    res['server_errors']['delete-error']['broken_object_id']['attributes']['name'].should == "wrongname"
     
+    records = getTestDB().select_from_table('changed_values','*', 'update_type' => 'delete')
+    records.length.should == 0
+    
+    getProduct.on_sync_delete_error( res['server_errors']['delete-error'], :retry)
+    
+    records1 = getTestDB().select_from_table('changed_values','*', 'update_type' => 'delete')
+    records1.length.should == 2
+    if ( records1[0]["attrib"] == "name" )
+        records1[0]["object"].should == "broken_object_id"
+        records1[0]["attrib"].should == "name"
+        records1[0]["value"].should == "wrongname"
+        records1[0]["update_type"].should == "delete"
+    else
+        records1[1]["object"].should == "broken_object_id"
+        records1[1]["attrib"].should == "name"
+        records1[1]["value"].should == "wrongname"
+        records1[1]["update_type"].should == "delete"
+    end
+
+    if ( records1[1]["attrib"] == "an_attribute" )
+        records1[1]["object"].should == "broken_object_id"
+        records1[1]["attrib"].should == "an_attribute"
+        records1[1]["value"].should == "error delete"
+        records1[1]["update_type"].should == "delete"
+    else
+        records1[0]["object"].should == "broken_object_id"
+        records1[0]["attrib"].should == "an_attribute"
+        records1[0]["value"].should == "error delete"
+        records1[0]["update_type"].should == "delete"
+    end
+        
   end
 
   it "should process source-error" do    
@@ -544,7 +612,6 @@ describe "SyncEngine_test" do
     res['server_errors'].should_not be_nil
     res['server_errors']['query-error'].should_not be_nil
     res['server_errors']['query-error']['message'].should == "Error during query"
-    
   end
 
   it "should process search-error" do