actir 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe573a920382f2ad7315697bcb620fc97e2c06b
-  data.tar.gz: 09ec1a2c24d202158c6adf7a60deacda8bac7c23
+  metadata.gz: 63484bd91244d1e657e19c9675c8a22169c8b2a4
+  data.tar.gz: 13554f3aaee561ebbe17d5db9024ff503e460bf8
 SHA512:
-  metadata.gz: b663a8f7b7af8edb7055769c437b5922d130e0c453d25ac1d3660692a3ee8952e15f47c35ed02fe5dc4eb8ded2f7043e549859ad1dc9a8cf8292abaf17cdd20d
-  data.tar.gz: 9fa74d0d701b9aaa3695e4e24456b4a5bcbf13eaf5a6a455a6149650d3970376411ebea0e203b07e09ce2a1f2a9048d74db8a00a5071cb16c1a867b076bd608b
+  metadata.gz: 35a527b6b952aef0c789e4d9293dfeec17a5e7b4df8cdf45c2bb60a62cd0d034ef1c1043861dcd2f942eb6c1cea0955644a91d90f7792f811cd2832f30fda5e2
+  data.tar.gz: a65b3aeae8c43de758746b78060c4cf73845bd54aa13a616558e5c43f7eabb0478dc5768446c27ab743ad5966d4c22bfcacfeee3e2318365eea64b739d0dd882

data/lib/actir/parallel_tests/cli.rb

@@ -82,7 +82,7 @@ module Actir
             result = run_tests(group, p_num, num_processes, options, address[p_num])
             #从结果中取出失败用例重跑
             if ( result[:exit_status] != 0 ) && ( re_run_times > 0 )
-              result = Actir::ParallelTests::Test::Rerun.re_run_tests(result, p_num, num_processes, options, address[p_num], re_run_times)
+              result = re_run_tests(result, p_num, num_processes, options, address[p_num], re_run_times)
             end
             result
           end
@@ -106,6 +106,10 @@ module Actir
         end
       end
 
+      def re_run_tests(result, process_number, num_processes, options, address, re_run_times)
+        Actir::ParallelTests::Test::Rerunner.re_run_tests(result, process_number, num_processes, options, address, re_run_times)
+      end
+
       def report_output(result, lock)
         lock.flock File::LOCK_EX
         $stdout.puts result[:stdout]
@@ -268,8 +272,9 @@ module Actir
 
       def load_runner(type)
         require "actir/parallel_tests/#{type}/runner"
-        require "actir/parallel_tests/#{type}/re_run"
-        require "actir/parallel_tests/test/logger"
+        require "actir/parallel_tests/#{type}/rerunner"
+        require "actir/parallel_tests/#{type}/logger"
+        require "actir/parallel_tests/#{type}/result"
         runner_classname = type.split("_").map(&:capitalize).join.sub("Rspec", "RSpec")
         klass_name = "Actir::ParallelTests::#{runner_classname}::Runner"
         klass_name.split('::').inject(Object) { |x, y| x.const_get(y) }

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

@@ -18,7 +18,7 @@ module Actir
       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>"
+        @file.puts "    <dt id=\"testsuite_#{testsuite_id}\" class=\"passed\">[Testsuite]: #{h(testsuite_name)}</dt>"
       end
 
       def print_testsuite_end
@@ -28,14 +28,14 @@ module Actir
 
       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 "      <span class=\"passed_spec_name\">[Testcase]: #{h(testcase_name)}</span>"
         @file.puts "    </dd>"
       end
 
       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 "      <span class=\"failed_spec_name\">[testcase]: #{h(testcase_name)}</span>"
+        @file.puts "      <div id=\"testtab_#{failure_number}\" 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>"
@@ -44,7 +44,7 @@ module Actir
 
       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 << "#{failure_count} failure#{'s' unless failure_count <= 1 }"
 
         # formatted_duration = "%.5f" % duration
 
@@ -82,7 +82,7 @@ module Actir
 
 <div id="test-header">
   <div id="label">
-    <h1>Test Cases Result</h1>
+    <h1>UI-Test Report</h1>
   </div>
 
   <div id="display-filters">
@@ -215,7 +215,7 @@ EOF
 
       GLOBAL_STYLES = <<-EOF
 #test-header {
-  background: #65C400; color: #fff; height: 4em;
+  background: #03b401; color: #fff; height: 4em;
 }
 
 .test-report h1 {
@@ -265,7 +265,7 @@ dl {
 
 dt {
   padding: 3px;
-  background: #65C400;
+  background: #03b401;
   color: #fff;
   font-weight: bold;
 }
@@ -283,8 +283,8 @@ dd .duration {
 }
 
 dd.testcase.passed {
-  border-left: 5px solid #65C400;
-  border-bottom: 1px solid #65C400;
+  border-left: 5px solid #03b401;
+  border-bottom: 1px solid #03b401;
   background: #DBFFB4; color: #3D7700;
 }
 

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

@@ -24,7 +24,8 @@ module Actir
           testsuite_print(testsuite)
         end
 
-        summary = {:testcase_count => @testcase_number, :failure_count => @failure_number}
+        summary = {:testcase_count => @testcase_number, 
+                   :failure_count => @failure_number}
         summary_print(summary)
       end
 
@@ -39,7 +40,7 @@ module Actir
         @formatter.print_testsuite_start(@testsuite_number, testsuite[:testsuite_name])
         testcases = testsuite[:testcases] 
         testcases.each do |testcase|
-          if(testcase[:succuss] == true)
+          if(testcase[:success] == true)
             testcase_passed_print(testcase[:testcase_name])
           else
             testcase_failed_print(testcase[:testcase_name], testcase[:detail])

data/lib/actir/parallel_tests/test/{re_run.rb → rerunner.rb}

@@ -1,7 +1,7 @@
 module Actir
   module ParallelTests
     module Test
-      class Rerun < Runner
+      class Rerunner < Runner
 
         class << self
           
@@ -75,6 +75,10 @@ module Actir
               log_str = "[re_run_tests]: \n" + result[:stdout]
               Actir::ParallelTests::Test::Logger.log(log_str, process_number)
             end
+
+            #从result中获取执行结果用于生成测试报告
+            Actir::ParallelTests::Test::Result.get_testsuite_detail(result, :rerunner)
+
             return result
           end
 
@@ -86,11 +90,11 @@ module Actir
             testfile = ""
             result_array.each do |result|
               #取出执行失败的用例文件名称和用例名称
-              case result
-              when failure_tests_name_reg
+              if (result =~ failure_tests_name_reg) || (result =~ error_tests_name_reg)
                 #范例:"testhehe(TestHehe)"
                 testcase = $1
-              when failure_tests_file_reg
+              end
+              if result =~ failure_tests_file_reg
                 #范例:"testcode/test_tt/test_hehe.rb:8:in `xxxx'"
                 testfile = $1
               end
@@ -126,18 +130,23 @@ module Actir
 
           #判断是否有用例失败
           def any_test_failed?(result)
-            result[:exit_status] != 0
+            Actir::ParallelTests::Test::Result.any_test_failed?(result)
           end
 
-          #获取失败用例文件名的正则
-          def failure_tests_file_reg
-            /(.+\/test.+rb):\d+:in\s`.+'/
-            #/^Loaded\ssuite\s(.+)/
+          #获取错误用例名的正则
+          def error_tests_name_reg
+            Actir::ParallelTests::Test::Result.error_tests_name_reg
           end
 
           #获取失败用例名的正则
           def failure_tests_name_reg
-            /(test.+)\(.+\):/
+            Actir::ParallelTests::Test::Result.failure_tests_name_reg
+          end
+
+          #获取失败用例文件名的正则
+          def failure_tests_file_reg
+            /(.+\/test.+rb):\d+:in\s`.+'/
+            #/^Loaded\ssuite\s(.+)/
           end
 
           #获取失败数据的正则

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

@@ -0,0 +1,141 @@
+module Actir
+  module ParallelTests
+    module Test
+      class Result
+
+        class << self
+          
+          #
+          # 通过结果判断测试套的详细信息
+          #
+          # 将测试套和测试用例的详细信息写入全局变量$testsuites中
+          #
+          def get_testsuite_detail(test_result, mode = :runner)
+            $testsuites = [] unless $testsuites
+            if mode == :runner
+              get_run_test_info(test_result)
+            end
+            
+            #如果有用例失败，则记录详细信息，否则不需要
+            if any_test_failed?(test_result)
+              failure_detail_hash = get_testfailed_detail(test_result)
+              $testsuites.each do |testsuite|
+                testcases = testsuite[:testcases] 
+                testcases.each do |testcase|
+                  #标识用例是否执行失败
+                  fail_flag = 0
+                  failure_detail_hash.each do |testcase_failure, detail|
+                    if testcase_failure == testcase[:testcase_name]
+                      testcase[:success] = false
+                      testcase[:detail] = detail
+                      fail_flag = 1
+                      #从hash表中移除 
+                      failure_detail_hash.delete(testcase_failure)
+                    end
+                  end
+                  if fail_flag == 0
+                    testcase[:success] = true
+                    testcase[:detail] = nil
+                  end
+                end
+              end
+            end
+          end
+
+          def get_run_test_info(test_result)
+            output = test_result[:stdout]
+            output.scan(/^(\[suite start\])([^\.]*)(\[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], :success => 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
+          end
+
+          #
+          # 通过结果判断失败用例，获取失败用例的详细信息
+          #
+          # 将测试套和测试用例的详细信息写入全局变量$testsuites中
+          #
+          def get_testfailed_detail(test_result)
+            result_array = test_result[:stdout].split("\n")
+            failure_detail_hash = {}
+            testcase = "" 
+            detail = ""
+            record_detail_switch = 0
+
+            result_array.each do |result|
+              record_detail_switch = 0 if result =~ failure_or_error_switch_off
+              #遇到错误信息，开启记录错误信息开关
+              record_detail_switch = 1 if result =~failure_or_error_switch_on
+
+              if record_detail_switch == 1 
+                detail += result + "\n"
+              end
+
+              if (result =~ failure_tests_name_reg) || (result =~ error_tests_name_reg)
+                testcase = $1
+              end
+
+              if testcase != "" && detail != "" && record_detail_switch == 0
+                failure_detail_hash[testcase] = detail
+                testcase = ""
+                detail = ""
+              end
+            end
+
+            failure_detail_hash
+          end
+
+
+
+          #判断是否有用例失败
+          def any_test_failed?(result)
+            result[:exit_status] != 0
+          end
+
+          #获取错误用例名的正则
+          def error_tests_name_reg
+            /^Error:\s(test.+)\(.+\):/
+          end
+
+          #获取失败用例名的正则
+          def failure_tests_name_reg
+            /^Failure:\s(test.+)\(.+\)/
+          end
+
+          def test_info_swtich_on
+            /^\[suite start\]/
+          end
+
+          def test_info_swtich_off
+            /^\[suite end\]/
+          end
+
+          def failure_or_error_switch_on
+            /^Failure:|^Error:/
+          end
+
+          def failure_or_error_switch_off
+            /^===============================================================================$/
+          end
+
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -48,6 +48,10 @@ module Actir
               log_str = "[run_tests]: \n" + result[:stdout]
               Actir::ParallelTests::Test::Logger.log(log_str, process_number)
             end
+
+            #从result中获取执行结果用于生成测试报告
+            Actir::ParallelTests::Test::Result.get_testsuite_detail(result)
+
             result
           end
 
@@ -97,13 +101,6 @@ module Actir
             end.join(separator)
             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" 返回的值有时有问题，不能明确标示用例执行结果是否成功
@@ -147,41 +144,6 @@ module Actir
             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.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: actir
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - hub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.45'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Distribut automated testing framework for Web or App.
@@ -117,8 +117,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -139,7 +139,8 @@ files:
 - lib/actir/parallel_tests/report/html_formatter.rb
 - lib/actir/parallel_tests/report/html_reporter.rb
 - lib/actir/parallel_tests/test/logger.rb
-- lib/actir/parallel_tests/test/re_run.rb
+- lib/actir/parallel_tests/test/rerunner.rb
+- lib/actir/parallel_tests/test/result.rb
 - lib/actir/parallel_tests/test/runner.rb
 - lib/actir/remote.rb
 - lib/actir/script/cookies_baidu.rb
@@ -159,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Application Concurrence Test in Ruby.