scoutui 2.0.3.35.pre → 2.0.3.36.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 540412b6d77e7ccf8ec18334a5dc672ef8a0fd4c
-  data.tar.gz: e3aea8b02e32686551ee023085d0e821e65fae7b
+  metadata.gz: 16709b29bd10eddb83a219bde91ab2defc56528a
+  data.tar.gz: ba91491b649bc492162e4e1d705ced251a12fdce
 SHA512:
-  metadata.gz: 1601ec8f59c88b6cc09e87777bbad85270d09dc7278d0279b9ae048f6f159bd6f1966a357217194145df82fee99bee6152835cf67c5bbf161e95678e18e509d0
-  data.tar.gz: 32119b56cc28d8f109e60be5c1a483bc3ff73f900b0ec199bc6c4821725a683a660eb23e226255e87f8affa74f3544dc52557c6b35d894b45b356718b103f6d4
+  metadata.gz: 4c1e08dbcc6b0b288bbdd2b3c755ef659fb9b9f0d136a7a3eb7dddec3de27910d5bf830e5e041b6c40bca840cb65490d659d653cfc35c785f49f67c8b93e0da2
+  data.tar.gz: 2b78ef3c738b8d9b0cfe7a76c6122effbf09ecc709ab30281c59ae0b867a3668993a1944addbe6e2698a15e39f9ad6bc4019d724de9e51c06ab67b951eca24b8

data/examples/data_driven/data/queries.yml

@@ -0,0 +1,10 @@
+CT_Jobs_Run:
+  name: CTE Query I
+  description: SQL Query used for Invoice
+  query1: use p0170036ou8o_000 select JR_KEY, JD_KEY, STATUS_CODE FROM CT_JOB_RUN WHERE START_TIME > '2013-09-17' AND END_TIME < '2013-10-17'
+  query2: use p0170036ou8o_000 select JR_KEY, JD_KEY, STATUS_CODE FROM CT_JOB_RUN WHERE START_TIME > '2013-09-17' AND END_TIME < '2013-10-17'
+---
+CT_All:
+  name: CTE Query I
+  description: SQL Query used for Invoice all 2016
+  query: use p0170036ou8o_000 select JR_KEY, JD_KEY, STATUS_CODE FROM CT_JOB_RUN WHERE START_TIME > '2016-01-01' AND END_TIME < '2016-0817'

data/lib/scoutui/base/test_data.rb

@@ -9,10 +9,12 @@ module Scoutui::Base
     include Singleton
 
     attr_accessor :testware
+    attr_accessor :dblist
     attr_accessor :dut
 
     def initialize
       @testware={}
+      @dblist={}
     end
 
     def add(_id, _f)
@@ -22,6 +24,32 @@ module Scoutui::Base
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " => #{@testware[_id]}"
     end
 
+    def addDB(_id, _f)
+      rc=DataMgr::DB.instance.load(_f)
+      if rc
+        @dblist[_id]={}
+      end
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " addDB(#{_id}, #{_f}) : #{rc}"
+      rc
+    end
+
+    def connectDB(_connectID)
+      is_connected=false
+      begin
+          hit=DataMgr::DB.instance.getConfig(_connectID)
+
+          puts __FILE__ + (__LINE__).to_s + " ** hit => #{hit}"
+          is_connected=DataMgr::DB.instance.connect(_connectID)
+
+      rescue => ex
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Exception #{ex.class}"
+        Scoutui::Logger::LogMgr.instance.debug ex.backtrace
+      end
+
+      Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " connectDB(#{_connectID}) : #{is_connected}"
+      is_connected
+    end
+
     def addx(_id, _reqs)
       Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " add(#{_id}, #{_reqs}"
       @requirements[_id]=_reqs

data/lib/scoutui/commands/assign_var.rb

@@ -26,6 +26,21 @@ module Scoutui::Commands
         Scoutui::Logger::LogMgr.instance.command.info __FILE__ + (__LINE__).to_s + " | translate : #{_locator}" if Scoutui::Utils::TestUtils.instance.isDebug?
         obj = Scoutui::Base::QBrowser.findElement(@drv, _locator, Scoutui::Commands::Utils.instance.getFrameSearch(),  Scoutui::Commands::Utils.instance.getTimeout)
       else
+
+        _val = _condition
+
+        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)
+
+          puts __FILE__ + (__LINE__).to_s + "  getData ==> #{_v2}"
+
+          _condition=_v2
+        end
+
         Scoutui::Base::UserVars.instance.setVar(_uservar, Scoutui::Commands::Utils.instance.expandMacro(_condition))
         rc=_condition
       end

data/lib/scoutui/commands/commands.rb

@@ -51,6 +51,16 @@ module Scoutui::Commands
         _c = Scoutui::Commands::Pause.new(nil)
         _c.execute(e);
 
+      elsif Scoutui::Commands::Utils.instance.isLoadDB?(_action)
+        _cmd='loaddb'
+        _c = Scoutui::Commands::LoadDB.new(e)
+        _c.run(driver: my_driver, dut: e)
+
+      elsif Scoutui::Commands::Utils.instance.isConnect?(_action)
+        _cmd='connect'
+        _c = Scoutui::Commands::Connect.new(e)
+        _c.run(driver: my_driver, dut: e)
+
       elsif Scoutui::Commands::Utils.instance.isLoadData?(_action)
         _cmd='loaddata'
         _c = Scoutui::Commands::LoadData.new(e)

data/lib/scoutui/commands/connect.rb

@@ -0,0 +1,84 @@
+require_relative './commands'
+
+module Scoutui::Commands
+
+  class Connect < Command
+
+
+    def hasQuery(e)
+      rc=nil
+      if e['page'].has_key?('execute') && e['page']['execute'].has_key?('query')
+        rc=e['page']['execute']['query'].to_s
+      end
+      rc
+    end
+
+    def execute(drv, e=nil)
+      @drv=drv if !drv.nil?
+
+      rc=false
+      obj=nil
+      isConnected=false
+      _locator=nil
+
+#     _req = Scoutui::Utils::TestUtils.instance.getReq() || "DB"
+
+      begin
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " connect()"
+
+        if e['page'].has_key?('to')
+           isConnected=Scoutui::Base::TestData.instance.connectDB(e['page']['to'])
+           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}"
+
+        _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
+
+          if !_v2.nil?
+            puts __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
+
+
+
+        end
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " connect() : #{isConnected}"
+        rc=true
+
+      rescue => ex
+        Scoutui::Logger::LogMgr.instance.warn "Error during processing: #{ex}"
+        Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+      end
+
+      Scoutui::Logger::LogMgr.instance.asserts.info "Verify connect command passed - #{rc}"
+      Testmgr::TestReport.instance.getReq('DB').testcase('DB').add(rc, "Verify connect command passed")
+
+      setResult(rc)
+    end
+
+  end
+
+
+
+end

data/lib/scoutui/commands/load_data.rb

@@ -26,9 +26,6 @@ module Scoutui::Commands
 
           end
 
-
-
-
         end
 
         rc=true

data/lib/scoutui/commands/load_db.rb

@@ -0,0 +1,49 @@
+require_relative './commands'
+
+module Scoutui::Commands
+
+  class LoadDB < Command
+
+
+    def execute(drv, e=nil)
+      @drv=drv if !drv.nil?
+
+      rc=false
+      obj=nil
+      _locator=nil
+
+      _req = Scoutui::Utils::TestUtils.instance.getReq()
+
+      begin
+
+        Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " LoadDB()"
+
+        if e['page'].has_key?('files')
+
+          e['page']['files'].each do |_yaml|
+          #  Scoutui::Base::TestData.instance.addDB(e['page']['name'], _yaml)
+            Scoutui::Base::TestData.instance.addDB('SCOUTUI', _yaml)
+          end
+
+        end
+
+        rc=true
+
+      rescue => ex
+        Scoutui::Logger::LogMgr.instance.warn "Error during processing: #{ex}"
+        Scoutui::Logger::LogMgr.instance.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
+      end
+
+      if rc
+        Scoutui::Logger::LogMgr.instance.asserts.info "Verify requirements command passed - #{rc}"
+        Testmgr::TestReport.instance.getReq(_req).testcase('click').add(rc, "Verify requirements command passed")
+      end
+
+      setResult(rc)
+    end
+
+  end
+
+
+
+end

data/lib/scoutui/commands/utils.rb

@@ -25,6 +25,8 @@ module Scoutui::Commands
                      'type',
                      'click',
                      'loaddata',
+                     'connect',
+                     'loaddb',
                      'loadrequirements',
                      'mouseover',
                      'navigate',
@@ -257,6 +259,14 @@ module Scoutui::Commands
       !_action.match(/fillform\(/i).nil?
     end
 
+    def isConnect?(_action)
+      !_action.match(/^\s*connect\s*$/i).nil?
+    end
+
+    def isLoadDB?(_action)
+      !_action.match(/^\s*loaddb\s*$/i).nil?
+    end
+
     def isLoadData?(_action)
       !_action.match(/^\s*loaddata\s*$/i).nil?
     end
@@ -330,6 +340,10 @@ module Scoutui::Commands
         @totalCommands['click']+=1
       elsif isMouseOver?(cmd)
         @totalCommands['mouseover']+=1
+      elsif isConnect?(cmd)
+        @totalCommands['connect']+=1
+      elsif isLoadDB?(cmd)
+        @totalCommands['loaddb']+=1
       elsif isLoadData?(cmd)
         @totalCommands['loaddata']+=1
       elsif isLoadRequirements?(cmd)

data/lib/scoutui/eyes/eye_scout.rb

@@ -264,6 +264,9 @@ module Scoutui::Eyes
       Testmgr::TestReport.instance.addRequirement('Command')
       Testmgr::TestReport.instance.getReq('Command').add(Testmgr::TestCase.new('isValid', "isValid"))
 
+      Testmgr::TestReport.instance.addRequirement('DB')
+      Testmgr::TestReport.instance.getReq('DB').add(Testmgr::TestCase.new('DB', "DB"))
+
       Testmgr::TestReport.instance.addRequirement('Execution')
       Testmgr::TestReport.instance.getReq('Execution').add(Testmgr::TestCase.new('Status', "Status"))
 

data/lib/scoutui/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoutui
 version: !ruby/object:Gem::Version
-  version: 2.0.3.35.pre
+  version: 2.0.3.36.pre
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,6 +221,7 @@ files:
 - examples/ci_reporter/ci_example.rb
 - examples/converters/jsonupdate.rb
 - examples/converters/jsony.rb
+- examples/data_driven/data/queries.yml
 - examples/db/sqlclient.rb
 - examples/ex1/commands.holidays.yml
 - examples/ex1/commands.yml
@@ -276,11 +277,13 @@ files:
 - lib/scoutui/commands/click_object.rb
 - lib/scoutui/commands/command.rb
 - lib/scoutui/commands/commands.rb
+- lib/scoutui/commands/connect.rb
 - lib/scoutui/commands/exists_alert.rb
 - lib/scoutui/commands/fill_form.rb
 - lib/scoutui/commands/highlight.rb
 - lib/scoutui/commands/jsalert/action_jsalert.rb
 - lib/scoutui/commands/load_data.rb
+- lib/scoutui/commands/load_db.rb
 - lib/scoutui/commands/load_requirements.rb
 - lib/scoutui/commands/mouse_over.rb
 - lib/scoutui/commands/pause.rb