testability-driver 1.3.2 → 1.4.0

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

@@ -48,10 +48,19 @@ module TDriver
                 if @partial_match_allowed.include?( [ object_type, key ] )
                   
                   # regexp support is needed also here
+                  if value.kind_of?( Regexp )
+       
+                    prefix_value = "regexp_compare(#{ prefix_key },'#{ value.source }',#{ value.options })"
+                    attribute_value = "regexp_compare(.,'#{ value.source }',#{ value.options })"
+
+                    prefix_key = ""
                   
-                  prefix_value = "[contains(.,#{ value })]"
-                  attribute_value = "contains(.,#{ value })"
-                
+                  else
+
+                    prefix_value = "[contains(.,#{ value })]"
+                    attribute_value = "contains(.,#{ value })"
+
+                  end
                 else
 
                   if value.kind_of?( Regexp )

data/lib/tdriver/report/report_api.rb

@@ -129,6 +129,21 @@ module TDriverReportAPI
     end
   end
 
+  # This method logs data to the all_cases.xml
+  #
+  # === params
+  # column_name: name of the column
+  # value: value for the entry
+  # === returns
+  # nil
+  # === raises
+  def tdriver_log_data_in_xml(column_name,value)
+    raise TypeError.new("Argument to method cannot be nil.") if column_name.nil? || value.nil?
+    if $tdriver_reporter!=nil
+      $tdriver_reporter.set_user_xml_data(column_name,value)
+    end
+  end
+  
   # This method logs data test case details
   #
   # === params

data/lib/tdriver/report/report_creator.rb

@@ -186,6 +186,7 @@ module TDriverReportCreator
     )
 
 
+    $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')
@@ -231,7 +232,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
 
@@ -595,6 +596,8 @@ 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"
 

data/lib/tdriver/report/report_data_presentation.rb

@@ -75,7 +75,7 @@ module TDriverReportDataPresentation
 		filename = "graph.png" if filename.nil?
 		title = "Application Start Performance" if title.nil?
 		create_graph_image(data, filename, title)
-		html = "\n<img class='graph' src='#{filename}' style='width:#{ width.nil? ? 'auto' : width.to_s + 'px' }'/>\n"
+		html = "\n<img class='graph' src='#{File.basename(filename)}' style='width:#{ width.nil? ? 'auto' : width.to_s + 'px' }'/>\n"
 	end	
 	
 	## This method will create an html table tag with the data provided

data/lib/tdriver/report/report_test_run.rb

@@ -40,6 +40,7 @@ module TDriverReportCreator
       :test_run_behaviour_log,
       :test_run_user_log,
       :test_case_user_data,
+      :test_case_user_xml_data,
       :test_case_user_data_columns,
       :test_case_user_chronological_table_data,
       :attached_test_reports,
@@ -81,6 +82,7 @@ module TDriverReportCreator
       @test_case_user_data=Array.new
       @test_case_user_data_columns = Array.new
       @test_case_user_chronological_table_data = Hash.new
+      @test_case_user_xml_data = Hash.new
       @attached_test_reports = Array.new
       @report_pages_ready=Array.new
       @memory_amount_start='-'
@@ -183,6 +185,21 @@ module TDriverReportCreator
         @test_case_user_chronological_table_data[column_name.to_s]=value.to_s
       end
     end
+    
+    #This method adds user xml data
+    #
+    # === params
+    # column_name: the column name in xml
+    # value: the data
+    # === returns
+    # nil
+    # === raises
+    def set_user_xml_data(column_name,value)
+      if (!column_name.empty? && column_name!=nil)
+        @test_case_user_xml_data[column_name.to_s]=value.to_s
+      end
+    end
+    
     #This method sets the test run behaviour log
     #
     # === params
@@ -850,6 +867,7 @@ module TDriverReportCreator
         total_received=0,
         user_data_rows=nil,
         user_data_columns=nil)
+      
       while $result_storage_in_use==true
         sleep 1
       end
@@ -947,6 +965,17 @@ module TDriverReportCreator
             test<<test_data
           end
 
+          if @test_case_user_xml_data!=nil
+            test_data = Nokogiri::XML::Node.new("non_display_data",test)
+            #create the table rows
+            @test_case_user_xml_data.each_key do |key|              
+                data_value=Nokogiri::XML::Node.new("data",test_data)
+                data_value.set_attribute("id",key.to_s)
+                data_value.content = @test_case_user_xml_data[key].to_s
+                test_data << data_value              
+            end
+            test<<test_data
+          end
 
           xml_data.root.add_child(test)
           File.open(file, 'wb') {|f| f.write(xml_data) }
@@ -1005,6 +1034,23 @@ module TDriverReportCreator
                   }
 
                 end
+                
+                
+                if @test_case_user_xml_data!=nil
+
+                  xml.non_display_data{
+                    #create the table rows
+                    @test_case_user_xml_data.each_key do |key|
+                      
+                        xml.data("id"=>key.to_s){
+                          xml.text @test_case_user_xml_data[key].to_s
+                        }
+           
+                    end
+                  }
+
+                end
+                
               }
             }
           end

data/lib/tdriver/verify/verify.rb

@@ -700,7 +700,7 @@ module TDriverVerify
       elsif $!.kind_of?( MobyBase::VerificationError )
       
         error_message = "Verification #{ message }at #{ verify_caller } failed: #{ MobyUtil::KernelHelper.find_source( verify_caller ) }"
-        error_message << "The block did not return #{ expected_value }. It returned: #{ result.inspect }"
+        error_message << "The value was not equal to #{ expected_value }. It returned: #{ result.inspect }"
         
       else
       
@@ -837,7 +837,7 @@ module TDriverVerify
       elsif $!.kind_of?( MobyBase::VerificationError )
       
         error_message = "Verification #{ message }at #{ verify_caller } failed: #{ MobyUtil::KernelHelper.find_source( verify_caller ) }"
-        error_message << "The block did not return #{ expected_value }. It returned: #{ result.inspect }"
+        error_message << "The value was not less than #{ expected_value }. It returned: #{ result.inspect }"
         
       else
       
@@ -974,7 +974,7 @@ module TDriverVerify
       elsif $!.kind_of?( MobyBase::VerificationError )
       
         error_message = "Verification #{ message }at #{ verify_caller } failed: #{ MobyUtil::KernelHelper.find_source( verify_caller ) }"
-        error_message << "The block did not return #{ expected_value }. It returned: #{ result.inspect }"
+        error_message << "The value vas not greater than #{ expected_value }. It returned: #{ result.inspect }"
         
       else
       

data/lib/tdriver/version.rb

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

data/xml/templates/generic.xml

@@ -53,9 +53,10 @@
     <!-- default device input type (e.g. key, touch) -->
     <parameter name="input_type" value="key" />
 
-    <!-- default tcp/ip socket read/write timeouts -->
+    <!-- default tcp/ip socket read/write/connect timeouts -->
     <parameter name="socket_read_timeout" value="25" />
     <parameter name="socket_write_timeout" value="25" />
+    <parameter name="socket_connect_timeout" value="25" />
 
     <!-- default value for send_service_request message deflation rules -->
     <parameter name="io_deflate_service_requests" value="true" />

metadata

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