actir 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f2f6375fd93748a8c27fe2358ef9d3d715e835e
-  data.tar.gz: d76d390c43b8e4f2332706e1e58c9453a49811d5
+  metadata.gz: 5668a4b2e06c10f5c22c3c373f9e0dc643f61503
+  data.tar.gz: 4d7324e5b64a929b6a7a9ee7a35b14733d4f030c
 SHA512:
-  metadata.gz: 4324d045fc65e1373cea025d43f3ab85df9b4b11f226358daf7a09f4f07d68c194e8e2ac9c0938b712bd156f8b416d7c907066a8982add84ca9773073bb81ecb
-  data.tar.gz: 9534ec35e9ccb1c0743552f64dd8d8305421066496c14724050bf6cc220502171ca47dfcbe814f7761a29af873e5fab5bcec05d18d27aa02f604f09ffbdd5bf0
+  metadata.gz: ae691b3c59724f30e051d72ee487956ec14a3dd68735716f823b349e2bf03ed8ea5d62154472dd4db53513d5bc48978840f384160ddf05ec341d133b57f92192
+  data.tar.gz: 8597c67d810c2074c077490a9c01e241d5364cbc2ab9f814dfd38c9c6e635c4edb9ea0c4aa125a4258575b3137e9e565c31b5e731ffe4a8b17b2ded9feaffe22

data/lib/actir.rb

@@ -16,7 +16,23 @@ module Actir
   
   #测试用例基础类，读取配置文件定义常量
   class TestCase < Test::Unit::TestCase
-    
+    class << self
+      # $testsuites = []
+      def startup
+        # 执行用例前，将测试套名字和用例名输出
+        suite_name = self.to_s
+        if (suite_name != "Actir::TestCase" && suite_name != "BaseTest")
+          puts "[suite start]"
+          puts "suitname: #{suite_name}\n"
+          test_methods = instance_methods.grep(/^test_/).map {|case_name|case_name.to_s}
+          test_methods.each do |testcase|
+            puts "testcase: #{testcase}\n"
+          end
+          puts "[suite end]"
+        end
+      end
+    end
+
     #IP地址的正则表达式
     num = /\d|[01]?\d\d|2[0-4]\d|25[0-5]/  
     ip = /^(#{num}\.){3}#{num}/ 

data/lib/actir/parallel_tests/cli.rb

@@ -1,6 +1,7 @@
 require 'optparse'
 require 'tempfile'
 require 'actir'
+require 'actir/parallel_tests/report/html_reporter'
 
 module Actir
   module ParallelTests
@@ -84,7 +85,7 @@ module Actir
           show_process_serialize(num_processes, options)
 
           #输出最终的执行结果
-          report_results(test_results)
+          report_results(test_results, options)
         end
 
         abort final_fail_message if any_test_failed?(test_results)
@@ -107,12 +108,14 @@ module Actir
         lock.flock File::LOCK_UN
       end
 
-      def report_results(test_results)
+      def report_results(test_results, options)
         results = @runner.find_results(test_results.map { |result| result[:stdout] }*"")
         puts division_str
         puts pre_str + @runner.summarize_results(results)
+
+        #add by shanmao
         #生成详细报告
-        #detail_report(@runner.summarize_results(results),file_path)
+        detail_report if (options[:report] == true)
         #puts pre_str + any_test_failed?(test_results).to_s
       end
 
@@ -188,6 +191,7 @@ module Actir
           opts.on("--nice", "execute test commands with low priority") { options[:nice] = true }
           opts.on("--verbose", "Print more output") { options[:verbose] = true }
           opts.on("--log", "record exec result to logfile") { options[:log] = true}
+          opts.on("--report", "make a report to show the test result") { options[:report] = true}
           opts.on("--remote", "run testcase in remote environment") { options[:mode] = :remote }
           opts.on("--local", "run testcase in local environment") { options[:mode] = :local }
           # 填写预发环境，目前只支持bjpre2-4，别的后续再添加
@@ -313,10 +317,15 @@ module Actir
         "---------------------------------------------------------------------------------------------\n"
       end
 
-      # def detail_report(output)
-        
-      #   HtmlPrinter.new(file)
-      # end
+      # 生成详细报告
+      def detail_report
+        @report_path = File.join($project_path, 'test_report')
+        Dir::mkdir(@report_path) if not File.directory?(@report_path)
+        time = Time.now.strftime('%Y%m%d_%H%M%S')
+        file_path = File.join(@report_path, "REPORT_#{time}.html")
+        file = File.new(file_path,"w")
+        report = HtmlReport.new(file)
+      end
 
     end
   end

data/lib/actir/parallel_tests/report/html_formatter.rb

@@ -5,111 +5,71 @@ module Actir
     class HtmlFormatter
 
       include ERB::Util # For the #h method.
-      def initialize(output)
-        @output = output
+      def initialize(file)
+        @file = file
       end
 
       def print_html_start
-        @output.puts HTML_HEADER
-        @output.puts REPORT_HEADER
+        @file.puts HTML_HEADER
+        @file.puts REPORT_HEADER
       end
 
-      def print_example_group_end
-        @output.puts "  </dl>"
-        @output.puts "</div>"
-      end
 
-      def print_example_group_start(group_id, description, number_of_parents)
-        @output.puts "<div id=\"div_group_#{group_id}\" class=\"example_group passed\">"
-        @output.puts "  <dl #{indentation_style(number_of_parents)}>"
-        @output.puts "  <dt id=\"example_group_#{group_id}\" class=\"passed\">#{h(description)}</dt>"
+      def print_testsuite_start(testsuite_id, testsuite_name)
+        @file.puts "<div id=\"div_testsuite_#{testsuite_id}\" class=\"testsuite passed\">"
+        @file.puts "  <dl>"
+        @file.puts "    <dt id=\"testsuite_#{testsuite_id}\" class=\"passed\">#{h(testsuite_name)}</dt>"
       end
 
-      def print_example_passed(description, run_time)
-        formatted_run_time = "%.5f" % run_time
-        @output.puts "    <dd class=\"example passed\">" \
-          "<span class=\"passed_spec_name\">#{h(description)}</span>" \
-          "<span class='duration'>#{formatted_run_time}s</span></dd>"
+      def print_testsuite_end
+        @file.puts "  </dl>"
+        @file.puts "</div>"
       end
 
-      # rubocop:disable Style/ParameterLists
-      def print_example_failed(pending_fixed, description, run_time, failure_id,
-                               exception, extra_content, escape_backtrace=false)
-        # rubocop:enable Style/ParameterLists
-        formatted_run_time = "%.5f" % run_time
-
-        @output.puts "    <dd class=\"example #{pending_fixed ? 'pending_fixed' : 'failed'}\">"
-        @output.puts "      <span class=\"failed_spec_name\">#{h(description)}</span>"
-        @output.puts "      <span class=\"duration\">#{formatted_run_time}s</span>"
-        @output.puts "      <div class=\"failure\" id=\"failure_#{failure_id}\">"
-        if exception
-          @output.puts "        <div class=\"message\"><pre>#{h(exception[:message])}</pre></div>"
-          if escape_backtrace
-            @output.puts "        <div class=\"backtrace\"><pre>#{h exception[:backtrace]}</pre></div>"
-          else
-            @output.puts "        <div class=\"backtrace\"><pre>#{exception[:backtrace]}</pre></div>"
-          end
-        end
-        @output.puts extra_content if extra_content
-        @output.puts "      </div>"
-        @output.puts "    </dd>"
+      def print_testcase_passed(testcase_name)
+        @file.puts "    <dd class=\"testcase passed\">"
+        @file.puts "      <span class=\"passed_spec_name\">#{h(testcase_name)}</span>"
+        @file.puts "    </dd>"
       end
 
-      def print_example_pending(description, pending_message)
-        @output.puts "    <dd class=\"example not_implemented\">" \
-          "<span class=\"not_implemented_spec_name\">#{h(description)} " \
-          "(PENDING: #{h(pending_message)})</span></dd>"
+      def print_testcase_failed(testcase_name, backtrace, failure_number)
+        @file.puts "    <dd class=\"testcase failed\">"
+        @file.puts "      <span class=\"failed_spec_name\">#{h(testcase_name)}</span>"
+        @file.puts "      <div id=\"testtab\" style=\"float:right\"><a class=\"expand\" href=\"#\" onClick=\"Effect('failure_#{failure_number}',this.parentNode.id);\" >+</a> </div>"
+        @file.puts "      <div class=\"failure\" id=\"failure_#{failure_number}\" style=\"display:none;\">"
+        @file.puts "        <div class=\"backtrace\"><pre>#{h(backtrace)}</pre></div>"
+        @file.puts "      </div>"
+        @file.puts "    </dd>"
       end
 
-      def print_summary(duration, example_count, failure_count, pending_count)
-        totals =  "#{example_count} example#{'s' unless example_count == 1}, "
+      def print_summary(testcase_count, failure_count)
+        totals =  "#{testcase_count} testcase#{'s' unless testcase_count == 1}, "
         totals << "#{failure_count} failure#{'s' unless failure_count == 1}"
-        totals << ", #{pending_count} pending" if pending_count > 0
 
-        formatted_duration = "%.5f" % duration
+        # formatted_duration = "%.5f" % duration
 
-        @output.puts "<script type=\"text/javascript\">" \
-          "document.getElementById('duration').innerHTML = \"Finished in " \
-          "<strong>#{formatted_duration} seconds</strong>\";</script>"
-        @output.puts "<script type=\"text/javascript\">" \
+        # @file.puts "<script type=\"text/javascript\">" \
+        #   "document.getElementById('duration').innerHTML = \"Finished in " \
+        #   "<strong>#{formatted_duration} seconds</strong>\";</script>"
+        @file.puts "<script type=\"text/javascript\">" \
           "document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
-        @output.puts "</div>"
-        @output.puts "</div>"
-        @output.puts "</body>"
-        @output.puts "</html>"
-      end
-
-      def flush
-        @output.flush
-      end
-
-      def move_progress(percent_done)
-        @output.puts "    <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
-        @output.flush
+        @file.puts "</div>"
+        @file.puts "</div>"
+        @file.puts "</body>"
+        @file.puts "</html>"
       end
 
-      def make_header_red
-        @output.puts "    <script type=\"text/javascript\">makeRed('test-header');</script>"
+      def make_testsuite_header_red(testsuite_id)
+        @file.puts "    <script type=\"text/javascript\">" \
+                     "makeRed('div_testsuite_#{testsuite_id}');</script>"
+        @file.puts "    <script type=\"text/javascript\">" \
+                     "makeRed('testsuite_#{testsuite_id}');</script>"
       end
 
-      def make_header_yellow
-        @output.puts "    <script type=\"text/javascript\">makeYellow('test-header');</script>"
-      end
-
-      def make_example_group_header_red(group_id)
-        @output.puts "    <script type=\"text/javascript\">" \
-                     "makeRed('div_group_#{group_id}');</script>"
-        @output.puts "    <script type=\"text/javascript\">" \
-                     "makeRed('example_group_#{group_id}');</script>"
-      end
-
-      def make_example_group_header_yellow(group_id)
-        @output.puts "    <script type=\"text/javascript\">" \
-                     "makeYellow('div_group_#{group_id}');</script>"
-        @output.puts "    <script type=\"text/javascript\">" \
-                     "makeYellow('example_group_#{group_id}');</script>"
+      def flush
+        @file.flush
       end
-
+      
       private
 
       def indentation_style(number_of_parents)
@@ -122,13 +82,12 @@ module Actir
 
 <div id="test-header">
   <div id="label">
-    <h1>test Code Examples</h1>
+    <h1>Test Cases Result</h1>
   </div>
 
   <div id="display-filters">
     <input id="passed_checkbox"  name="passed_checkbox"  type="checkbox" checked="checked" onchange="apply_filters()" value="1" /> <label for="passed_checkbox">Passed</label>
     <input id="failed_checkbox"  name="failed_checkbox"  type="checkbox" checked="checked" onchange="apply_filters()" value="2" /> <label for="failed_checkbox">Failed</label>
-    <input id="pending_checkbox" name="pending_checkbox" type="checkbox" checked="checked" onchange="apply_filters()" value="3" /> <label for="pending_checkbox">Pending</label>
   </div>
 
   <div id="summary">
@@ -155,38 +114,20 @@ function removeClass(element_id, classname) {
   elem.className = classlist;
 }
 
-function moveProgressBar(percentDone) {
-  document.getElementById("test-header").style.width = percentDone +"%";
-}
-
 function makeRed(element_id) {
   removeClass(element_id, 'passed');
-  removeClass(element_id, 'not_implemented');
   addClass(element_id,'failed');
 }
 
-function makeYellow(element_id) {
-  var elem = document.getElementById(element_id);
-  if (elem.className.indexOf("failed") == -1) {  // class doesn't includes failed
-    if (elem.className.indexOf("not_implemented") == -1) { // class doesn't include not_implemented
-      removeClass(element_id, 'passed');
-      addClass(element_id,'not_implemented');
-    }
-  }
-}
-
 function apply_filters() {
   var passed_filter = document.getElementById('passed_checkbox').checked;
   var failed_filter = document.getElementById('failed_checkbox').checked;
-  var pending_filter = document.getElementById('pending_checkbox').checked;
 
-  assign_display_style("example passed", passed_filter);
-  assign_display_style("example failed", failed_filter);
-  assign_display_style("example not_implemented", pending_filter);
+  assign_display_style("testcase passed", passed_filter);
+  assign_display_style("testcase failed", failed_filter);
 
-  assign_display_style_for_group("example_group passed", passed_filter);
-  assign_display_style_for_group("example_group not_implemented", pending_filter, pending_filter || passed_filter);
-  assign_display_style_for_group("example_group failed", failed_filter, failed_filter || pending_filter || passed_filter);
+  assign_display_style_for_group("testsuite passed", passed_filter);
+  assign_display_style_for_group("testsuite failed", failed_filter, failed_filter || pending_filter || passed_filter);
 }
 
 function get_display_style(display_flag) {
@@ -218,6 +159,57 @@ function assign_display_style_for_group(classname, display_flag, subgroup_flag)
     }
   }
 }
+
+function $G(Read_Id) { return document.getElementById(Read_Id) }
+
+function Effect(ObjectId,parentId){
+var Obj_Display = $G(ObjectId).style.display;
+  if (Obj_Display == 'none'){
+  Start(ObjectId,'Opens');
+  $G(parentId).innerHTML = "<a class=\\"expand\\" href=# onClick=javascript:Effect('"+ObjectId+"','"+parentId+"');>-</a>"
+  }else{ 
+  Start(ObjectId,'Close');
+  $G(parentId).innerHTML = "<a class=\\"expand\\" href=# onClick=javascript:Effect('"+ObjectId+"','"+parentId+"');>+</a>"
+  }
+}
+
+function Start(ObjId,method){
+  var BoxHeight = $G(ObjId).offsetHeight;
+  var MinHeight = 5;
+  var MaxHeight = 130;
+  var BoxAddMax = 1;
+  var Every_Add = 0.15;
+  var Reduce    = (BoxAddMax - Every_Add);
+  var Add       = (BoxAddMax + Every_Add);
+
+  if (method == "Close"){
+    var Alter_Close = function(){
+      BoxAddMax /= Reduce;
+      BoxHeight -= BoxAddMax;
+      if (BoxHeight <= MinHeight){
+        $G(ObjId).style.display = "none";
+        window.clearInterval(BoxAction);
+      }
+      else $G(ObjId).style.height = BoxHeight;
+    }
+    var BoxAction = window.setInterval(Alter_Close,1);
+  }
+
+  else if (method == "Opens"){
+    var Alter_Opens = function(){
+      BoxAddMax *= Add;
+      BoxHeight += BoxAddMax;
+      if (BoxHeight >= MaxHeight){
+        $G(ObjId).style.height = MaxHeight;
+        window.clearInterval(BoxAction);
+      }else{
+        $G(ObjId).style.display= "block";
+        $G(ObjId).style.height = BoxHeight;
+      }
+    }
+    var BoxAction = window.setInterval(Alter_Opens,1);
+  }
+}
 EOF
         # rubocop:enable LineLength
 
@@ -259,11 +251,13 @@ EOF
   font-size: 1.2em;
 }
 
-.example_group {
+.testsuite {
   margin: 0 10px 5px;
   background: #fff;
 }
 
+.expand {text-decoration:none;}
+
 dl {
   margin: 0; padding: 0 0 5px;
   font: normal 11px "Lucida Grande", Helvetica, sans-serif;
@@ -288,52 +282,22 @@ dd .duration {
   float:right;
 }
 
-dd.example.passed {
+dd.testcase.passed {
   border-left: 5px solid #65C400;
   border-bottom: 1px solid #65C400;
   background: #DBFFB4; color: #3D7700;
 }
 
-dd.example.not_implemented {
-  border-left: 5px solid #FAF834;
-  border-bottom: 1px solid #FAF834;
-  background: #FCFB98; color: #131313;
-}
-
-dd.example.pending_fixed {
-  border-left: 5px solid #0000C2;
-  border-bottom: 1px solid #0000C2;
-  color: #0000C2; background: #D3FBFF;
-}
-
-dd.example.failed {
+dd.testcase.failed {
   border-left: 5px solid #C20000;
   border-bottom: 1px solid #C20000;
   color: #C20000; background: #FFFBD3;
 }
 
-
-dt.not_implemented {
-  color: #000000; background: #FAF834;
-}
-
-dt.pending_fixed {
-  color: #FFFFFF; background: #C40D0D;
-}
-
 dt.failed {
   color: #FFFFFF; background: #C40D0D;
 }
 
-
-#test-header.not_implemented {
-  color: #000000; background: #FAF834;
-}
-
-#test-header.pending_fixed {
-  color: #FFFFFF; background: #C40D0D;
-}
-
 #test-header.failed {
   color: #FFFFFF; background: #C40D0D;
 }

data/lib/actir/parallel_tests/report/html_reporter.rb

@@ -1,106 +1,81 @@
+require 'actir/parallel_tests/report/html_formatter'
+
 module Actir
   module ParallelTests
     class HtmlReport
 
-      def initialize(output)
-        super(output)
-        @failed_examples = []
-        @example_group_number = 0
-        @example_number = 0
-        @header_red = nil
-        @printer = HtmlPrinter.new(output)
-      end
+      def initialize(file)
+        @testsuites = $testsuites
+        @testsuite_number = 0
+        @testcase_number = 0
+        @failure_number = 0
+        # @duration = 0
+        @formatter = HtmlFormatter.new(file)
 
-      def start(notification)
-        super
-        @printer.print_html_start
-        @printer.flush
+        result_print
       end
 
-      def example_group_started(notification)
-        super
-        @example_group_red = false
-        @example_group_number += 1
+      def result_print
+        # 没有result信息
+        return 0 if @testsuites == nil
+
+        report_start
+        @testsuites.each do |testsuite|
+          testsuite_print(testsuite)
+        end
 
-        @printer.print_example_group_end unless example_group_number == 1
-        @printer.print_example_group_start(example_group_number,
-                                          notification.group.description,
-                                          notification.group.parent_groups.size)
-        @printer.flush
+        summary = {:testcase_count => @testcase_number, :failure_count => @failure_number}
+        summary_print(summary)
       end
 
-      def start_dump(_notification)
-        @printer.print_example_group_end
-        @printer.flush
+      def report_start
+        @formatter.print_html_start
+        @formatter.flush
       end
 
-      def example_started(_notification)
-        @example_number += 1
+      def testsuite_print(testsuite)
+        @testsuite_red = false
+        @testsuite_number += 1
+        @formatter.print_testsuite_start(@testsuite_number, testsuite[:testsuite_name])
+        testcases = testsuite[:testcases] 
+        testcases.each do |testcase|
+          if(testcase[:succuss] == true)
+            testcase_passed_print(testcase[:testcase_name])
+          else
+            testcase_failed_print(testcase[:testcase_name], testcase[:detail])
+          end
+        end
+        @formatter.print_testsuite_end
+        @formatter.flush
       end
 
-      def example_passed(passed)
-        @printer.move_progress(percent_done)
-        @printer.print_example_passed(passed.example.description, passed.example.execution_result.run_time)
-        @printer.flush
+      def testcase_passed_print(testcase_name)
+        @testcase_number += 1
+        @formatter.print_testcase_passed(testcase_name)
+        @formatter.flush
       end
 
-      def example_failed(failure)
-        @failed_examples << failure.example
-        unless @header_red
-          @header_red = true
-          @printer.make_header_red
-        end
+      def testcase_failed_print(testcase_name, details)
+        @testcase_number += 1
+        @failure_number += 1
 
-        unless @example_group_red
-          @example_group_red = true
-          @printer.make_example_group_header_red(example_group_number)
+        unless @testsuite_red
+          @testsuite_red = true
+          @formatter.make_testsuite_header_red(@testsuite_number)
         end
 
-        @printer.move_progress(percent_done)
-
-        example = failure.example
-
-        exception = failure.exception
-        exception_details = if exception
-                              {
-                                :message => exception.message,
-                                :backtrace => failure.formatted_backtrace.join("\n")
-                              }
-                            else
-                              false
-                            end
-        extra = extra_failure_content(failure)
-
-        @printer.print_example_failed(
-          example.execution_result.pending_fixed,
-          example.description,
-          example.execution_result.run_time,
-          @failed_examples.size,
-          exception_details,
-          (extra == "") ? false : extra,
-          true
-        )
-        @printer.flush
+        @formatter.print_testcase_failed(testcase_name, details, @failure_number)
+        @formatter.flush
       end
 
-      def example_pending(pending)
-        example = pending.example
-
-        @printer.make_header_yellow unless @header_red
-        @printer.make_example_group_header_yellow(example_group_number) unless @example_group_red
-        @printer.move_progress(percent_done)
-        @printer.print_example_pending(example.description, example.execution_result.pending_message)
-        @printer.flush
-      end
 
-      def dump_summary(summary)
-        @printer.print_summary(
-          summary.duration,
-          summary.example_count,
-          summary.failure_count,
-          summary.pending_count
+      def summary_print(summary)
+        @formatter.print_summary(
+          # summary[:duration],
+          summary[:testcase_count],
+          summary[:failure_count]
         )
-        @printer.flush
+        @formatter.flush
       end
 
     private
@@ -109,37 +84,29 @@ module Actir
       # warning because they are private.
       # rubocop:disable Style/TrivialAccessors
 
-      # The number of the currently running example_group.
-      def example_group_number
-        @example_group_number
-      end
+      # The number of the currently running testsuite.
+      # def testsuite_number
+      #   @testsuite_number
+      # end
 
-      # The number of the currently running example (a global counter).
-      def example_number
-        @example_number
-      end
+      # The number of the currently running testcase (a global counter).
+      # def testcase_number
+      #   @testcase_number
+      # end
       # rubocop:enable Style/TrivialAccessors
 
-      def percent_done
-        result = 100.0
-        if @example_count > 0
-          result = (((example_number).to_f / @example_count.to_f * 1000).to_i / 10.0).to_f
-        end
-        result
-      end
-
-      # Override this method if you wish to output extra HTML for a failed
-      # spec. For example, you could output links to images or other files
+      # Override this method if you wish to file extra HTML for a failed
+      # spec. For testcase, you could file links to images or other files
       # produced during the specs.
-      def extra_failure_content(failure)
-        RSpec::Support.require_rspec_core "formatters/snippet_extractor"
-        backtrace = failure.exception.backtrace.map do |line|
-          RSpec.configuration.backtrace_formatter.backtrace_line(line)
-        end
-        backtrace.compact!
-        @snippet_extractor ||= SnippetExtractor.new
-        "    <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(backtrace)}</code></pre>"
-      end
+      # def extra_failure_content(failure)
+      #   RSpec::Support.require_rspec_core "formatters/snippet_extractor"
+      #   backtrace = failure.exception.backtrace.map do |line|
+      #     RSpec.configuration.backtrace_formatter.backtrace_line(line)
+      #   end
+      #   backtrace.compact!
+      #   @snippet_extractor ||= SnippetExtractor.new
+      #   "    <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(backtrace)}</code></pre>"
+      # end
     end
   end
 end

data/lib/actir/parallel_tests/test/runner.rb

@@ -90,6 +90,12 @@ module Actir
             cmd = "#{exports}#{separator}#{cmd}"
             output = open("|#{cmd}", "r") { |output| capture_output(output, silence) }
 
+            #modify by shanmao
+            #获取执行的测试套详细信息
+            get_testsuite_detail(output)
+            #获取失败的用例的详情
+            get_testfailed_detail(output)
+
             #modify by Hub
             #exitstatus = $?.exitstatus
             #"$?.exitstatus" 返回的值有时有问题，不能明确标示用例执行结果是否成功
@@ -132,6 +138,41 @@ module Actir
               "/usr/local/rvm/rubies/ruby-2.0.0-p598/bin/ruby"
             end
           end
+          
+          #
+          # 通过结果判断测试套的详细信息
+          # 将测试套和测试用例的详细信息写入全局变量$testsuites中
+          #
+          def get_testsuite_detail output
+            $testsuites = [] unless $testsuites
+            output.scan(/^(\[suite start\])([^\.][^E]*)(\[suite end\])$/).each do |suite|
+              suitename = suite[1].scan(/^(suitname:\s*)([\d\w]*)/)[0][1]
+              cases = suite[1].scan(/^(testcase:\s*)([\d\w]*)/).inject([]) do |cases,testcase|
+                cases << {:testcase_name => testcase[1], :succuss => true, :detail => nil}
+              end
+              # 如果testsuites中已存在此用例的信息，说明这个用例执行了rerun，就不再次添加了
+              is_case_exist = $testsuites.inject(false) do |is_case_exist, testsuite|
+                if testsuite.has_value?(suitename)
+                  is_case_exist = true
+                  break
+                end
+                is_case_exist
+              end
+              if(is_case_exist == false)
+                testsuite = {:testsuite_name => suitename, :testcases =>cases}
+                $testsuites << testsuite
+              end
+            end
+            # p $testsuites
+          end
+
+          #
+          # 通过结果判断失败用例，获取失败用例的详细信息
+          # 将测试套和测试用例的详细信息写入全局变量$testsuites中
+          #
+          def get_testfailed_detail output
+
+          end
 
           #
           # 通过结果判断是否有用例失败

data/lib/actir/version.rb

@@ -1,3 +1,3 @@
 module Actir
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/actir/webdriver/browser.rb

@@ -53,6 +53,30 @@ class Browser
     define_page_method
   end
 
+  def goto(uri)
+    hasLoaded = 0
+    for i in 1..3
+      begin 
+      Timeout::timeout(10)  do
+        puts "Time #{i}"
+        super(uri)
+
+        if self.execute_script("return document.readyState;") == "complete"
+          puts "has completed"
+          hasLoaded = 1
+          break
+        end
+      end
+      rescue Timeout::Error => e
+        puts "Page load timed out: #{e}"
+      end
+
+      if hasLoaded == 1
+        break
+      end
+    end
+  end
+
   # 初始化入参
   def init_args(args = {})
     unless args.has_key?(:mode)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actir
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - hub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit