testmgr 0.3.1.pre → 0.3.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c788171781d05e43fe0bb67af44a10298917bdce
-  data.tar.gz: 30952ea5a9c7fb6b371ba34ea7178d4066340944
+  metadata.gz: 30bcfe33a3d3440a6a4e12ffc0d2bc24ad2aaa8f
+  data.tar.gz: a09aa6cd802d14829567ee94673a50ec1bfb866d
 SHA512:
-  metadata.gz: baaf2dd58fa586a0e04ad62b201d23bc296e0c421633a5a3bee5e8712b5ef0f261f196ac62c84ae809be818383c8d4d675c893fa8d29bb24768fb8c30bd9d981
-  data.tar.gz: eacb47d26ede485337c6da4b1d6307d87ddfbd3a36c2cbe663415d5fceb28b984d915f85895369924b48b94621957ff21149729c67104d09a9bf2f93f090ef91
+  metadata.gz: 80cc826e99cce045e38eaa1d18da6ed253246a8c87b5d113a8f3a11596ea58741ad5abca6d18f44d60700d297e7a2ae599a01f630342af0af130d61e607aed95
+  data.tar.gz: 1d327f1f8108681bb3e6051d8b5ec10d8ced3c080e94d6a35b5a9ae0f6878e38e9e2e24b4b501fe3c63559219c890a54f8f30a807f45f614c2ff96463a06faea

data/.idea/testmgr.iml

@@ -11,16 +11,8 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-2.3.0 [global]" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.11.2, ruby-2.0.0-p481) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, ruby-2.0.0-p481) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v1.7.7, ruby-2.0.0-p481) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.5.0, ruby-2.0.0-p481) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.4.0, ruby-2.0.0-p481) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.4.0, ruby-2.0.0-p481) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.4.0, ruby-2.0.0-p481) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.0, ruby-2.0.0-p481) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.0, ruby-2.0.0-p481) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.4.2, RVM: ruby-2.3.0 [global]) [gem]" level="application" />
   </component>
 </module>

data/lib/testmgr/base/test_report.rb

@@ -13,6 +13,7 @@ class TestReport
   attr_accessor :completed
   attr_accessor :description
   attr_accessor :environment_under_test
+  attr_accessor :host
   attr_accessor :tStart, :tEnd
   attr_accessor :test_list
   attr_accessor :browser_under_test
@@ -29,6 +30,7 @@ class TestReport
 
   def initialize()
     @verbose=false
+    @host=""
     @description=""
     @current_rec = { :req => DEFAULT_REQ, :tc => DEFAULT_REQ}
     @test_list = []
@@ -186,6 +188,14 @@ class TestReport
     @data_under_test
   end
 
+
+  def getHost()
+    @host
+  end
+  def setHost(u)
+    @host=u
+  end
+
   # Environments
   # => :qa
   # => :cert
@@ -214,7 +224,7 @@ class TestReport
 
   def setBrowserUnderTest(bType=:firefox)
     @browser_under_test=bType
-    TestUtils.setDefaultBrowser(bType)
+#   TestUtils.setDefaultBrowser(bType)
   end
 
   # if the requirement doesn't exist, then add it.
@@ -308,13 +318,17 @@ class TestReport
     end
   end
 
+  def _skipped?(metrics)
+    metrics[:total] == 0 && metrics[:passed] == 0 && metrics[:failed] == 0
+  end
+
   def _passed?(metrics)
     metrics[:total] > 0 && metrics[:passed] > 0 && metrics[:failed] == 0
   end
 
 
   def getMetrics()
-    puts "\n\n== Test Metrics ==\n"
+    puts "\n\n== Test Metrics ==\n" if Testmgr::TestReport.instance.verbose
 
     asserts_metrics={:passed => 0, :failed => 0, :skipped => 0, :total => 0, :result => nil}
 
@@ -325,7 +339,7 @@ class TestReport
     rc=true
 
     @requirements.each do |r|
-      puts "#{r.class.to_s}"
+      puts "#{r.class.to_s}" if Testmgr::TestReport.instance.verbose
 
       rq_metrics[:total]+=1
 
@@ -337,7 +351,9 @@ class TestReport
 
 
         tc_metrics[:total]+=r.totalTestCases()
-        if _passed?(_m)
+        if _skipped?(_m)
+          tc_metrics[:skipped]+=1
+        elsif _passed?(_m)
           tc_metrics[:passed]+=1
         else
           tc_metrics[:failed]+=1
@@ -356,12 +372,18 @@ class TestReport
 
     end
 
-    rc = rq_metrics[:failed] == 0 && tc_metrics[:failed] && asserts_metrics[:failed]==0
+    rc = rq_metrics[:failed] == 0 && tc_metrics[:failed] == 0 && asserts_metrics[:failed]==0
 
 
     asserts_metrics[:result] = _passed?(asserts_metrics)
 
-    { :rc => rc, :assertions => asserts_metrics, :testcases => tc_metrics, :requirements => rq_metrics }
+    { :rc => rc,
+      :host => getHost(),
+      :assertions => asserts_metrics,
+      :testcases => tc_metrics, :requirements => rq_metrics,
+      :device => @browser_under_test.to_s,
+      :start => @tStart
+    }
   end
 
   def generateReport()
@@ -405,6 +427,8 @@ class TestReport
     elapsed_time=time_diff_milli(@tStart)
     puts "Elapsed time : #{elapsed_time.to_s} msec."
     puts "\n\nT*** Test Result : #{final_result.to_s} ***"
+
+    final_result
   end
 
 end

data/lib/testmgr/version.rb

@@ -1,3 +1,3 @@
 module Testmgr
-  VERSION = "0.3.1.pre"
+  VERSION = "0.3.2.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testmgr
 version: !ruby/object:Gem::Version
-  version: 0.3.1.pre
+  version: 0.3.2.pre
 platform: ruby
 authors:
 - h20dragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler