watir 1.4.1 → 1.5.2

data/unittests/selectbox_xpath_test.rb

@@ -0,0 +1,113 @@
+# feature tests for Select Boxes
+# revision: $Revision: 962 $
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+require 'unittests/setup'
+
+class TC_Selectbox_XPath < Test::Unit::TestCase
+  include Watir
+  
+  def setup
+    $ie.goto($htmlRoot + "selectboxes1.html")
+  end
+  
+  def test_textBox_Exists
+    assert($ie.select_list(:xpath, "//select[@name='sel1']/").exists?)   
+    assert(!$ie.select_list(:xpath, "//select[@name='missing']/").exists?)   
+    assert(!$ie.select_list(:xpath, "//select[@id='missing']/").exists?)   
+  end
+  
+  def test_select_list_enabled
+    assert($ie.select_list(:xpath, "//select[@name='sel1']/").enabled?)   
+    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").enabled? }  
+  end
+  
+  def test_select_list_getAllContents
+    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").getAllContents }  
+    assert_equal( ["Option 1" ,"Option 2" , "Option 3" , "Option 4"] , 
+    $ie.select_list(:xpath, "//select[@name='sel1']/").getAllContents)   
+  end
+  
+  def test_select_list_getSelectedItems
+    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
+    assert_equal( ["Option 3" ] , 
+    $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    assert_equal( ["Option 3" , "Option 6" ] , 
+    $ie.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+  end
+  
+  def test_clearSelection
+    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").clearSelection }  
+    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    
+    # the box sel1 has no ability to have a de-selected item
+    assert_equal( ["Option 3" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    
+    $ie.select_list(:xpath, "//select[@name='sel2']/").clearSelection
+    assert_equal( [ ] , $ie.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+  end
+  
+  def test_select_list_select
+    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
+    assert_raises(NoValueFoundException) { $ie.select_list(:xpath, "//select[@name='sel1']/").select("missing item") }  
+    assert_raises(NoValueFoundException) { $ie.select_list(:xpath, "//select[@name='sel1']/").select(/missing/) }  
+    
+    # the select method keeps any currently selected items - use the clear selectcion method first
+    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    $ie.select_list(:xpath, "//select[@name='sel1']/").select("Option 1")
+    assert_equal( ["Option 1" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    
+    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    $ie.select_list(:xpath, "//select[@name='sel1']/").select(/2/)
+    assert_equal( ["Option 2" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    
+    $ie.select_list(:xpath, "//select[@name='sel2']/").clearSelection
+    $ie.select_list(:xpath, "//select[@name='sel2']/").select( /2/ )
+    $ie.select_list(:xpath, "//select[@name='sel2']/").select( /4/ )
+    assert_equal( ["Option 2" , "Option 4" ] , 
+    $ie.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    
+    # these are to test the onchange event
+    # the event shouldnt get fired, as this is the selected item
+    $ie.select_list(:xpath, "//select[@name='sel3']/").select( /3/ )
+    assert(!$ie.text.include?("Pass") )
+  end
+  
+  def test_select_list_select2
+    # the event should get fired
+    $ie.select_list(:xpath, "//select[@name='sel3']/").select( /2/ )
+    assert($ie.text.include?("PASS") )
+  end
+  
+  def test_select_list_select_using_value
+    assert_raises(UnknownObjectException) { $ie.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
+    assert_raises(NoValueFoundException) { $ie.select_list(:xpath, "//select[@name='sel1']/").select_value("missing item") }  
+    assert_raises(NoValueFoundException) { $ie.select_list(:xpath, "//select[@name='sel1']/").select_value(/missing/) }  
+    
+    # the select method keeps any currently selected items - use the clear selectcion method first
+    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    $ie.select_list(:xpath, "//select[@name='sel1']/").select_value("o1")
+    assert_equal( ["Option 1" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    
+    $ie.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    $ie.select_list(:xpath, "//select[@name='sel1']/").select_value(/2/)
+    assert_equal( ["Option 2" ] , $ie.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    
+    $ie.select_list(:xpath, "//select[@name='sel2']/").clearSelection
+    $ie.select_list(:xpath, "//select[@name='sel2']/").select( /2/ )
+    $ie.select_list(:xpath, "//select[@name='sel2']/").select( /4/ )
+    assert_equal( ["Option 2" , "Option 4" ] , $ie.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    
+    # these are to test the onchange event
+    # the event shouldnt get fired, as this is the selected item
+    $ie.select_list(:xpath, "//select[@name='sel3']/").select_value( /3/ )
+    assert(!$ie.text.include?("Pass") )
+  end
+  
+  def test_select_list_select_using_value2
+    # the event should get fired
+    $ie.select_list(:xpath, "//select[@name='sel3']/").select_value( /2/ )
+    assert($ie.text.include?("PASS") )
+  end
+  
+end

data/unittests/setup.rb

@@ -1,47 +1,51 @@
-END {$ie.close if $ie} # close ie at completion of the tests
-
 # libraries used by feature tests
 require 'watir'
+END {$ie.close if $ie && $ie.exists?; Watir::IE.quit} # close ie at completion of the tests
+
 require 'test/unit'
 require 'test/unit/ui/console/testrunner'
 require 'watir/testUnitAddons'
+require 'watir/testcase'
 
 topdir = File.join(File.dirname(__FILE__), '..')
 Dir.chdir topdir do
   $all_tests = Dir["unittests/*_test.rb"]
+  $xpath_tests = Dir["unittests/*_xpath_test.rb"]
 end
 
+$window_tests =
+    ['js_events', # is always visible
+     'modal_dialog', # modal is visible
+     'attach_to_existing_window', # could actually run robustly as part of the core suite!
+     'attach_to_new_window', # creates new window
+     'jscript',
+     'send_keys', # visible
+     'iedialog', # visible
+     'close_window', # creates new window
+     'frame_links', # visible
+     'open_close',
+    ].collect {|x| "unittests/windows/#{x}_test.rb"}
+
 $non_core_tests = 
     ['popups', # has problems when run in a suite (is ok when run alone); 
                # must be visible
                # will be revised to use autoit 
                # takes 15 seconds to run
-     'images', # failing tests; also assumes working dir is unittests
-     'screen_capture', # is always visible; takes 25 secons
+     'images', # save file must must be visible
+     'screen_capture', # is always visible; takes 25 seconds
      'filefield', # is always visible; takes 40 seconds 
-     'jscript',
-     'js_events', # is always visible
      'minmax', # becomes visible
-     'send_keys' # uses autoit
+     'dialog' # visible
     ].collect {|x| "unittests/#{x}_test.rb"}
 
-$core_tests = $all_tests - $non_core_tests
-
-def start_ie_with_logger
-  $ie = Watir::IE.new()
-#  $ie.logger = Watir::WatirLogger.new( 'debug.txt', 4, 10000 )
-  $ie.set_fast_speed
-end
-
-def set_local_dir
-  $myDir = File.expand_path(File.dirname(__FILE__))
-  $myDir.sub!( %r{/cygdrive/(\w)/}, '\1:/' ) # convert from cygwin to dos
-  # if you run the unit tests form a local file system use this line
-  $htmlRoot =  "file://#{$myDir}/html/" 
-  # if you run the unit tests from a web server use this line
-  #   $htmlRoot =  "http://localhost:8080/watir/html/"
-end
+$core_tests = $all_tests - $non_core_tests - $window_tests - $xpath_tests
 
-start_ie_with_logger
-set_local_dir
+$ie = Watir::IE.new
+$ie.set_fast_speed
 
+$myDir = File.expand_path(File.dirname(__FILE__))
+$myDir.sub!( %r{/cygdrive/(\w)/}, '\1:/' ) # convert from cygwin to dos
+# if you run the unit tests form a local file system use this line
+$htmlRoot =  "file://#{$myDir}/html/" 
+# if you run the unit tests from a web server use this line
+#   $htmlRoot =  "http://localhost:8080/watir/html/"

data/unittests/speed_settings_test.rb

@@ -0,0 +1,22 @@
+# tests for ability to set defaults for Watir
+# revision: $Revision: 958 $
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+require 'test/unit'
+require 'watir'
+
+class TC_Defaults < Test::Unit::TestCase
+  include Watir
+  
+  def test_using_default
+    @ie1 = IE.new
+    @ie1.speed = :fast
+    assert_equal(:fast, @ie1.speed)
+    @ie1.speed = :slow
+    assert_equal(:slow, @ie1.speed)
+    assert_raise(ArgumentError){@ie1.speed = :fubar}
+  end    
+  
+  def teardown
+    @ie1.close if @ie1
+  end
+end

data/unittests/table_cell_using_xpath_test.rb

@@ -0,0 +1,40 @@
+# feature tests for xpath table cells
+# revision: $Revision: 962 $
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+require 'unittests/setup'
+
+class TC_TableCell_XPath < Test::Unit::TestCase
+  include Watir
+  
+  def setup
+    gotoTableCellPage
+  end
+  
+  def gotoTableCellPage
+    $ie.goto($htmlRoot + "tableCell_using_xpath.html")
+  end
+  
+  def testCellExists
+    # There is no <image> with @src='rectangle.jpg'. So image will not be there.
+    assert(! $ie.cell(:xpath , "//img[@src='images\/rectangle.jpg']/../").exists?  )
+    # Select the parent element of image with src='square.jpg' which is a tablecell.
+    assert(       $ie.cell(:xpath , "//img[@src='images\/square.jpg']/../").exists?  )
+    assert(       $ie.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").exists?  )
+    puts "Selected table cell with text 'Table Cell with image of triangle.'"
+    puts $ie.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
+  end
+  
+  def testCell_properties
+    assert_equal(1 , $ie.cell(:xpath , "//img[@src='images\/square.jpg']/../").colspan) 
+    assert_equal(2 , $ie.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").colspan) 
+    assert_equal(3 , $ie.cell(:xpath , "//img[@src='images\/circle.jpg']/../").colspan) 
+    assert_equal(4 , $ie.cell(:xpath , "//img[@src='images\/button.jpg']/../").colspan) 
+    
+    # to string tests -- output should be verified!
+    puts $ie.cell(:xpath , "//img[@src='images\/square.jpg']/../").to_s
+    puts $ie.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
+  end
+  
+end
+

data/unittests/table_test.rb

@@ -1,306 +1,337 @@
 # feature tests for Tables
-# revision: $Revision: 1.29 $
+# revision: $Revision: 1076 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Tables < Test::Unit::TestCase
-    include Watir
-
-    def setup
-        gotoTablePage
-    end
-
-    def gotoTablePage()
-        $ie.goto($htmlRoot + "table1.html")
-    end
-
-    def test_Table_Exists
-       assert_false($ie.table(:id , 'missingTable').exists? )
-       assert_false($ie.table(:index, 33).exists? )
-
-       assert($ie.table(:id, 't1').exists? )
-       assert($ie.table(:id, /t/).exists? )
-       assert_false($ie.table(:id , /missing_table/).exists? )
-
-
-       assert($ie.table(:index, 1).exists? )
-       assert($ie.table(:index, 2).exists? )
-    end
-
-    def test_rows
-       assert_raises( UnknownTableException  ){ $ie.table(:id , 'missingTable').row_count }
-       assert_raises( UnknownTableException  ){ $ie.table(:index , 66).row_count }
-
-        assert_equal( 2 , $ie.table(:index , 1).row_count)
-        assert_equal( 5 , $ie.table(:id, 't1').row_count)   # 4 rows and a header 
-        assert_equal( 5 , $ie.table(:index, 2).row_count)   # same table as above, just accessed by index 
-
-        # test the each iterator on rows - ie, go through each cell
-        row = $ie.table(:index, 2)[2]
-        count=1
-        row.each do |cell|
-            #  cell.flash   # this line commented out to speed up the test
-            if count == 1
-                assert_equal('Row 1 Col1' , cell.to_s.strip )
-            elsif count==2
-                assert_equal('Row 1 Col2' , cell.to_s.strip )
-            end
-            count+=1
-        end
-        assert_equal(2, count -1)
-        assert_equal(2, $ie.table(:index, 2)[2].column_count)        
-    end
+  include Watir
   
-    def test_dynamic_tables
-        t = $ie.table(:id, 't1')
-        assert_equal( 5, t.row_count)
-
-        $ie.button(:value , 'add row').click
-        assert_equal( 6, t.row_count)
-    end
-
-    def test_columns
-
-        assert_raises( UnknownTableException  ){ $ie.table(:id , 'missingTable').column_count }
-        assert_raises( UnknownTableException  ){ $ie.table(:index , 77).column_count }
-        assert_equal( 2 , $ie.table(:index , 1).column_count)
-        assert_equal( 1 , $ie.table(:id, 't1').column_count)   # row one has 1 cell with a colspan of 2
-    end
-
-    def test_to_a
-        table1Expected = [ ["Row 1 Col1" , "Row 1 Col2"] ,[ "Row 2 Col1" , "Row 2 Col2"] ]
-        assert_arrayEquals(table1Expected, $ie.table(:index , 1).to_a )
-    end
-
-    def test_simple_table_access
-         $ie.goto($htmlRoot + "simple_table.html")
- 
-         table = $ie.table(:index,1)
+  def setup
+    $ie.goto($htmlRoot + "table1.html")
+  end
+  
+  def test_Table_Exists
+    assert(!$ie.table(:id, 'missingTable').exists?)
+    assert(!$ie.table(:index, 33).exists?)
     
-         assert_equal("Row 3 Col1",table[3][1].text.strip)
-         assert_equal("Row 1 Col1",table[1][1].text.strip)
-         assert_equal("Row 3 Col2",table[3][2].text.strip)
-         assert_equal(2,table.column_count)
-    end
+    assert($ie.table(:id, 't1').exists?)
+    assert($ie.table(:id, /t/).exists?)
+    assert(!$ie.table(:id, /missing_table/).exists?)
+    
+    assert($ie.table(:index, 1).exists?)
+    assert($ie.table(:index, 2).exists?)
+  end
   
-    def test_simple_table_buttons
-        $ie.goto($htmlRoot + "simple_table_buttons.html")
- 
-        table = $ie.table(:index,1)
-   
-        table[1][1].button(:index,1).click
-        assert($ie.textField(:name,"confirmtext").verify_contains(/CLICK1/i))
-        table[2][1].button(:index,1).click
-        assert($ie.textField(:name,"confirmtext").verify_contains(/CLICK2/i))
-
-        table[1][1].button(:id,'b1').click
-        assert($ie.textField(:name,"confirmtext").verify_contains(/CLICK1/i))
-
-        assert_raises(UnknownObjectException   ) { table[1][1].button(:id,'b_missing').click }
-
-        table[3][1].button(:index,2).click
-        assert($ie.textField(:name,"confirmtext").verify_contains(/TOO/i))
-
-        table[3][1].button(:value ,"Click too").click
-        assert($ie.textField(:name,"confirmtext").verify_contains(/TOO/i))
-        
-        $ie.table(:index,1)[4][1].text_field(:index,1).set("123")
-        assert($ie.text_field(:index,2).verify_contains("123"))
-
-        # check when a cell contains 2 objects
-
-        # if there were 2 different html objects in the same cell, some weird things happened ( button caption could change for example)
-        assert_equal( 'Click ->' , $ie.table(:index,1)[5][1].text_field(:index,1).value )
-        $ie.table(:index,1)[5][1].text_field(:index,1).click
-        assert_equal( 'Click ->' , $ie.table(:index,1)[5][1].text_field(:index,1).value )
-
-        $ie.table(:index,1)[5][1].button(:index,1).click
-        assert_equal( '' , $ie.table(:index,1)[5][1].text_field(:index,1).value )
-    end
- 
-    def test_simple_table_gif
-        $ie.goto($htmlRoot + "simple_table_buttons.html")
- 
-        table = $ie.table(:index,2)
-
-        assert_match( /1\.gif/   , table[1][1].image( :index,1).src  )
-        assert_match( /2\.gif/   , table[1][2].image( :index ,1).src )
-        assert_match( /3\.gif/   , table[1][3].image( :index ,1).src    )
-
-        assert_match( /1\.gif/   , table[3][1].image( :index ,1).src  )
-        assert_match( /2\.gif/   , table[3][2].image( :index ,1).src )
-        assert_match( /3\.gif/   , table[3][3].image( :index ,1).src  )
- 
-        table = $ie.table(:index,3)
-        assert_match( /1\.gif/   , table[1][1].image( :index ,1).src  )
-        assert_match( /2\.gif/   , table[1][1].image( :index ,2).src )
-        assert_match( /3\.gif/   , table[1][1].image( :index ,3).src )
-
-        assert_match( /1\.gif/  , table[3][1].image( :index ,1).src  )
-        assert_match( /2\.gif/  , table[3][1].image( :index ,2).src    )
-        assert_match( /3\.gif/  , table[3][1].image( :index ,3).src  )
-    end
-
-    def test_table_with_hidden_or_visible_rows
-        $ie.goto($htmlRoot + "simple_table_buttons.html")
-        t = $ie.table(:id , 'show_hide')
-
-        # expand the table
-        t.each do |r|
-            r[1].image(:src, /plus/).click if r[1].image(:src, /plus/).exists?
-        end
-
-        # shrink rows 1,2,3
-        count=1
-        t.each do |r|
-            r[1].image(:src, /minus/).click if r[1].image(:src, /minus/).exists? and (1..3) === count 
-            count=2
-        end
-    end
-
-    def test_links_and_images_in_table
-        table = $ie.table(:id, 'pic_table')
-        image = table[1][2].image(:index,1)
-        assert_equal("106", image.width)
-
-        link = table[1][4].link(:index,1)
-        assert_equal("Google", link.innerText)
-    end
-
-    def test_table_from_element
-        $ie.goto($htmlRoot + "simple_table_buttons.html")
-     
-        button = $ie.button(:id,"b1")
-        table = Table.create_from_element($ie,button)
-       
-        table[2][1].button(:index,1).click
-        assert($ie.textField(:name,"confirmtext").verify_contains(/CLICK2/i))
-    end
-
-    def test_complex_table_access
-        $ie.goto($htmlRoot + "complex_table.html")
-     
-        table = $ie.table(:index,1)
-       
-        assert_equal("subtable1 Row 1 Col1",table[1][1].table(:index,1)[1][1].text.strip)
-        assert_equal("subtable1 Row 1 Col2",table[1][1].table(:index,1)[1][2].text.strip)
-        assert_equal("subtable2 Row 1 Col2",table[2][1].table(:index,1)[1][2].text.strip)
-        assert_equal("subtable2 Row 1 Col1",table[2][1].table(:index,1)[1][1].text.strip)
+  def test_rows
+    assert_raises(UnknownObjectException ){ $ie.table(:id, 'missingTable').row_count }
+    assert_raises(UnknownObjectException ){ $ie.table(:index, 66).row_count }
+    assert_raises(MissingWayOfFindingObjectException){ $ie.table(:bad_attribute, 99).row_count }
+    
+    assert_equal(2, $ie.table(:index, 1).row_count)
+    assert_equal(2, $ie.table(:index, 1).rows.length)
+    
+    assert_equal(5, $ie.table(:id, 't1').row_count)  # 4 rows and a header 
+    assert_equal(5, $ie.table(:index, 2).row_count)  # same table as above, just accessed by index 
+    assert_equal(5, $ie.table(:id, 't1').rows.length)   
+    
+    # test the each iterator on rows - ie, go through each cell
+    row = $ie.table(:index, 2)[2]
+    count = 1
+    row.each do |cell|
+      #  cell.flash   # this line commented out to speed up the test
+      if count == 1
+        assert_equal('Row 1 Col1', cell.to_s.strip)
+      elsif count==2
+        assert_equal('Row 1 Col2', cell.to_s.strip)
+      end
+      count += 1
     end
-
-    def test_cell_directly
-
-        assert( $ie.cell(:id, 'cell1').exists? )
-        assert_false( $ie.cell(:id, 'no_exist').exists? )
-        assert_equal( "Row 1 Col1",  $ie.cell(:id, 'cell1').to_s.strip )
-
-        # not really cell directly, but just to show another way of geting the cell
-        assert_equal( "Row 1 Col1",  $ie.table(:index,1)[1][1].to_s.strip )
+    assert_equal(2, count -1)
+    assert_equal(2, $ie.table(:index, 2)[2].column_count)        
+  end
+  
+  def test_dynamic_tables
+    t = $ie.table(:id, 't1')
+    assert_equal(5, t.row_count)
+    
+    $ie.button(:value, 'add row').click
+    assert_equal(6, t.row_count)
+  end
+  
+  def test_columns
+    assert_raises(UnknownObjectException  ){ $ie.table(:id, 'missingTable').column_count }
+    assert_raises(UnknownObjectException  ){ $ie.table(:index, 77).column_count }
+    assert_equal(2, $ie.table(:index, 1).column_count)
+    assert_equal(1, $ie.table(:id, 't1').column_count)   # row one has 1 cell with a colspan of 2
+  end
+  
+  def test_to_a
+    table1Expected = [ ["Row 1 Col1" , "Row 1 Col2"] ,[ "Row 2 Col1" , "Row 2 Col2"] ]
+    assert_equal(table1Expected, $ie.table(:index , 1).to_a )
+  end
+  
+  def test_links_and_images_in_table
+    table = $ie.table(:id, 'pic_table')
+    image = table[1][2].image(:index,1)
+    assert_equal("106", image.width)
+    
+    link = table[1][4].link(:index,1)
+    assert_equal("Google", link.innerText)
+  end
+  
+  def test_cell_directly
+    assert( $ie.cell(:id, 'cell1').exists? )
+    assert(! $ie.cell(:id, 'no_exist').exists? )
+    assert_equal( "Row 1 Col1",  $ie.cell(:id, 'cell1').to_s.strip )
+    
+    # not really cell directly, but just to show another way of geting the cell
+    assert_equal( "Row 1 Col1",  $ie.table(:index,1)[1][1].to_s.strip )
+  end
+  
+  def test_row_directly
+    assert( $ie.row(:id, 'row1').exists? )  
+    assert(! $ie.row(:id, 'no_exist').exists? )
+    
+    assert_equal('Row 2 Col1' ,  $ie.row(:id, 'row1')[1].to_s.strip )
+  end
+  
+  def test_row_iterator
+    t = $ie.table(:index, 1)
+    count = 1 
+    t.each do |row|
+      if count == 1
+        assert("Row 1 Col1", row[1].text)
+        assert("Row 1 Col2", row[2].text)
+      elsif count == 2
+        assert("Row 2 Col1", row[1].text)
+        assert("Row 2 Col2", row[2].text)
+      end
+      count += 1
     end
-
-    def test_row_directly
-        assert( $ie.row(:id, 'row1').exists? )  
-        assert_false( $ie.row(:id, 'no_exist').exists? )
-
-        assert_equal('Row 2 Col1' ,  $ie.row(:id, 'row1')[1].to_s.strip )
+  end
+  
+  def test_row_collection
+    t = $ie.table(:index,1)
+    count = 1
+    t.rows.each do |row|
+      if count == 1
+        assert("Row 1 Col1", row[1].text)
+        assert("Row 1 Col2", row[2].text)
+      elsif count == 2
+        assert("Row 2 Col1", row[1].text)
+        assert("Row 2 Col2", row[2].text)
+      end
+      count += 1
     end
-
-    def test_row_iterator
-        t = $ie.table(:index,1)
-        count =1
-        t.each do |row|
-            if count==1
-                assert( "Row 1 Col1" , row[1].text )
-                assert( "Row 1 Col2" , row[2].text )
-            elsif count==2
-                assert( "Row 2 Col1" , row[1].text )
-                assert( "Row 2 Col2" , row[2].text )
-            end
-        end
+  end 
+  
+  def test_cell_collection
+    t = $ie.table(:index,1)
+    count = 1
+    contents = t.cells.collect {|c| c.text}
+    assert_equal(["Row 1 Col1","Row 1 Col2","Row 2 Col1","Row 2 Col2"], contents)
+  end    
+  
+  def test_table_body
+    assert_equal( 1, $ie.table(:index,1).bodies.length )
+    assert_equal( 3, $ie.table(:id, 'body_test' ).bodies.length )
+    
+    count = 1
+    $ie.table(:id, 'body_test').bodies.each do |n|
+      
+      # do something better here!
+      # n.flash # this line commented out to speed up the test
+      
+      case count 
+      when 1 
+        compare_text = "This text is in the FRST TBODY."
+      when 2 
+        compare_text = "This text is in the SECOND TBODY."
+      when 3 
+        compare_text = "This text is in the THIRD TBODY."
+      end
+      
+      assert_equal(compare_text, n[1][1].to_s.strip )   # this is the 1st cell of the first row of this particular body
+      
+      count += 1
     end
-
-    def test_table_body
-        assert_equal( 1, $ie.table(:index,1).bodies.length )
-        assert_equal( 3, $ie.table(:id, 'body_test' ).bodies.length )
-
-        count = 1
-        $ie.table(:id, 'body_test' ).bodies.each do |n|
-
-            # do something better here!
-            # n.flash # this line commented out to speed up the test
-
-            case count 
-                when 1 
-                    compare_text = "This text is in the FRST TBODY."
-                when 2 
-                    compare_text = "This text is in the SECOND TBODY."
-                when 3 
-                    compare_text = "This text is in the THIRD TBODY."
-            end
-
-            assert_equal( compare_text , n[1][1].to_s.strip )   # this is the 1st cell of the first row of this particular body
-
-            count +=1
-        end
-        assert_equal( count-1, $ie.table(:id, 'body_test' ).bodies.length  )
-
-        assert_equal( "This text is in the THIRD TBODY." ,$ie.table(:id, 'body_test' ).body(:index,3)[1][1].to_s.strip ) 
-
-        # iterate through all the rows in a table body
-        count = 1
-        $ie.table(:id, 'body_test' ).body(:index,2).each do | row |
-            # row.flash    # this line commented out, to speed up the tests
-            if count == 1
-                assert_equal('This text is in the SECOND TBODY.' , row[1].text.strip )
-            elsif count == 1
-                 assert_equal('This text is also in the SECOND TBODY.' , row[1].text.strip )
-            end
-            count+=1
-        end
+    assert_equal( count - 1, $ie.table(:id, 'body_test').bodies.length )
+    
+    assert_equal( "This text is in the THIRD TBODY." ,$ie.table(:id, 'body_test' ).body(:index,3)[1][1].to_s.strip ) 
+    
+    # iterate through all the rows in a table body
+    count = 1
+    $ie.table(:id, 'body_test').body(:index, 2).each do | row |
+      # row.flash    # this line commented out, to speed up the tests
+      if count == 1
+        assert_equal('This text is in the SECOND TBODY.', row[1].text.strip )
+      elsif count == 1 # BUG: Huh?
+        assert_equal('This text is also in the SECOND TBODY.', row[1].text.strip )
+      end
+      count+=1
     end
+  end
+  
+  def test_table_container
+    assert_nothing_raised { $ie.table(:id, 't1').html }
+  end
+end    
 
-    def test_get_columnvalues_single_column
-        $ie.goto($htmlRoot + "simple_table_columns.html")
-        assert_equal(["R1C1", "R2C1", "R3C1"], $ie.table(:index, 1).column_values(1))
+class TC_Tables_Simple < Test::Unit::TestCase
+  include Watir
+  
+  def setup
+    $ie.goto($htmlRoot + "simple_table.html")
+  end
+  
+  def test_simple_table_access
+    table = $ie.table(:index,1)
+    
+    assert_equal("Row 3 Col1",table[3][1].text.strip)
+    assert_equal("Row 1 Col1",table[1][1].text.strip)
+    assert_equal("Row 3 Col2",table[3][2].text.strip)
+    assert_equal(2,table.column_count)
+  end
+end
+class TC_Tables_Buttons < Test::Unit::TestCase
+  include Watir
+  
+  def setup
+    $ie.goto($htmlRoot + "simple_table_buttons.html")
+  end
+  
+  def test_simple_table_buttons
+    table = $ie.table(:index,1)
+    
+    table[1][1].button(:index,1).click
+    assert($ie.textField(:name,"confirmtext").verify_contains(/CLICK1/i))
+    table[2][1].button(:index,1).click
+    assert($ie.textField(:name,"confirmtext").verify_contains(/CLICK2/i))
+    
+    table[1][1].button(:id,'b1').click
+    assert($ie.textField(:name,"confirmtext").verify_contains(/CLICK1/i))
+    
+    assert_raises(UnknownObjectException   ) { table[1][1].button(:id,'b_missing').click }
+    
+    table[3][1].button(:index,2).click
+    assert($ie.textField(:name,"confirmtext").verify_contains(/TOO/i))
+    
+    table[3][1].button(:value ,"Click too").click
+    assert($ie.textField(:name,"confirmtext").verify_contains(/TOO/i))
+    
+    $ie.table(:index,1)[4][1].text_field(:index,1).set("123")
+    assert($ie.text_field(:index,2).verify_contains("123"))
+    
+    # check when a cell contains 2 objects
+    
+    # if there were 2 different html objects in the same cell, some weird things happened ( button caption could change for example)
+    assert_equal( 'Click ->' , $ie.table(:index,1)[5][1].text_field(:index,1).value )
+    $ie.table(:index,1)[5][1].text_field(:index,1).click
+    assert_equal( 'Click ->' , $ie.table(:index,1)[5][1].text_field(:index,1).value )
+    
+    $ie.table(:index,1)[5][1].button(:index,1).click
+    assert_equal( '' , $ie.table(:index,1)[5][1].text_field(:index,1).value )
+  end
+  
+  def test_simple_table_gif
+    table = $ie.table(:index,2)
+    
+    assert_match( /1\.gif/   , table[1][1].image( :index,1).src  )
+    assert_match( /2\.gif/   , table[1][2].image( :index ,1).src )
+    assert_match( /3\.gif/   , table[1][3].image( :index ,1).src    )
+    
+    assert_match( /1\.gif/   , table[3][1].image( :index ,1).src  )
+    assert_match( /2\.gif/   , table[3][2].image( :index ,1).src )
+    assert_match( /3\.gif/   , table[3][3].image( :index ,1).src  )
+    
+    table = $ie.table(:index,3)
+    assert_match( /1\.gif/   , table[1][1].image( :index ,1).src  )
+    assert_match( /2\.gif/   , table[1][1].image( :index ,2).src )
+    assert_match( /3\.gif/   , table[1][1].image( :index ,3).src )
+    
+    assert_match( /1\.gif/  , table[3][1].image( :index ,1).src  )
+    assert_match( /2\.gif/  , table[3][1].image( :index ,2).src    )
+    assert_match( /3\.gif/  , table[3][1].image( :index ,3).src  )
+  end
+  
+  def test_table_with_hidden_or_visible_rows
+    t = $ie.table(:id , 'show_hide')
+    
+    # expand the table
+    t.each do |r|
+      r[1].image(:src, /plus/).click if r[1].image(:src, /plus/).exists?
     end
-
-    def test_colspan
-        $ie.goto($htmlRoot + "simple_table_columns.html")
-        assert_equal(2, $ie.table(:index, 3)[2][1].colspan)
-        assert_equal(1, $ie.table(:index, 3)[1][1].colspan)
-        assert_equal(3, $ie.table(:index, 3)[4][1].colspan)
-
+    
+    # shrink rows 1,2,3
+    count=1
+    t.each do |r|
+      r[1].image(:src, /minus/).click if r[1].image(:src, /minus/).exists? and (1..3) === count 
+      count=2
     end
+  end
+  
+  def test_table_from_element
+    button = $ie.button(:id, "b1")
+    table = Table.create_from_element($ie, button)
+    
+    table[2][1].button(:index, 1).click
+    assert($ie.textField(:name, "confirmtext").verify_contains(/CLICK2/i))
+  end
+end
 
+class TC_Table_Columns < Test::Unit::TestCase
+  include Watir
+  def setup
+    $ie.goto($htmlRoot + "simple_table_columns.html")
+  end
+  
+  def test_get_columnvalues_single_column
+    assert_equal(["R1C1", "R2C1", "R3C1"], $ie.table(:index, 1).column_values(1))
+  end
+
+  def test_colspan
+    assert_equal(2, $ie.table(:index, 3)[2][1].colspan)
+    assert_equal(1, $ie.table(:index, 3)[1][1].colspan)
+    assert_equal(3, $ie.table(:index, 3)[4][1].colspan)
+  end
+
+  def test_get_columnvalues_multiple_column
+    assert_equal(["R1C1", "R2C1", "R3C1"], $ie.table(:index, 2).column_values(1))
+    assert_equal(["R1C3", "R2C3", "R3C3"], $ie.table(:index, 2).column_values(3))
+  end
+
+  def test_get_columnvalues_with_colspan
+    assert_equal(["R1C1", "R2C1", "R3C1", "R4C1", "R5C1", "R6C2"], $ie.table(:index, 3).column_values(1))
+   (2..4).each{|x|assert_raises(UnknownCellException){$ie.table(:index, 3).column_values(x)}}
+  end
+
+  def test_get_rowvalues_full_row
+    assert_equal(["R1C1", "R1C2", "R1C3"], $ie.table(:index, 3).row_values(1))
+  end
+
+  def test_get_rowvalues_with_colspan
+    assert_equal(["R2C1", "R2C2"], $ie.table(:index, 3).row_values(2))
+  end
+
+  def test_getrowvalues_with_rowspan
+    assert_equal(["R5C1", "R5C2", "R5C3"], $ie.table(:index, 3).row_values(5))
+    assert_equal(["R6C2", "R6C3"], $ie.table(:index, 3).row_values(6))
+  end
+end
 
+class TC_Tables_Complex < Test::Unit::TestCase
+  include Watir
+  def setup
+    $ie.goto($htmlRoot + "complex_table.html")
+  end
 
-
-    def test_get_columnvalues_multiple_column
-        $ie.goto($htmlRoot + "simple_table_columns.html")
-        assert_equal(["R1C1", "R2C1", "R3C1"], $ie.table(:index, 2).column_values(1))
-        assert_equal(["R1C3", "R2C3", "R3C3"], $ie.table(:index, 2).column_values(3))
-    end
-
-    def test_get_columnvalues_with_colspan
-        $ie.goto($htmlRoot + "simple_table_columns.html")
-        assert_equal(["R1C1", "R2C1", "R3C1", "R4C1", "R5C1", "R6C2"], $ie.table(:index, 3).column_values(1))
-        (2..4).each{|x|assert_raises(UnknownCellException){$ie.table(:index, 3).column_values(x)}}
-    end
-    
-    def test_get_rowvalues_full_row
-        $ie.goto($htmlRoot + "simple_table_columns.html")
-        assert_equal(["R1C1", "R1C2", "R1C3"], $ie.table(:index, 3).row_values(1))
-    end
+  def test_complex_table_access
+    table = $ie.table(:index,1)
     
-    def test_get_rowvalues_with_colspan
-        $ie.goto($htmlRoot + "simple_table_columns.html")
-        assert_equal(["R2C1", "R2C2"], $ie.table(:index, 3).row_values(2))
-    end
-    
-    def test_getrowvalues_with_rowspan
-        $ie.goto($htmlRoot + "simple_table_columns.html")
-        assert_equal(["R5C1", "R5C2", "R5C3"], $ie.table(:index, 3).row_values(5))
-        assert_equal(["R6C2", "R6C3"], $ie.table(:index, 3).row_values(6))
-    end
+    assert_equal("subtable1 Row 1 Col1",table[1][1].table(:index,1)[1][1].text.strip)
+    assert_equal("subtable1 Row 1 Col2",table[1][1].table(:index,1)[1][2].text.strip)
+    assert_equal("subtable2 Row 1 Col2",table[2][1].table(:index,1)[1][2].text.strip)
+    assert_equal("subtable2 Row 1 Col1",table[2][1].table(:index,1)[1][1].text.strip)
+  end
 end