scoutui 2.0.3.36.pre → 2.0.3.37.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16709b29bd10eddb83a219bde91ab2defc56528a
-  data.tar.gz: ba91491b649bc492162e4e1d705ced251a12fdce
+  metadata.gz: bccb778f6c1b5132a7de7e26c912b36fd7d3b6d6
+  data.tar.gz: 0ded00f5a8bb2bbfed6b0d2b3dd8959cd6789e93
 SHA512:
-  metadata.gz: 4c1e08dbcc6b0b288bbdd2b3c755ef659fb9b9f0d136a7a3eb7dddec3de27910d5bf830e5e041b6c40bca840cb65490d659d653cfc35c785f49f67c8b93e0da2
-  data.tar.gz: 2b78ef3c738b8d9b0cfe7a76c6122effbf09ecc709ab30281c59ae0b867a3668993a1944addbe6e2698a15e39f9ad6bc4019d724de9e51c06ab67b951eca24b8
+  metadata.gz: fa4668a15b157811671450760732138a2d4aa6293ad90dbf4cc85794c2bd57635300a9eaa5102677cf5a32e3d22f5a6b3af2c5e878fda2bc3831bfbdf8b05e37
+  data.tar.gz: 814bacecda4afc188f2d656376a40827c9dd65f90f9ca952b957a11165bb00bbf01b9a70130d732ea10c801387ab7cf5f63a850446d04467297cc980ad23f904

data/examples/data_driven/data/requirements.yml

@@ -0,0 +1,8 @@
+requirement:
+  name: JIRA-1234
+  description: GEneral purpose assertions
+  assertions:
+    - isTitle(Playground)
+    - value(//*[@id='userid'])=Elvis
+    - isValue(//*[@id='userid'])=Elvis
+    - isValue(frame(elements), //input[@value='male'])=^(female|male)$

data/lib/scoutui/base/user_vars.rb

@@ -51,7 +51,35 @@ module Scoutui::Base
       @globals[:host].to_s
     end
 
+    def isTestReport?(_val)
+#     _val.match(/^\s*TestData\(.*\)\.getReport\(.*\)\s*$/)
+      _val.match(/^\s*TestData\(.*?\)\.getReport\(.*?\)((\.get\(.*?\))*)\s*$/)
+    end
+
+    def getTestReportGetter(_val)
+      _m = isTestReport?(_val)
+      if _m
+        return _m[1]
+      end
+
+      nil
+    end
+
+    def isTestData?(_val)
+      _val.match(/^\s*TestData\(.*\)\.getData\(.*\)\s*$/)
+    end
+
+
     def normalize(s)
+
+      if isTestData?(s)
+
+        _dataID=s.match(/^\s*TestData\((.*)\)\.getData\(.*\)\s*$/)[1].to_s
+        _getter=s.match(/^\s*TestData\((.*)\)\.(getData\(.*\))\s*$/)[2].to_s
+
+        return Scoutui::Base::TestData.instance.get(_dataID, _getter)
+      end
+
       _vars = s.scan(/(\$\{.*?\})/)
       _vars.each do | _v|
         if _v.length==1

data/lib/scoutui/commands/assign_var.rb

@@ -29,16 +29,44 @@ module Scoutui::Commands
 
         _val = _condition
 
-        if _val.match(/^\s*TestData\(.*\)\.getData\(.*\)\s*$/)
+        if Scoutui::Base::UserVars.instance.isTestData?(_val)
+          _v2=Scoutui::Base::UserVars.instance.normalize(_val)
+          _condition=_v2
+        elsif Scoutui::Base::UserVars.instance.isTestReport?(_val)
+          _connectID = _val.match(/^\s*TestData\((.*?)\)\.getReport\(.*?\)\s*$/)[1].to_s
+          _reportName = _val.match(/^\s*TestData\((.*?)\)\.getReport\((.*?)\)/)[2].to_s
 
-          _dataID=_val.match(/^\s*TestData\((.*)\)\.getData\(.*\)\s*$/)[1].to_s
-          _getter=_val.match(/^\s*TestData\((.*)\)\.(getData\(.*\))\s*$/)[2].to_s
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " connectID : #{_connectID}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " repName   : #{_reportName}"
 
-          _v2=Scoutui::Base::TestData.instance.get(_dataID, _getter)
+          result=DataMgr::DB.instance.getResult(id: _connectID, report: _reportName)
+          _getters = Scoutui::Base::UserVars.instance.getTestReportGetter(_val)
 
-          puts __FILE__ + (__LINE__).to_s + "  getData ==> #{_v2}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " _getters => #{_getters}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " result #{result.class} => #{result}"
 
-          _condition=_v2
+          _hit=result
+
+          if _getters
+            _getters.split(/\.get\(\s*(.*)\s*\)/).each do |p|
+
+              if !p.empty?
+                if p.match(/\d+$/) && _hit.has_key?(p.to_i)
+                  _hit=_hit[p.to_i]
+                elsif _hit.has_key?(p)
+                  _hit=_hit[_p]
+                else
+                  Scoutui::Logger::LogMgr.instance.warn __FILE__ + (__LINE__).to_s + " key #{p} doesn't exist."
+                end
+              end
+            end
+          end
+
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Retrive.DB.Results(#{_connectID}.#{_reportName} => #{result}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " _getters : #{_getters}"
+          Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " HIT : #{_hit}"
+
+          _condition=_hit.to_s
         end
 
         Scoutui::Base::UserVars.instance.setVar(_uservar, Scoutui::Commands::Utils.instance.expandMacro(_condition))

data/lib/scoutui/commands/click_object.rb

@@ -76,7 +76,7 @@ module Scoutui::Commands
               true if obj.displayed?
             }
           rescue Selenium::WebDriver::Error::TimeOutError => ex
-            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Timeout waiting for display?: #{_xpath}"
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Timeout waiting for display?: #{_locator}"
           end
 
 

data/lib/scoutui/commands/connect.rb

@@ -32,34 +32,24 @@ module Scoutui::Commands
            Testmgr::TestReport.instance.getReq('DB').testcase('DB').add(isConnected, "Verify connected to DB #{e['page']['to'].to_s}")
         end
 
-        puts __FILE__ + (__LINE__).to_s + " isConnected : #{isConnected}"
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " isConnected : #{isConnected}"
 
         _val = hasQuery(e)
         if isConnected && !_val.nil?
 
           _q=_val.to_s
-          _v2=nil
-
-          if _val.match(/^\s*TestData\(.*\)\.getData\(.*\)\s*$/)
-
-            _dataID=_val.match(/^\s*TestData\((.*)\)\.getData\(.*\)\s*$/)[1].to_s
-            _getter=_val.match(/^\s*TestData\((.*)\)\.(getData\(.*\))\s*$/)[2].to_s
-
-            _v2=Scoutui::Base::TestData.instance.get(_dataID, _getter)
-          else
-            _v2=Scoutui::Base::TestData.instance.normalize(_val)
-          end
+          _v2=Scoutui::Base::UserVars.instance.normalize(_val)
 
           if !_v2.nil?
-            puts __FILE__ + (__LINE__).to_s + "  getData ==> #{_v2}"
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  getData ==> #{_v2}"
 
-            DataMgr::DB.instance.run(id: e['page']['to'], query: _v2, report: 'ReportI')
-
-            result=DataMgr::DB.instance.getResult(id: e['page']['to'], report: 'ReportI')
-            puts "*** RESULT : #{result} ***"
-          end
+            reportName=e['page']['execute']['report'] || 'SCOUTUI'
 
+            DataMgr::DB.instance.run(id: e['page']['to'], query: _v2, report: reportName)
 
+            result=DataMgr::DB.instance.getResult(id: e['page']['to'], report: reportName)
+            Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s +  " *** RESULT : #{result.class.to_s} : #{result} ***"
+          end
 
         end
 

data/lib/scoutui/commands/type.rb

@@ -114,16 +114,11 @@ module Scoutui::Commands
                 @drv.action.send_keys(:enter).perform
               else
 
-                if _val.match(/^\s*TestData\(.*\)\.getData\(.*\)\s*$/)
+                if Scoutui::Base::UserVars.instance.isTestData?(_val)
 
-                  _dataID=_val.match(/^\s*TestData\((.*)\)\.getData\(.*\)\s*$/)[1].to_s
-                  _getter=_val.match(/^\s*TestData\((.*)\)\.(getData\(.*\))\s*$/)[2].to_s
+                  _v2=Scoutui::Base::TestData.instance.normalize(_val)
 
-               #   _v2=_val
-
-                  _v2=Scoutui::Base::TestData.instance.get(_dataID, _getter)
-
-                  puts __FILE__ + (__LINE__).to_s + "  getData ==> #{_v2}"
+                  Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + "  getData ==> #{_v2}"
                 else
 
                   _uservars = _val.scan(/\$\{(.*?)\}/)

data/lib/scoutui/version.rb

@@ -1,3 +1,3 @@
 module Scoutui
-  VERSION = "2.0.3.36.pre"
+  VERSION = "2.0.3.37.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.36.pre
+  version: 2.0.3.37.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -222,6 +222,7 @@ files:
 - examples/converters/jsonupdate.rb
 - examples/converters/jsony.rb
 - examples/data_driven/data/queries.yml
+- examples/data_driven/data/requirements.yml
 - examples/db/sqlclient.rb
 - examples/ex1/commands.holidays.yml
 - examples/ex1/commands.yml