testability-driver 1.4.0 → 1.4.1

data/lib/tdriver/base/sut/generic/behaviours/sut.rb

@@ -290,12 +290,15 @@ module MobyBehaviour
     # TODO: merge TestObject#child and SUT#child
     # == description
     # Creates a child test object from this SUT. SUT object will be associated as child test objects parent.\n
-    #
+    # \n
     # [b]NOTE:[/b] Subsequent calls to TestObject#child( rule ) always returns reference to same Testobject:\n
     # [code]a = sut.child( :type => 'Button', :text => '1' )
     # b = sut.child( :type => 'Button', :text => '1' )
     # a.eql?( b ) # => true[/code]
-    #
+    # \n
+    # [b]NOTE:[/b] If the parameter 'use_find_object' in tdriver_parameters.xml is true (default), objects with visibleOnScreen value 'false' might be 
+    # optimized out and not appear in the results.
+    # \n
     # == arguments
     # attributes
     #  Hash
@@ -1603,7 +1606,8 @@ module MobyBehaviour
                   :application_uid => refresh_args[ :id ],
                   :sut => self,
                   :refresh_arguments => refresh_args,
-                  :checksum => xml_data_checksum
+                  :checksum => xml_data_checksum,
+                  :flags => {:useViewCrop=>sut_parameters[ :use_view_crop, 'false' ]}
                 }
               )
             

data/lib/tdriver/base/sut/generic/behaviours/verification.rb

@@ -46,6 +46,7 @@ module MobyBehaviour
 
     # == description
     # Checks if a child test object matching the given criteria can be found, under this application object or test object.
+    # NOTE: This won't work with the visibleOnScreen attribute unless you disable the sut parameter use_find_object.
     #
     # == arguments
     # *attributes

data/lib/tdriver/base/test_object/behaviours/test_object.rb

@@ -452,6 +452,10 @@ module MobyBehaviour
     # [code]a = to.child( :type => 'Button', :text => '1' )
     # b = to.child( :type => 'Button', :text => '1' )
     # a.eql?( b ) # => true[/code]
+    # \n
+    # [b]NOTE:[/b] If the parameter 'use_find_object' in tdriver_parameters.xml is true (default), objects with visibleOnScreen value 'false' might be 
+    # optimized out and not appear in the results.
+    # \n
     # == arguments
     # attributes
     #  Hash
@@ -501,7 +505,10 @@ module MobyBehaviour
     end
     
     # == description
-    # Function similar to child, but returns an array of children test objects that meet the given criteria
+    # Function similar to child, but returns an array of children test objects that meet the given criteria. 
+    # \n\n
+    # [b]NOTE:[/b] If the parameter 'use_find_object' in tdriver_parameters.xml is true (default), objects with visibleOnScreen value 'false' might be 
+    # optimized out and not appear in the results.
     #
     # == arguments
     # attributes

data/lib/tdriver/base/test_object/xml/adapter.rb

@@ -378,6 +378,7 @@ module TDriver
       def self.parent_test_object_element( test_object )
 
         # retrieve parent of current xml element; obj/..
+        test_object.refresh #Refresh the test object for identification
         test_object.xml_data.parent #.parent
       
       end

data/lib/tdriver/util/database/access.rb

@@ -111,7 +111,11 @@ module MobyUtil
 
         begin
           query_result = @@_connections[ host + db_type + database_name ].dbh.query( query_string ) # identical?
-        rescue
+        rescue 
+          if @@_mysql        
+              @@_mysql.close
+              @@_mysql=nil      
+          end
           #Possible timeout in query attempt to recreate the connection and redo the query
           dbc.dbh = connect_db( db_type, host, username, password, database_name )
           @@_connections[ host + db_type + database_name ] = dbc
@@ -187,13 +191,25 @@ module MobyUtil
       return result
     end
     
+    # == description
+    # Function closes MySQL connection
+    #
+    def close_db()
+            
+      if @@_mysql        
+        @@_mysql.close
+        @@_mysql=nil      
+      end      
+      
+    end
+    
   private
     
     # == description
     # Function establishes a new connection to as sql server and returns it's handle
     #
-      def self.connect_db(  db_type, host, username, password, database_name )
-
+    def self.connect_db(  db_type, host, username, password, database_name )
+      
       # if mysql API and connection are not initialized, then initialize the mysql API
       if (  db_type == DB_TYPE_MYSQL ) && ( @@_mysql.nil? )
         require 'mysql'
@@ -201,7 +217,7 @@ module MobyUtil
       elsif  db_type == DB_TYPE_SQLITE
         require 'sqlite3'
       end
-
+      
       begin
         dbh = @@_mysql.connect( host, username, password, database_name) if  db_type == DB_TYPE_MYSQL
         dbh.query 'SET NAMES utf8' if db_type == DB_TYPE_MYSQL # set the utf8 encoding
@@ -211,8 +227,8 @@ module MobyUtil
       end
       
       return dbh
-
-    end
+      
+    end    
 
     # enable hoo./base/test_object/factory.rb:king for performance measurement & debug logging
     TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
@@ -220,3 +236,5 @@ module MobyUtil
   end # DBAccess
 
 end # MobyUtil
+
+at_exit{MobyUtil::DBAccess.instance.close_db}

data/lib/tdriver/util/localisation/localisation.rb

@@ -479,7 +479,8 @@ module MobyUtil
 		# 
 		# == throws
 		# 
-		def self.parse_ts_file(file, column_names_map = {} )
+	    
+    def self.parse_ts_file(file, column_names_map = {} )
 			# Read TS file
 			open_file = File.new( file )
 			doc = Nokogiri.XML( open_file )
@@ -500,7 +501,7 @@ module MobyUtil
 				begin
 					nodeId = ""
 					nodeTranslation = ""
-					nodePlurality = ""
+					nodePlurality = "NULL"
 					nodeLengthVar = ""
 					# set nodeId
 					#raise Exception if node.xpath('@id').inner_text() == ""
@@ -512,7 +513,8 @@ module MobyUtil
 					# Parse Numerus(LengthVar), or Numerus or LengthVar or translation direclty
 					if ! node.xpath('.//translation/numerusform').empty?
 						# puts ">>> Numerusform"
-            plurality = 1
+            priority = 1
+            plurality = 'NULL'
 						node.xpath('.//translation/numerusform').each do |numerus|
 							nodePlurality = numerus.xpath('@plurality').inner_text()
               nodePlurality = plurality.to_s if nodePlurality.empty?
@@ -521,15 +523,15 @@ module MobyUtil
                 priority = 1
 								numerus.xpath('.//lengthvariant').each do |lenghtvar|
 									nodeLengthVar = lenghtvar.xpath('@priority').inner_text()
-                  nodeLengthVar = priority.to_s if nodeLengthVar.empty?
+                  nodeLengthVar = priority.to_s if nodeLengthVar.empty?                  
 									nodeTranslation = lenghtvar.inner_text()
 									data << [ fname, nodeId, nodeTranslation, nodePlurality, nodeLengthVar ]
                   priority += 1
 								end
 							else
 								nodeTranslation = numerus.inner_text()
-								data << [ fname, nodeId, nodeTranslation, nodePlurality, nodeLengthVar ]
-                plurality += 1
+								data << [ fname, nodeId, nodeTranslation, nodePlurality, nodeLengthVar = '1' ]
+                priority += 1
 							end
 						end			
 					elsif ! node.xpath('.//translation/lengthvariant').empty?
@@ -537,7 +539,7 @@ module MobyUtil
 						priority = 1
 						node.xpath('.//translation/lengthvariant').each do |lenghtvar|
 							nodeLengthVar = lenghtvar.xpath('@priority').inner_text()
-							nodeLengthVar = priority.to_s if nodeLengthVar.empty?
+							nodeLengthVar = priority.to_s if nodeLengthVar.empty?             
 							nodeTranslation = lenghtvar.inner_text()
 							data << [ fname, nodeId, nodeTranslation, nodePlurality, nodeLengthVar ]
 							priority += 1					
@@ -554,7 +556,7 @@ module MobyUtil
 			open_file.close
 			return language, data
 		end
-		
+    
     #
     # Note: for .loc files the colum mapping is done with the Language code number on the filenames
     #
@@ -661,26 +663,35 @@ module MobyUtil
 			end
 			# INSERT new data
 			case db_connection.db_type
-				when "mysql"
-					begin
-						# Formatting (seems like there is no length limit for the insert string)
-						insert_values = ""
-						data.each do |fname, source, translation, plurality, lengthvar|
-							# Escape ` and ' and "  and other restricted characters in SQL (prevent SQL injections
-							source = source.gsub(/([\'\"\`\;\&])/){|s|  "\\" + s}
-							translation = (translation != nil) ? translation.gsub(/([\'\"\`\;\&])/){|s|  "\\" + s} : ""
-							insert_values += "('" + fname + "', '" + source + "', '" + translation + "', '" + plurality + "', '" + lengthvar + "'), "
-						end
-						insert_values[-2] = ' ' unless insert_values == "" # replace last ',' with ';'
-						# INSERT Query
-						query_string = "INSERT INTO `" + table_name + "` (FNAME, LNAME, `" + language + "`, `PLURALITY`, `LENGTHVAR`) VALUES " + insert_values +
-							"ON DUPLICATE KEY UPDATE fname = VALUES(fname), lname = VALUES(lname), `" + language + "` = VALUES(`" + language + "`) ;"
-						MobyUtil::DBAccess.query( db_connection, query_string )
-						sql_file.write( query_string + "\n" ) if record_sql
-					rescue Exception => e
-						puts e.inspect
-						puts e.backtrace.join("\n")
-					end
+      when "mysql"
+        insert_values = ""
+        
+        begin
+          # Formatting (seems like there is no length limit for the insert string)
+          data.each do |fname, source, translation, plurality, lengthvar|
+            # Escape ` and ' and "  and other restricted characters in SQL (prevent SQL injections
+            source = source.gsub(/([\'\"\`\;\&])/){|s|  "\\" + s}
+            translation = (translation != nil) ? translation.gsub(/([\'\"\`\;\&])/){|s|  "\\" + s} : ""
+            if plurality=='NULL'
+              insert_values += "('" + fname + "', '" + source + "', '" + translation + "', NULL, '" + lengthvar + "'), "						
+            else
+              insert_values += "('" + fname + "', '" + source + "', '" + translation + "', '" + plurality + "', '" + lengthvar + "'), "						
+            end
+          end
+          insert_values[-2] = ' ' unless insert_values == "" # replace last ',' with ';'
+          # INSERT Query
+          query_string = "INSERT INTO `" + table_name + "` (FNAME, LNAME, `" + language + "`, `PLURALITY`, `LENGTHVAR`) VALUES " + insert_values +
+            "ON DUPLICATE KEY UPDATE fname = VALUES(fname), lname = VALUES(lname), `" + language + "` = VALUES(`" + language + "`) ;"
+          MobyUtil::DBAccess.query( db_connection, query_string )
+          sql_file.write( query_string + "\n" ) if record_sql
+          
+        rescue Exception => e
+          puts e.message
+          puts e.backtrace
+          puts ''
+          sql_file.write( "Error: #{e.message}: #{query_string}" + "\n" ) if record_sql
+        end
+        
 				when "sqlite"
 					begin
 						# Formatting (limit on the length of the Insert String! So multiple Insets
@@ -724,7 +735,7 @@ module MobyUtil
 		# Used only on .ts files
 		def self.parseFName(file)
 			#(wordlist matching)
-			words = ["ar", "bg", "ca", "cs", "da", "de", "el", "en", "english-gb", "(apac)", "(apaccn)", "(apachk)", "(apactw)", "japanese", "thai", "us", "es", "419", "et", "eu", "fa", "fi", "fr", "gl", "he", "hi", "hr", "hu", "id", "is", "it", "ja", "ko", "lt", "lv", "mr", "ms", "nb", "nl", "pl", "pt", "br", "ro", "ru", "sk", "sl", "sr", "sv", "th", "tl", "tr", "uk", "ur", "us", "vi", "zh", "hk", "tw", "no", "gb", "cn"]
+			words = ["ar", "bg", "ca", "cs", "da", "de", "el", "en", "english-gb", "(apac)", "(apaccn)", "(apachk)", "(apactw)", "japanese", "thai", "us", "es", "419", "et", "eu", "fa", "fi", "fr", "gl", "he", "hi", "hr", "hu", "id", "is", "it", "ja", "ko", "lt", "lv", "mr", "ms", "nb", "nl", "pl", "pt", "br", "ro", "ru", "sk", "sl", "sr", "sv", "th", "tl", "tr", "uk", "ur", "us", "vi", "zh", "hk", "tw", "no", "gb", "cn", "kk"]
       
       fname = file.split('/').last
       fname.gsub!(".ts"){|s| ""} 

data/lib/tdriver/version.rb

@@ -18,4 +18,4 @@
 ############################################################################
 
 
-ENV['TDRIVER_VERSION'] = '1.4.0'
+ENV['TDRIVER_VERSION'] = '1.4.1'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Testability Driver team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin/
 cert_chain: []
 
-date: 2011-11-11 00:00:00 +02:00
+date: 2011-12-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency