rformunit 0.1.0-mswin32 → 0.1.1-mswin32

data/Rakefile

@@ -36,7 +36,7 @@ Rake::RDocTask.new { |rdoc|
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::WIN32
   s.name = "rformunit"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
   s.summary = "An wrap of AUTOIT3 for functional testing of Windows form applications"
 # s.description = ""
 

data/docs/index.html

@@ -31,8 +31,8 @@ BODY
 	<p>rFormUnit is a simple framework for automated testing <b>Windows Form</b> applications. It wraps <a href="http://www.autoitscript.com/autoit3/">AutoItX</a> COM API to provide an alternative way to write an easy to use, readable automated functional tests.
 	</p>
 
-	<p>Current release: 0.1.0<br/>
-	&nbsp; <a href="releases/rformunit-0.1.0-mswin32.gem">rformunit-0.1.0-mswin32.gem</a> or  from <a href="http://rubyforge.org/projects/rformunit/">rubyforge.org</a>,
+	<p>Current release: 0.1.1<br/>
+	&nbsp; <a href="releases/rformunit-0.1.1-mswin32.gem">rformunit-0.1.1-mswin32.gem</a> or  from <a href="http://rubyforge.org/projects/rformunit/">rubyforge.org</a>,
 	
   <!-- &nbsp; <a href="releases/changelog.txt">Change logs</a> <br/> -->
 	&nbsp; Documentation: <a href="rdoc/index.html">RDoc</a>, and Quick start guide below.
@@ -88,19 +88,17 @@ Send("n")
 
                 <td valign="top" nowrap="nowrap"  class="green">
 <pre>require 'rformunit'
+
 include RFormUnit::Driver
 
-process.run("C:\\WINDOWS\\NOTEPAD.EXE")
+RFormUnit::Process.run("NOTEPAD.EXE")
 notepad_win = RFormUnit::Window.new('Untitled - Notepad')
-
-keyboard.type("Hello from Notepad, {ENTER}1 2 3{ENTER}")
+RFormUnit::Keyboard.type("Hello from Notepad, {ENTER}1 2 3 4 5 6 7 8 9 10{ENTER}")
 sleep(0.5) 
-keyboard.press("+{UP 2}") # mouse.* for mouse operations
+RFormUnit::Keyboard.press("+{UP 2}")
 sleep(0.5)
-
 notepad_win.close
 
-
 notepad_confirm_dialog = RFormUnit::Window.new('Notepad', 'No')
 notepad_confirm_dialog.click_button('&No')</pre>
                 </td>
@@ -114,7 +112,7 @@ notepad_confirm_dialog.click_button('&No')</pre>
 
 class CalcTest &lt; RFormUnit::FormTestCase
    def setup
-      process.run("calc.exe")
+      RFormUnit::Process.run("calc.exe")
       @calc_win = RFormUnit::Window.new('Calculator')
    end
 

data/lib/rformunit/driver.rb

@@ -25,21 +25,6 @@ module RFormUnit
          @a3.AutoItSetOption(key,value)
       end
 
-      def keyboard
-         return @keyboard if @keyboard
-         @keyboard = Keyboard.new
-      end
-
-      def mouse
-         return @mouse if @mouse
-         @mouse = Mouse.new
-      end
-
-      def process
-         return @process if @process
-         @process = Process.new
-      end
-
       def wait_for_window(win, timeout=30)
          driver.WinWait(win.title, win.text, timeout * 1000)
          win
@@ -61,6 +46,5 @@ module RFormUnit
          driver.WinClose(title)
       end
 
-
    end
 end

data/lib/rformunit/keyboard.rb

@@ -1,10 +1,21 @@
 require File.dirname(__FILE__) + "/driver"
+require 'singleton'
 
 module RFormUnit
    class Keyboard
+include Singleton
       include Driver
 
-      def type(keystrokes)
+     def self.type(keys)
+       instance._type(keys)
+     end
+     
+     def self.press(key)
+       instance._type(key)
+     end
+     
+      # instance methods
+      def _type(keystrokes)
          driver.Send(keystrokes)
       end
       alias press type

data/lib/rformunit/mouse.rb

@@ -1,11 +1,32 @@
 require File.dirname(__FILE__) + "/driver"
+require 'singleton'
 
 module RFormUnit
 
    class Mouse
+      include Singleton
       include Driver
-
-      def click(x=nil, y=nil)
+      
+      def self.click(x=nil, y=nil)
+         instance._click(x, y)
+      end
+      
+      def self.right_click(x=nil, y=nil)
+        instance._right_click(x, y)
+      end
+      
+      def self.double_click(x, y)
+        instance._double_click(x,y)
+      end
+      
+      def self.move_to(x, y)
+        instance._move_to(x,y)
+      end
+      
+      
+      # intance methods 
+      
+      def _click(x=nil, y=nil)
          if (x and y) then
             driver.MouseClick("left", x, y)
          else
@@ -13,7 +34,7 @@ module RFormUnit
          end
       end
 
-      def right_click(x=nil, y=nil)
+      def _right_click(x=nil, y=nil)
          if (x and y) then
             driver.MouseClick("right", x, y)
          else
@@ -21,11 +42,11 @@ module RFormUnit
          end
       end
 
-      def double_click(x, y)
+      def _double_click(x, y)
          driver.MouseClick("left", x, y, 2)
       end
 
-      def move_to(x, y)
+      def _move_to(x, y)
          driver.MouseMove(x,y)
       end
 

data/lib/rformunit/process.rb

@@ -1,13 +1,26 @@
 require File.dirname(__FILE__) + "/driver"
+require 'singleton'
 
 module RFormUnit
+
    class Process
-      include Driver
+      include Singleton
+      include RFormUnit::Driver
+
+      def self.run(prog, work_path = nil)
+        instance._run(prog, work_path)
+      end
 
-      def run(program, work_path = nil)
-         driver.Run(program, work_path)
+def self.execute(prog, work_path = nil)
+        instance._run(prog, work_path)
       end
-      alias execute run
+
+# instance methods
+      def _run(program, work_path = nil)         
+          driver.Run(program, work_path)          
+        end      
+
+      
    end
 
 end

data/sample/calc.rb

@@ -4,7 +4,7 @@ module Calc
    include RFormUnit::Driver
 
    def start_calc
-      process.run("calc.exe")
+      RFormUnit::Process.run("calc.exe")
       RFormUnit::Window.new('Calculator')
    end
 
@@ -19,7 +19,7 @@ module Calc
 
    def quit_calc
       focus_window('QPRIME')
-      keyboard.press("!{F4}")
+      RFormUnit::Keyboard.press("!{F4}")
    end
 
 end

data/sample/notepad.rb

@@ -2,15 +2,15 @@ require 'rformunit'
 
 include RFormUnit::Driver
 
-process.run("C:\\WINDOWS\\NOTEPAD.EXE")
+RFormUnit::Process.run("C:\\WINDOWS\\NOTEPAD.EXE")
 notepad_win = RFormUnit::Window.new('Untitled - Notepad')
-keyboard.type("Hello, Missing No. 5.{ENTER}1 2 3 4 6 7 8 9 10{ENTER}")
-keyboard.press("+{UP 2}")
+RFormUnit::Keyboard.type("Hello, Missing No. 5.{ENTER}1 2 3 4 6 7 8 9 10{ENTER}")
+RFormUnit::Keyboard.press("+{UP 2}")
 
 # move cursor up and insert the missing number
-mouse.move_to(70, 65)
-mouse.click
-keyboard.type("5 ")
+RFormUnit::Mouse.move_to(70, 65)
+RFormUnit::Mouse.click
+RFormUnit::Keyboard.type("5 ")
 
 notepad_win.close
 

data/sample/notepad1.rb

@@ -2,11 +2,11 @@ require 'rformunit'
 
 include RFormUnit::Driver
 
-process.run("C:\\WINDOWS\\NOTEPAD.EXE")
+RFormUnit::Process.run("C:\\WINDOWS\\NOTEPAD.EXE")
 notepad_win = RFormUnit::Window.new('Untitled - Notepad')
-keyboard.type("Hello from Notepad, {ENTER}1 2 3 4 5 6 7 8 9 10{ENTER}")
+RFormUnit::Keyboard.type("Hello from Notepad, {ENTER}1 2 3 4 5 6 7 8 9 10{ENTER}")
 sleep(0.5) 
-keyboard.press("+{UP 2}")
+RFormUnit::Keyboard.press("+{UP 2}")
 sleep(0.5)
 notepad_win.close
 

data/sample/test_calc.rb

@@ -1,8 +1,9 @@
 require 'rformunit'
 
 class CalcTest < RFormUnit::FormTestCase
+
    def setup
-      process.run("calc.exe")
+      RFormUnit::Process.run("calc.exe")
       @calc_win = RFormUnit::Window.new('Calculator')
    end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rformunit
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-11-28 00:00:00 +10:00
+  version: 0.1.1
+date: 2006-11-29 00:00:00 +10:00
 summary: An wrap of AUTOIT3 for functional testing of Windows form applications
 require_paths: 
 - lib