smart_monkey 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f43f6aa20e6eedb6e5c28de2b98bfdc86e608a9
-  data.tar.gz: c32bb2694836f6d8116d320526e88eff3ea5c2d7
+  metadata.gz: 847d8e2008d02e4d0dea00c85c4bf3c7bb106792
+  data.tar.gz: 4646d1a3da95b94cc90ae2601f9706a93ed83732
 SHA512:
-  metadata.gz: cff1fbd4a22560d4c8b6eb6c1df2b170be4b8cddc52b2f5a9d68c9e06dbb8b34a80daf950284f639d5b4d2aef31d66c439d0315adbf4286316b4465bb98c3d9e
-  data.tar.gz: 9f53613758f53e3cc5cabf072917f4d08238bff2fcec5140c4bcb303c7878796a77f979cceac941070ba332bba4d18ac2cbab532a0763790ee457b6c551c5006
+  metadata.gz: 0bda662b08477fee72e67f081d16404a01651e02424e6b99931ba3f41172bb8d2e5210b79955f654a40569fb60eb274a419939795841a0d21ff05224f4c7c97e
+  data.tar.gz: 241f3eeec81ba69252e271b0e8e79d1e842239b61ad21ef78767b9e0e64f98eb3e73326c3eaadd125a60901632953d5fe7d0849723646c097a3853ae752ad9c7

data/README.md

@@ -17,35 +17,66 @@ iOS Monkey Test Tool.
   [tp]:https://github.com/vigossjjj/CrashMonkey4IOS/tree/master/lib/ui-auto-monkey/tuneup
   [troubleshooting]:https://github.com/vigossjjj/CrashMonkey4IOS/tree/master/Troubleshooting.md
 
-###环境及依赖安装:
-###### 系统要求
+###系统及环境要求:
 1. 安装Ruby运行环境，建议不要使用OS X自带版本，可自行使用RVM安装最新版的Ruby。建议使用淘宝镜像安装，速度比较快，`$ sed -i -e 's/ftp\.ruby-lang\.org\/pub\/ruby/ruby\.taobao\.org\/mirrors\/ruby/g' ~/.rvm/config/db`
 2. 确保gem可用，也建议使用淘宝镜像 `gem sources --remove https://rubygems.org/;gem sources -a http://ruby.taobao.org/;gem sources -l`
 3. 安装**Homebrew** `ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
 4. 建议Xcode 6.x +
 
-###### 依赖安装
+###必要依赖安装:
 1. `brew install -HEAD ideviceinstaller`
 2. `brew install libimobiledevice`
 3. `brew install imagemagick`
-4. `gem install smart_monkey`
 
 ###使用说明:
-1. 执行前需要先配置[custom.js][custom]相关参数
-2. 执行命令`smart_monkey -a ${App_BunnelID} -w ${iPhone_UDID}`
+###### 安装Release版
+`gem install smart_monkey`, 执行入口: 终端下直接使用`smart_monkey`
+###### 安装开发版
+直接clone本项目, 执行入口: `/CrashMonkey4IOS/bin/smart_monkey`
+
+###### 执行命令
+`smart_monkey -a ${App_BunnelID} -w ${iPhone_UDID}`
 
 ###参数说明:
+
+* **`-a`**: 指向被测程序的**BundleID**(不可缺省)。e.g.`-a com.mytest.app`
+* **`-w`**: 指向测试设备的**UDID**，可以通过`$instruments -s devices`进行设备id的查看，若缺省则默认指向第一台设备(模拟器或真机)。e.g.`-w 26701a3a5bc17038ca0465186407b912375b35a7`
+* **`-n`**: monkey测试的执行次数，默认为1次。e.g.`-n 3`
+* **`-d`**: 测试报告地址，默认为当前目录下的**smart_monkey_result**文件夹下。e.g.`-d ~/my-monkey-test-result`
+* **`-t`**: 执行时间，单位为秒。e.g.`-t 60`
+* **`-s`**: 指向被测app的**.dSYM**文件，若出现crash，解析crash为明文。e.g.`-s testapp.dSYM`
+* **`-c`**: 自定义的配置集路径，**参数必须为目录**，目录下必须包含`custom.js`，若使用handler，目录下需存在名为**handler**的文件夹，用于存放相关文件。e.g.`-c /my/path/custom_cfg`
+
+	**如果使用custom_cfg必须遵守如下目录结构**：
+
+	```
+	custom_cfg
+    	├── custom.js
+    	└── handler
+        	├── buttonHandler.js
+        	└── wbScrollViewButtonHandler.js
+	```
+* **`--event-number`**: 定义Monkey测试的总事件数，默认为50。e.g.`--event-number 100`
+* **`--compress-result`**: 对测试过程中截取的图片进行压缩，以节省空间开销。e.g.`--compress-result 50%`
+* **`--detail-count`**: 定义报告详情中记录的事件总数，默认为50，即在报告当中展示最近的50次随机事件，且进行操作示意绘制。e.g.`--detail-count 100`
+* **`--show-config`**: 打印当前的配置信息，即**custom.js**。e.g.`--show-config`
+* **`--drop-useless-img`**: 删除除展示在报告当中的其余截图，以节省空间开销，如，一轮Monkey测试共产出截图100张，参数`--detail-count`设置为20，那么使用`--drop-useless-img`会删除其余80张截图。e.g.`--drop-useless-img`
+* **`--list-app`**: 打印当前连接的真机及模拟器中所安装的app。e.g.`--list-app`
+* **`--list-devices`**: 打印当前所有可用设备。e.g.`--list-devices`
+* **`--reset-ios-sim`**: 重启模拟器。e.g.`--reset-ios-sim`
+* **`--version`**: 打印smart_monkey的版本号。e.g.`--version`
+
 ```
-$ smart_monkey -h
+⇒  CrashMonkey4IOS/bin/smart_monkey -h
 Usage: smart_monkey [options]
     -a app_name                      Bundle ID of the desired target on device(Required)
-    -w device                        Target device udid or device describe will match" (Required)
+    -w device                        Target Device UDID(Required)
     -n run_count                     How many times monkeys run(default: 1)
     -d result_dir                    Where to output result(default: ./smart_monkey_result)
     -t time_limit_sec                Time limit of running
     -s dsym_file                     Use .dSYM file to symbolicating crash logs
-    -c custom_path                   Configuration custom.js Path
-    -e extend_javascript_path        Extend Uiautomation Javascript for such Login scripts
+    -c custom_cfg_path               Indicate confige lib directory path, not a file path.
+        --event-number event_number  The monkey event number(default: 50)
         --compress-result compress_rate
                                      compress the screenshot images to save disk space!(example: 50%)
         --detail-count detail_event_count
@@ -54,7 +85,7 @@ Usage: smart_monkey [options]
         --drop-useless-img           Delete the un-displayed images of detial page.
         --list-app                   Show List of Installed Apps in iPhone/iPhone Simulator
         --list-devices               Show List of Devices
-        --reset-iPhone-Simulator     Reset iPhone Simulator
+        --reset-ios-sim              Reset iPhone Simulator
         --version                    print smart monkey version
 ```
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/bin/smart_monkey

@@ -12,20 +12,20 @@ require 'smart_monkey'
 opts = {}
 ARGV.options do |o|
   o.on('-a app_name', 'Bundle ID of the desired target on device(Required)') {|b| opts[:app_path] = b}
-  o.on('-w device', 'Target Device UDID(Required)') {|b| opts[:device] = b}
+  o.on('-w device', 'Target Device UDID') {|b| opts[:device] = b}
   o.on('-n run_count', 'How many times monkeys run(default: 1)') {|b| opts[:run_count] = b.to_i}
   o.on('-d result_dir', 'Where to output result(default: ./smart_monkey_result)') {|b| opts[:result_base_dir] = File.expand_path(b)}
   o.on('-t time_limit_sec', 'Time limit of running') {|b| opts[:time_limit_sec] = b.to_i}
   o.on('-s dsym_file', 'Use .dSYM file to symbolicating crash logs') {|b| opts[:dsym_file_path] = File.expand_path(b)}
-  o.on('-c custom_path', 'Configuration custom.js Path') {|b| opts[:custom_path] = File.expand_path(b)}
-  o.on('-e extend_javascript_path', 'Extend Uiautomation Javascript for such Login scripts') {|b| opts[:extend_javascript_path] = File.expand_path(b)}
+  o.on('-c custom_cfg_path', 'Indicate confige lib directory path, not a file path.') {|b| opts[:custom_cfg_path] = File.expand_path(b)}
+  o.on('--event-number event_number', 'The monkey event number(default: 50)'){|b| opts[:event_number] = b}
   o.on('--compress-result compress_rate', 'compress the screenshot images to save disk space!(example: 50%)'){|b| opts[:compress_rate] = b}
   o.on('--detail-count detail_event_count', 'How many events to show in detail result page(default 50)'){|b| opts[:detail_event_count] = b.to_i}
   o.on('--show-config', 'Show Current Configuration custom.js') {|_| opts[:show_config] = true}
   o.on('--drop-useless-img', 'Delete the un-displayed images of detial page.') {|_| opts[:drop_useless_img] = true}
   o.on('--list-app', 'Show List of Installed Apps in iPhone/iPhone Simulator') {|_| opts[:list_app] = true}
   o.on('--list-devices', 'Show List of Devices') {|_| opts[:list_devices] = true}
-  o.on('--reset-iPhone-Simulator', 'Reset iPhone Simulator'){|_| opts[:reset_iphone_simulator] = true}
+  o.on('--reset-ios-sim', 'Reset iPhone Simulator'){|_| opts[:reset_iphone_simulator] = true}
   o.on('--version', 'print smart monkey version'){|_| opts[:version] = true}
   o.parse!
 end
@@ -39,6 +39,13 @@ if opts[:version]
   exit(1)
 end
 
+if opts[:custom_cfg_path]
+  if !File.directory? opts[:custom_cfg_path]
+    puts ARGV.options.help 
+    exit(1) 
+  end
+end
+
 unless opts[:app_path] || opts[:show_config] || opts[:list_app] || opts[:reset_iphone_simulator] || opts[:list_devices]
   puts ARGV.options.help
   exit(1)

data/lib/smart_monkey/command_helper.rb

@@ -28,18 +28,18 @@ module UIAutoMonkey
       Open3.popen3(*cmds) do |stdin, stdout, stderr, thread|
         @tmpline = ""
         stdin.close
-        # app_hang_monitor_thread = Thread.start{
-        #   sleep 30
-        #   while true
-        #     current_line = @tmpline
-        #     sleep 30
-        #     after_sleep_line = @tmpline
-        #     if current_line == after_sleep_line
-        #       puts "WARN: Application go to background! Auto-Re-Launch app!"
-        #       relaunch_app(device, app)
-        #     end
-        #   end
-        # }
+        app_hang_monitor_thread = Thread.start{
+          sleep 30
+          while true
+            current_line = @tmpline
+            sleep 30
+            after_sleep_line = @tmpline
+            if current_line == after_sleep_line
+              puts "WARN: no response in log, trigger re-launch action."
+              relaunch_app(device, app)
+            end
+          end
+        }
         instruments_stderr_thread = Thread.start{
           stderr.each do |line|
             puts line
@@ -48,11 +48,11 @@ module UIAutoMonkey
         stdout.each do |line|
           @tmpline = line.strip
           puts @tmpline
-          # if @tmpline =~ /MonkeyTest finish/
-          #   app_hang_monitor_thread.kill
-          # end
+          if @tmpline =~ /MonkeyTest finish/ || @tmpline =~ /Script was stopped by the user/
+            app_hang_monitor_thread.kill
+          end
         end
-        # app_hang_monitor_thread.kill
+        app_hang_monitor_thread.kill
         instruments_stderr_thread.kill
       end
     end

data/lib/smart_monkey/monkey_runner.rb

@@ -186,8 +186,9 @@ module UIAutoMonkey
     end
 
     def reset_iphone_simulator
-      FileUtils.rm_rf("#{Dir.home}/Library/Application\ Support/iPhone\ Simulator/")
-      puts 'reset iPhone Simulator successful'
+      `killall -9 "iOS Simulator"`
+      # FileUtils.rm_rf("#{Dir.home}/Library/Application\ Support/iPhone\ Simulator/")
+      # puts 'reset iPhone Simulator successful'
     end
 
     def total_test_count
@@ -324,10 +325,15 @@ module UIAutoMonkey
           "3"=>"270",
           "4"=>"90",
       }
-      orientationNum = File.read(File.join(result_base_dir,"orientation")).strip
-      value = rotated_map[orientationNum]
-      unless value.nil?
-        `mogrify -rotate #{value} "#{path}/*.png"`
+      orientation_file = File.join(result_base_dir,"orientation")
+      if File.exists?(orientation_file)
+        orientationNum = File.read(orientation_file).strip
+        value = rotated_map[orientationNum]
+        unless value.nil?
+          `mogrify -rotate #{value} "#{path}/*.png"`
+        end
+      else
+        exit(1)
       end
     end
 
@@ -368,6 +374,10 @@ module UIAutoMonkey
       File.expand_path('../../ios_device_log/deviceconsole', __FILE__)
     end
 
+    def ui_auto_monkey_lib_original_path
+      File.expand_path('../../ui-auto-monkey', __FILE__)
+    end
+
     def ui_auto_monkey_original_path
       File.expand_path('../../ui-auto-monkey/UIAutoMonkey.js', __FILE__)
     end
@@ -476,6 +486,20 @@ module UIAutoMonkey
       `xsltproc --output "#{result_dir}/uiautomation.html" #{uiautomation_xsl_path} "#{result_dir}/Automation Results.plist"`
     end
 
+    def replace_event_num_for_time_limit(custom_file)
+      File.open(custom_file) do |fr|
+        buffer = fr.read.gsub(/monkey.config.numberOfEvents.*;/, "monkey.config.numberOfEvents = 99999999;")
+        File.open(custom_file, "w") { |fw| fw.write(buffer) }
+      end
+    end
+
+    def replace_event_num_for_user_define(custom_file, event_number)
+      File.open(custom_file) do |fr|
+        buffer = fr.read.gsub(/monkey.config.numberOfEvents.*;/, "monkey.config.numberOfEvents = #{event_number};")
+        File.open(custom_file, "w") { |fw| fw.write(buffer) }
+      end
+    end
+
     def generate_ui_auto_monkey
       # extend_javascript_flag, extend_javascript_path =  show_extend_javascript
       # orig = File.read(ui_custom_original_path)
@@ -487,15 +511,23 @@ module UIAutoMonkey
       # end
       envs_str="UniqueDeviceID=\"#{device}\";\nResultBaseDir=\"#{result_base_dir}\";\n"
       File.open(File.join(result_base_dir,"Env.js"), 'w') {|f| f.write(envs_str)}
-      FileUtils.copy(config_custom_path, result_base_dir)
-      FileUtils.copy(ui_auto_monkey_original_path, result_base_dir)
-      FileUtils.cp_r(ui_hole_handler_original_path, result_base_dir)
-      FileUtils.cp_r(ui_tuneup_original_path, result_base_dir)
-      # FileUtils.copy("#{bootstrap_dir}/js/bootstrap.js", result_base_dir)
+      if @options[:custom_cfg_path]
+        FileUtils.cp_r(File.join(@options[:custom_cfg_path], "."), result_base_dir)
+        FileUtils.copy(ui_auto_monkey_original_path, result_base_dir)
+        FileUtils.cp_r(ui_tuneup_original_path, result_base_dir)
+      else
+        FileUtils.cp_r(File.join(ui_auto_monkey_lib_original_path, "."), result_base_dir)
+      end
+      replace_event_num_for_user_define(ui_custom_path, @options[:event_number]) if @options[:event_number]
+      replace_event_num_for_time_limit(ui_custom_path) unless time_limit_sec.nil?
     end
 
     def config_custom_path
-      @options[:custom_path] || ui_custom_original_path
+      if @options[:custom_cfg_path]
+        File.join(@options[:custom_cfg_path], "custom.js")
+      else
+        ui_custom_original_path
+      end
     end
 
     def replace_text(orig, replace_str, marker_begin_line, marker_end_line)
@@ -540,7 +572,6 @@ module UIAutoMonkey
       hash[:uia_trace] = @uia_trace
       hash[:crashed] = @crashed
       hash[:no_run] = @no_run
-
       er = Erubis::Eruby.new(File.read(template_path('result.html.erb')))
       open("#{result_dir}/result.html", 'w') do |f|
         f.write(er.result(hash))

data/lib/ui-auto-monkey/custom.js

@@ -1,11 +1,9 @@
 #import "UIAutoMonkey.js"
-#import "handler/buttonHandler.js"
-#import "handler/wbScrollViewButtonHandler.js"
 #import "tuneup/tuneup.js"
 
 // Configure the monkey: use the default configuration but a bit tweaked
 monkey = new UIAutoMonkey();
-monkey.config.numberOfEvents = 50; // turn off to make clear that we want minutes
+monkey.config.numberOfEvents = 50; // total number of monkey event
 monkey.config.delayBetweenEvents = 0.05;
 monkey.config.eventWeights = {
 			tap: 100,
@@ -30,44 +28,12 @@ monkey.config.frame = {
 					x: parseInt(UIATarget.localTarget().rect().origin.x),
 					y: parseInt(UIATarget.localTarget().rect().origin.y)+20
 				},
-			size: { 
+			size: 
+				{ 
 					width: parseInt(UIATarget.localTarget().rect().size.width),
 					height: parseInt(UIATarget.localTarget().rect().size.height)-20
 				}
 		};// Ignore the UIAStatusBar area, avoid to drag out the notification page. 
 
-//UI Holes handlers
-var handlers = [];
-handlers.push(new ButtonHandler("WBBack", 10, true));
-handlers.push(new WBScrollViewButtonHandler("weatherLeftBack", 5, false, 1));
-handlers.push(new ButtonHandler("取消", 3, true));
-handlers.push(new ButtonHandler("CloseX", 3, true));
-handlers.push(new ButtonHandler("确定", 3, false));
-
-monkey.config.conditionHandlers = handlers;
-
-//ANR settings
-var aFingerprintFunction = function() {
-    var mainWindow = UIATarget.localTarget().frontMostApp().mainWindow();
-    //if an error occurs log it and make it the fingerprint
-    try {
-        var aString = mainWindow.elementAccessorDump("tree", true);
-        // var aString = mainWindow.logElementTree();
-        // var aString = mainWindow.logElementJSON(["name"])
-        if (monkey.config.anrSettings.debug) {
-            UIALogger.logDebug("fingerprintFunction tree=" + aString);
-        }
-    }
-    catch (e) {
-        aString = "fingerprintFunction error:" + e;
-        UIALogger.logWarning(aString);
-    }
-    return aString;
-};
-monkey.config.anrSettings.fingerprintFunction = false;//false | aFingerprintFunction
-monkey.config.anrSettings.eventsBeforeANRDeclared = 18; //throw exception if the fingerprint hasn't changed within this number of events
-monkey.config.anrSettings.eventsBetweenSnapshots = 8; //how often (in events) to take a snapshot using the fingerprintFunction 
-monkey.config.anrSettings.debug = false;  //log extra info on ANR state changes
-
 // Release the monkey!
 monkey.RELEASE_THE_MONKEY();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_monkey
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - vigossjjj
@@ -144,8 +144,6 @@ files:
 - lib/smart_monkey/templates/result_view.js
 - lib/ui-auto-monkey/UIAutoMonkey.js
 - lib/ui-auto-monkey/custom.js
-- lib/ui-auto-monkey/handler/buttonHandler.js
-- lib/ui-auto-monkey/handler/wbScrollViewButtonHandler.js
 - lib/ui-auto-monkey/tuneup/LICENSE
 - lib/ui-auto-monkey/tuneup/assertions.js
 - lib/ui-auto-monkey/tuneup/image_asserter

data/lib/ui-auto-monkey/handler/buttonHandler.js

@@ -1,111 +0,0 @@
-// Copyright (c) 2015 Yahoo inc. (http://www.yahoo-inc.com)
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-"use strict";
-//Conforms to the ConditionHandler protocol in UIAutoMonkey
-//Usage 
-//  var handlers = [ ];
-//  var handlerInterval = 20;  //every how many events to process. Can vary by each handler, but often useful to group them
-//  handlers.push(new ButtonHandler("Done", handlerInterval, false));  //every 20 events, press "Done" button if found as a top level button (no nav bar). 
-//  ...
-//  config.conditionHandlers = handlers
-//  
-function ButtonHandler(buttonName, checkEveryNumber, useNavBar, optionalIsTrueFunction) {
-	this.buttonName = buttonName;
-	this.checkEveryNumber = checkEveryNumber || 10;
-	if (useNavBar == undefined) {
-		useNavBar = true;
-	};
-	this.useNavBar = useNavBar;
-	this.optionalIsTrueFunction = optionalIsTrueFunction || null;
-	//stats
-	this.statsIsTrueInvokedCount = 0;
-	this.statsIsTrueReturnedTrue = 0;
-	this.statsIsTrueReturnedFalse = 0;
-	this.statsHandleInvokedCount = 0;
-	this.statsHandleNotValidAndVisibleCount = 0;
-	this.statsHandleErrorCount = 0;
-}
-
-// return true if we our button is visible 
-ButtonHandler.prototype.isTrue = function(target, eventCount, mainWindow) {
-	this.statsIsTrueInvokedCount++;
-	var result;
-	if (this.optionalIsTrueFunction == null) {
-		var aButton = this.findButton(target);
-        // result = aButton.isNotNil() && aButton.validAndVisible();
-        result = aButton.isNotNil() && aButton.isValid() && aButton.isVisible();
-    } else {
-	    result = this.optionalIsTrueFunction(target, eventCount, mainWindow);
-    }
-    if (result) {
-	  this.statsIsTrueReturnedTrue++;
-    } else {
-	  this.statsIsTrueReturnedFalse++;
-    };
-    return result;
-};
-
-ButtonHandler.prototype.findButton = function(target) {
-	return this.useNavBar ? 
-	    target.frontMostApp().mainWindow().navigationBar().buttons()[this.buttonName] :
-        target.frontMostApp().mainWindow().buttons()[this.buttonName];	
-};
-	
-//every checkEvery() number of events our isTrue() method will be queried.
-ButtonHandler.prototype.checkEvery = function() {
-    return this.checkEveryNumber;
-};
-
-// if true then after we handle an event consider the particular Monkey event handled, and don't process the other condition handlers.
-ButtonHandler.prototype.isExclusive = function() {
-    return true;
-};
-
-// Press our button
-ButtonHandler.prototype.handle = function(target, mainWindow) {
-	this.statsHandleInvokedCount++;
-	var button = this.findButton(target);
-	if (button.isValid() && button.isVisible()) {
-		try{
-		    button.tap();
-		} catch(err) {
-			this.statsHandleErrorCount++;
-			UIALogger.logWarning(err);
-		}
-	} else {
-		this.statsHandleNotValidAndVisibleCount++
-		//UIALogger.logWarning(this.toString() + " button is not validAndVisible");
-	};
-};
-
-ButtonHandler.prototype.toString = function() {
-	return ["MonkeyTest::ButtonHandler(" + this.buttonName, this.checkEveryNumber, this.useNavBar, ")"].join();
-};
-
-ButtonHandler.prototype.logStats = function() {
-	UIALogger.logDebug([this.toString(),
-	    "IsTrueInvokedCount", this.statsIsTrueInvokedCount,
-		"IsTrueReturnedTrue", this.statsIsTrueReturnedTrue,
-		"IsTrueReturnedFalse", this.statsIsTrueReturnedFalse,
-		"HandleInvokedCount", this.statsHandleInvokedCount,
-		"HandleNotValidAndVisibleCount", this.statsHandleNotValidAndVisibleCount,
-		"HandleErrorCount", this.statsHandleErrorCount].join());
-};

data/lib/ui-auto-monkey/handler/wbScrollViewButtonHandler.js

@@ -1,114 +0,0 @@
-// Copyright (c) 2015 Yahoo inc. (http://www.yahoo-inc.com)
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-"use strict";
-//Conforms to the ConditionHandler protocol in UIAutoMonkey
-//Usage 
-//  var handlers = [ ];
-//  var handlerInterval = 20;  //every how many events to process. Can vary by each handler, but often useful to group them
-//  handlers.push(new ButtonHandler("Done", handlerInterval, false));  //every 20 events, press "Done" button if found as a top level button (no nav bar). 
-//  ...
-//  config.conditionHandlers = handlers
-//  
-function WBScrollViewButtonHandler(buttonName, checkEveryNumber, useNavBar, scrollViewIndex, optionalIsTrueFunction) {
-	this.buttonName = buttonName;
-	this.scrollViewIndex = scrollViewIndex;
-	this.checkEveryNumber = checkEveryNumber || 10;
-	if (useNavBar == undefined) {
-		useNavBar = true;
-	};
-	this.useNavBar = useNavBar;
-	this.optionalIsTrueFunction = optionalIsTrueFunction || null;
-	//stats
-	this.statsIsTrueInvokedCount = 0;
-	this.statsIsTrueReturnedTrue = 0;
-	this.statsIsTrueReturnedFalse = 0;
-	this.statsHandleInvokedCount = 0;
-	this.statsHandleNotValidAndVisibleCount = 0;
-	this.statsHandleErrorCount = 0;
-}
-
-// return true if we our button is visible 
-WBScrollViewButtonHandler.prototype.isTrue = function(target, eventCount, mainWindow) {
-	this.statsIsTrueInvokedCount++;
-	var result;
-	if (this.optionalIsTrueFunction == null) {
-		var aButton = this.findButton(target);
-        // result = aButton.isNotNil() && aButton.validAndVisible();
-        result = aButton.isNotNil() && aButton.isValid();
-    } else {
-	    result = this.optionalIsTrueFunction(target, eventCount, mainWindow);
-    }
-    if (result) {
-	  this.statsIsTrueReturnedTrue++;
-    } else {
-	  this.statsIsTrueReturnedFalse++;
-    };
-    return result;
-};
-
-WBScrollViewButtonHandler.prototype.findButton = function(target) {
-	return this.useNavBar ? 
-	    target.frontMostApp().mainWindow().navigationBar().buttons()[this.buttonName]:
-        target.frontMostApp().mainWindow().scrollViews()[this.scrollViewIndex].buttons()[this.buttonName];
-};
-	
-//every checkEvery() number of events our isTrue() method will be queried.
-WBScrollViewButtonHandler.prototype.checkEvery = function() {
-    return this.checkEveryNumber;
-};
-
-// if true then after we handle an event consider the particular Monkey event handled, and don't process the other condition handlers.
-WBScrollViewButtonHandler.prototype.isExclusive = function() {
-    return true;
-};
-
-// Press our button
-WBScrollViewButtonHandler.prototype.handle = function(target, mainWindow) {
-	this.statsHandleInvokedCount++;
-	var button = this.findButton(target);
-	if (button.isValid()) {
-		try{
-			var x = button.rect().origin.x;
-			var y = button.rect().origin.y;
-			target.tap({x:x, y:y});
-		} catch(err) {
-			this.statsHandleErrorCount++;
-			UIALogger.logWarning(err);
-		}
-	} else {
-		this.statsHandleNotValidAndVisibleCount++
-		//UIALogger.logWarning(this.toString() + " button is not validAndVisible");
-	};
-};
-
-WBScrollViewButtonHandler.prototype.toString = function() {
-	return ["MonkeyTest::WBScrollViewButtonHandler(" + this.buttonName, this.checkEveryNumber, this.useNavBar, this.scrollViewIndex, ")"].join();
-};
-
-WBScrollViewButtonHandler.prototype.logStats = function() {
-	UIALogger.logDebug([this.toString(),
-	    "IsTrueInvokedCount", this.statsIsTrueInvokedCount,
-		"IsTrueReturnedTrue", this.statsIsTrueReturnedTrue,
-		"IsTrueReturnedFalse", this.statsIsTrueReturnedFalse,
-		"HandleInvokedCount", this.statsHandleInvokedCount,
-		"HandleNotValidAndVisibleCount", this.statsHandleNotValidAndVisibleCount,
-		"HandleErrorCount", this.statsHandleErrorCount].join());
-};