testability-driver 1.4.1 → 1.4.2

data/lib/tdriver/report/report_creator.rb

@@ -185,8 +185,7 @@ module TDriverReportCreator
       $new_test_case.test_case_user_data_columns
     )
 
-
-    $tdriver_reporter.test_case_user_xml_data=Hash.new 
+    $tdriver_reporter.test_case_user_xml_data=Hash.new
     $tdriver_reporter.set_end_time(Time.now)
     $tdriver_reporter.set_total_run(1)
     $tdriver_reporter.update_summary_page('inprogress')
@@ -232,7 +231,7 @@ module TDriverReportCreator
       chronological_data_rows=$tdriver_reporter.test_case_user_chronological_table_data
       $new_test_case.set_test_case_chronological_view_data(chronological_data_rows)
       $tdriver_reporter.set_user_data(nil)
-      $tdriver_reporter.set_user_chronological_table_data(nil)      
+      $tdriver_reporter.set_user_chronological_table_data(nil)
     end
   end
 
@@ -317,7 +316,7 @@ module TDriverReportCreator
 
         each_video_device do | video_device, device_index |
           begin
-            FileUtils.mv( "cam_" + device_index + "_" + @_video_file_name, "cam_" + device_index + "_" + @_previous_video_file_name )
+            FileUtils.mv(tdriver_report_folder() + "/cam_" + device_index + "_" + @_video_file_name, tdriver_report_folder() + "/cam_" + device_index + "_" + @_previous_video_file_name )
           rescue
             # do nothing..
           end
@@ -551,6 +550,7 @@ module TDriverReportCreator
         no_activity_videos = ""
         if $parameters[:report_check_device_active, 'false']=='true'
           if temp_rec
+
             no_activity_videos = $new_test_case.target_video_alive
           end
         end
@@ -596,8 +596,6 @@ module TDriverReportCreator
 
       update_run($new_test_case.test_case_name.to_s,status,$new_test_case.test_case_reboots,$new_test_case.test_case_crash_files,execution_log)
 
-      
-      
       $new_junit_xml_results.add_test_result(status, $new_test_case.test_case_start_time, $new_test_case.test_case_end_time)
       tdriver_update_sequential_fails( status ) if $parameters[ :runner_sequence_skip, "false" ] == "true"
 
@@ -620,7 +618,7 @@ module TDriverReportCreator
 
       each_video_device do | video_device, device_index |
         begin
-          delete_file = "cam_" + device_index + "_" + file_name
+          delete_file = tdriver_report_folder() + "/cam_" + device_index + "_" + file_name
           if File.exists?( delete_file )
             File.delete( delete_file )
           end

data/lib/tdriver/report/report_test_case_run.rb

@@ -393,13 +393,14 @@ module TDriverReportCreator
 
           rec_options = { :width => tc_video_width, :height => tc_video_height, :fps => tc_video_fps }
           rec_options[ :device ] = video_device unless video_device == "true" # use default device if "true"
-          video_recorder = MobyUtil::TDriverCam.new_cam( "cam_" + device_index + "_" + @tc_video_filename, rec_options )
+          video_recorder = MobyUtil::TDriverCam.new_cam( tdriver_report_folder() + "/cam_" + device_index + "_" + @tc_video_filename, rec_options )
           video_recorder.start_recording
           @tc_video_recorders << video_recorder
           @tc_video_recording = true
 
         end
       rescue Exception => e
+
         # make sure to stop any started cams if startup fails
         stop_video_recording
         raise e
@@ -419,11 +420,11 @@ module TDriverReportCreator
         check_frame_min =  $parameters[:report_activity_frame_treshold, '8']
         check_video_min =  $parameters[:report_activity_video_treshold, '29']
 
-        ret_n = MobyUtil.video_alive? "cam_" + device_index + "_" + @tc_video_filename, check_fps.to_f, check_frame_min.to_f, check_video_min.to_f, false
+        ret_n = MobyUtil.video_alive? tdriver_report_folder() + "/cam_" + device_index + "_" + @tc_video_filename, check_fps.to_f, check_frame_min.to_f, check_video_min.to_f, false
 
         if !ret_n
           ret += ", " if !ret.empty?
-          ret += "cam_" + device_index + "_" + @tc_video_filename
+          ret += tdriver_report_folder() + "/cam_" + device_index + "_" + @tc_video_filename
         end
 
       end
@@ -523,6 +524,7 @@ module TDriverReportCreator
       MobyUtil::Logger.instance.enabled=false
       begin
 
+
         video_folder=@test_case_folder+'/video'
         if File::directory?(video_folder)==false
           FileUtils.mkdir_p video_folder
@@ -532,14 +534,15 @@ module TDriverReportCreator
         each_video_device do | video_device, device_index |
 
           begin
-            FileUtils.copy("cam_" + device_index + "_" + @tc_video_filename, video_folder)
+            FileUtils.copy(tdriver_report_folder() + "/cam_" + device_index + "_" + @tc_video_filename, video_folder)
           rescue
-            # Copy failed, do nothing
+			 # Copy failed, do nothing
           end
 
           begin
-            FileUtils.copy("cam_" + device_index + "_" + @tc_previous_video_filename, video_folder)
+            FileUtils.copy(tdriver_report_folder() + "/cam_" + device_index + "_" + @tc_previous_video_filename, video_folder)
           rescue
+
             # Copy failed, do nothing
           end
 

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

@@ -42,6 +42,7 @@ module MobyUtil
       "Norwegian" => ["no", "08"], 
       "Finnish" => ["fi", "09"],
       "English US" => ["en_US", "10"],
+      "en_US" => ["en_US", "14346"],
       # "Swiss French" => ["SF", "11"],
       # "Swiss German" => ["SG", "12"],
       "Portuguese" => ["pt", "13"],
@@ -83,6 +84,7 @@ module MobyUtil
       "Estonian" => ["et", "49"],  
       "Persian" => ["fa", "50"],  
       "French CA" => ["fr_CA", "51"],
+      "fr_CA" => ["fr_CA", "14387"],
       # "Scots Gaelic" => ["GD", "52"],  
       "Georgian" => ["ka", "53"],  
       "Greek" => ["el", "54"],  
@@ -107,14 +109,18 @@ module MobyUtil
       # "Moldavian" => ["MO", "73"],  
       "Mongolian" => ["mn", "74"],  
       # "Norwegian Nynorsk" => ["nn", "75"],  
-      "Portuguese BR" => ["pt_BR", "76"],  
+      "Portuguese BR" => ["pt_BR", "76"],
+      "pt_AM" => ["pt_AM", "14412"],
       "Punjabi" => ["pa", "77"],  
       "Romanian" => ["ro", "78"],  
       "Servian" => ["sr", "79"], 
       "Sinhala" => ["si", "80"],  
       # "Somali" => ["SO", "81"],  
       # "International Spanish" => ["OS", "82"],  
-      "Spanish AM" => ["es_419", "83"],  
+      "Spanish AM" => ["es_419", "83"], 
+      "sp_AM" => ["sp_AM", "14419"],
+      "sp_PA" => ["sp_PA", "6154"],
+      "sp_UR" => ["sp_UR", "14346"],      
       "Swahili" => ["sw", "84"],  
       # "Finland Swedish" => ["FS", "85"],  
       "Tamil" => ["ta", "87"],   
@@ -564,7 +570,7 @@ module MobyUtil
     begin
     
       data = []
-      file.split('/').last.match(/(.*)_(\w{2,3}).loc/)
+      file.split('/').last.match(/(.*)_(\w{2,5}).loc/)
       fname = $1
       language_number = $2
       # select returns an array of [language, codes] that suite the conditional
@@ -574,7 +580,7 @@ module MobyUtil
       
       io = open(file)
       while line = io.gets
-        if line.match(/#define ([a-zA-Z1-9\_]*) \"(.*)\"/)
+        if line.match(/#define ([a-zA-Z1-9\d\_]*) \"(.*)\"/)
           lname = $1
           translation = $2
           # When no lengthvar is provided we now assign priority '1' by default          
@@ -586,8 +592,8 @@ module MobyUtil
       #p data
       return language, data
     rescue Exception => e
-      puts e.message
-      puts e.backtrace
+      #puts e.message
+      #puts e.backtrace
     end
     end
 		
@@ -607,7 +613,7 @@ module MobyUtil
 				language += "_"
 			end
 			
-			sql_file = File.open(table_name + ".#{db_connection.db_type}.sql", 'a') if record_sql
+			sql_file = File.open(table_name + ".#{db_connection.db_type}.sql", 'a') 
 
 			# CREATE TABLE if doesn't exist (language columns to be created as needed)
       # When no lengthvar is provided we now assign priority '1' by default
@@ -668,30 +674,30 @@ module MobyUtil
         
         begin
           # Formatting (seems like there is no length limit for the insert string)
-          data.each do |fname, source, translation, plurality, lengthvar|
+          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} : ""
+            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            
           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
+          sql_file.write( "Error: #{e.message}: #{query_string}" + "\n" )
         end
-        
+                  
 				when "sqlite"
 					begin
 						# Formatting (limit on the length of the Insert String! So multiple Insets

data/lib/tdriver/version.rb

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

metadata

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