firewatir 1.6.2 → 1.6.5

data/unittests/setup.rb

@@ -1,30 +1,29 @@
-$SETUP_LOADED = true
-
-$myDir = File.expand_path(File.dirname(__FILE__))
-
-topdir = File.join(File.dirname(__FILE__), '..')
-$firewatir_dev_lib = File.join(topdir, 'lib')
-$watir_dev_lib = File.join(topdir, '..', 'watir', 'lib')
-libs = []
-libs << File.join(topdir, '..', 'watir-common', 'lib')
-libs << File.join(topdir, '..', 'watir-common') # for the unit tests
-libs.each { |lib| $LOAD_PATH.unshift File.expand_path(lib) }
-
-require 'watir'
-Watir::Browser.default = 'firefox'
-require 'unittests/setup/lib'
-module Watir::UnitTest
-  alias :uses_page :goto_page
-end
-
-require 'unittests/setup/testUnitAddons'
-require 'unittests/iostring'
-
-commondir = File.join(topdir, '..', 'watir-common')
-$all_tests = []
-Dir.chdir topdir do
-  $all_tests += Dir["unittests/*_test.rb"]
-end
-Dir.chdir commondir do
-  $all_tests += Dir["unittests/*_test.rb"]
-end
+$SETUP_LOADED = true
+
+$myDir = File.expand_path(File.dirname(__FILE__))
+
+topdir = File.join(File.dirname(__FILE__), '..')
+$firewatir_dev_lib = File.join(topdir, 'lib')
+$watir_dev_lib = File.join(topdir, '..', 'watir', 'lib')
+libs = []
+libs << File.join(topdir, '..', 'commonwatir', 'lib')
+libs << File.join(topdir, '..', 'commonwatir') # for the unit tests
+libs.each { |lib| $LOAD_PATH.unshift File.expand_path(lib) }
+
+require 'watir'
+Watir::Browser.default = 'firefox'
+require 'unittests/setup/lib'
+module Watir::UnitTest
+  alias :uses_page :goto_page
+end
+
+require 'unittests/setup/testUnitAddons'
+
+commondir = File.join(topdir, '..', 'commonwatir')
+$all_tests = []
+Dir.chdir topdir do
+  $all_tests += Dir["unittests/*_test.rb"]
+end
+Dir.chdir commondir do
+  $all_tests += Dir["unittests/*_test.rb"]
+end

data/unittests/table_test.rb

@@ -1,373 +1,385 @@
-# feature tests for Tables
-# revision: $Revision: 1.0 $
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
-require 'unittests/setup'
-
-class TC_Tables < Test::Unit::TestCase
-  
-  
-  def setup
-    goto_page("table1.html")
-  end
-  
-  def test_Table_Exists
-    assert_false(browser.table(:id, 'missingTable').exists?)
-    assert_false(browser.table(:index, 33).exists?)
-    
-    assert(browser.table(:id, 't1').exists?)
-    assert(browser.table(:id, /t/).exists?)
-    assert_false(browser.table(:id, /missing_table/).exists?)
-    
-    assert(browser.table(:index, 1).exists?)
-    assert(browser.table(:index, 2).exists?)
-  end
-  
-  tag_method :test_rows, :fails_on_ie
-  def test_rows
-    assert_raises(UnknownObjectException ){ browser.table(:id, 'missingTable').row_count }
-    assert_raises(UnknownObjectException ){ browser.table(:index, 66).row_count }
-    assert_raises(UnknownObjectException){ browser.table(:bad_attribute, 99).row_count }
-    
-    assert_equal(2, browser.table(:index, 1).row_count)
-    assert_equal(2, browser.table(:index, 1).rows.length)
-    
-    assert_equal(5, browser.table(:id, 't1').row_count)  # 4 rows and a header 
-    assert_equal(5, browser.table(:index, 2).row_count)  # same table as above, just accessed by index 
-    assert_equal(5, browser.table(:id, 't1').rows.length)   
-    
-    # test the each iterator on rows - ie, go through each cell
-    row = browser.table(:index, 2)[2]
-    count = 1
-    row.each do |cell|
-      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, browser.table(:index, 2)[2].column_count)        
-  end
-  
-  def test_dynamic_tables
-    t = browser.table(:id, 't1')
-    assert_equal(5, t.row_count)
-    
-    browser.button(:value, 'add row').click
-    assert_equal(6, t.row_count)
-  end
-  
-  def test_columns
-    assert_raises(UnknownObjectException  ){ browser.table(:id, 'missingTable').column_count }
-    assert_raises(UnknownObjectException  ){ browser.table(:index, 77).column_count }
-    assert_equal(2, browser.table(:index, 1).column_count)
-    assert_equal(1, browser.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, browser.table(:index , 1).to_a )
-  end
-  
-  def test_links_and_images_in_table
-    table = browser.table(:id, 'pic_table')
-    image = table[1][2].image(:index,1)
-    assert_equal("106", image.width)
-    
-    link = table[2][2].link(:index,1)
-    assert_equal("Google", link.innerText)
-  end
-  
-  def test_cell_directly
-    assert( browser.cell(:id, 'cell1').exists? )
-    assert_false( browser.cell(:id, 'no_exist').exists? )
-    assert_equal( "Row 1 Col1",  browser.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",  browser.table(:index,1)[1][1].to_s.strip )
-    assert_equal(2, browser.cell(:id, "cell_with_colspan").colspan)
-  end
-  
-  def test_row_directly
-    assert( browser.row(:id, 'row1').exists? )  
-    assert_false( browser.row(:id, 'no_exist').exists? )
-    
-    assert_equal('Row 2 Col1' ,  browser.row(:id, 'row1')[1].to_s.strip )
-  end
-  
-  def test_row_iterator
-    t = browser.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
-  end
-  
-  def test_row_collection
-    t = browser.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
-  end 
-  
-  #def test_table_body
-  #  assert_equal( 1, browser.table(:index,1).bodies.length )
-  #  assert_equal( 3, browser.table(:id, 'body_test' ).bodies.length )
-  #  
-  #  count = 1
-  #  browser.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, browser.table(:id, 'body_test').bodies.length )
-  #  
-  #  assert_equal( "This text is in the THIRD TBODY." ,browser.table(:id, 'body_test' ).body(:index,3)[1][1].to_s.strip ) 
-  #  
-  #  # iterate through all the rows in a table body
-  #  count = 1
-  #  browser.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 { browser.table(:id, 't1').html }
-  end
-end    
-
-class TC_Tables_Simple < Test::Unit::TestCase
-  
-  
-  def setup
-    goto_page("simple_table.html")
-  end
-  
-  def test_simple_table_access
-    table = browser.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
-  
-  
-  def setup
-    goto_page("simple_table_buttons.html")
-  end
-  
-  def test_simple_table_buttons
-    table = browser.table(:index,1)
-    
-    table[1][1].button(:index,1).click
-    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK1/i))
-    table[2][1].button(:index,1).click
-    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK2/i))
-    
-    table[1][1].button(:id,'b1').click
-    assert(browser.text_field(: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(browser.text_field(:name,"confirmtext").verify_contains(/TOO/i))
-    
-    table[3][1].button(:value ,"Click too").click
-    assert(browser.text_field(:name,"confirmtext").verify_contains(/TOO/i))
-    
-    browser.table(:index,1)[4][1].text_field(:index,1).set("123")
-    assert(browser.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 ->' , browser.table(:index,1)[5][1].text_field(:index,1).value )
-    browser.table(:index,1)[5][1].text_field(:index,1).click
-    assert_equal( 'Click ->' , browser.table(:index,1)[5][1].text_field(:index,1).value )
-    
-    browser.table(:index,1)[5][1].button(:index,1).click
-    assert_equal( '' , browser.table(:index,1)[5][1].text_field(:index,1).value )
-  end
-  
-  def test_simple_table_gif
-    table = browser.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 = browser.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 = browser.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_table_from_element
-#    button = browser.button(:id, "b1")
-#    table = Table.create_from_element(browser, button)
-    
-#    table[2][1].button(:index, 1).click
-#    assert(browser.textField(:name, "confirmtext").verify_contains(/CLICK2/i))
-#  end
-end
-
-class TC_Table_Columns < Test::Unit::TestCase
-  
-  def setup
-    goto_page("simple_table_columns.html")
-  end
-  
-#  def test_get_columnvalues_single_column
-#    assert_equal(["R1C1", "R2C1", "R3C1"], browser.table(:index, 1).column_values(1))
-#  end
-
-  def test_colspan
-    assert_equal(2, browser.table(:index, 3)[2][1].colspan)
-    assert_equal(1, browser.table(:index, 3)[1][1].colspan)
-    assert_equal(3, browser.table(:index, 3)[4][1].colspan)
-  end
-
-  def test_get_columnvalues_multiple_column
-    assert_equal(["R1C1", "R2C1", "R3C1"], browser.table(:index, 2).column_values(1))
-    assert_equal(["R1C3", "R2C3", "R3C3"], browser.table(:index, 2).column_values(3))
-  end
-
-  def test_get_columnvalues_with_colspan
-    assert_equal(["R1C1", "R2C1", "R3C1", "R4C1", "R5C1", "R6C2"], browser.table(:index, 3).column_values(1))
-  end
-
-  def test_get_rowvalues_full_row
-    assert_equal(["R1C1", "R1C2", "R1C3"], browser.table(:index, 3).row_values(1))
-  end
-
-  def test_get_rowvalues_with_colspan
-    assert_equal(["R2C1", "R2C2"], browser.table(:index, 3).row_values(2))
-  end
-
-  def test_getrowvalues_with_rowspan
-    assert_equal(["R5C1", "R5C2", "R5C3"], browser.table(:index, 3).row_values(5))
-    assert_equal(["R6C2", "R6C3"], browser.table(:index, 3).row_values(6))
-  end
-end
-
-class TC_Tables_Complex < Test::Unit::TestCase
-  
-  def setup
-    goto_page("complex_table.html")
-  end
-
-  def test_complex_table_access
-    table = browser.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)
-  end
-end
-
-class TC_Tables_Display < Test::Unit::TestCase
-  include MockStdoutTestCase
-
-  tag_method :test_showTables, :fails_on_ie
-  def test_showTables
-    goto_page("table1.html")
-    $stdout = @mockout
-    browser.showTables
-    assert_equal(<<END_OF_MESSAGE, @mockout)
-There are 7 tables
-table:   id: tblTest
-       rows: 2
-    columns: 2
-      index: 1
-table:   id: t1
-       rows: 5
-    columns: 1
-      index: 2
-table:   id: t2
-       rows: 2
-    columns: 2
-      index: 3
-table:   id: 
-       rows: 1
-    columns: 2
-      index: 4
-table:   id: body_test
-       rows: 5
-    columns: 1
-      index: 5
-table:   id: pic_table
-       rows: 2
-    columns: 2
-      index: 6
-table:   id: tblTest1
-       rows: 5
-    columns: 1
-      index: 7
-END_OF_MESSAGE
-  end
-end
+# feature tests for Tables
+# revision: $Revision: 1.0 $
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_Tables < Test::Unit::TestCase
+  
+  
+  def setup
+    goto_page("table1.html")
+  end
+  
+  def test_Table_Exists
+    assert_false(browser.table(:id, 'missingTable').exists?)
+    assert_false(browser.table(:index, 33).exists?)
+    
+    assert(browser.table(:id, 't1').exists?)
+    assert(browser.table(:id, /t/).exists?)
+    assert_false(browser.table(:id, /missing_table/).exists?)
+    
+    assert(browser.table(:index, 1).exists?)
+    assert(browser.table(:index, 2).exists?)
+  end
+  
+  tag_method :test_rows, :fails_on_ie
+  def test_rows
+    assert_raises(UnknownObjectException ){ browser.table(:id, 'missingTable').row_count }
+    assert_raises(UnknownObjectException ){ browser.table(:index, 66).row_count }
+    assert_raises(UnknownObjectException){ browser.table(:bad_attribute, 99).row_count }
+    
+    assert_equal(2, browser.table(:index, 1).row_count)
+    assert_equal(2, browser.table(:index, 1).rows.length)
+    
+    assert_equal(5, browser.table(:id, 't1').row_count)  # 4 rows and a header 
+    assert_equal(5, browser.table(:index, 2).row_count)  # same table as above, just accessed by index 
+    assert_equal(5, browser.table(:id, 't1').rows.length)   
+    
+    # test the each iterator on rows - ie, go through each cell
+    row = browser.table(:index, 2)[2]
+    count = 1
+    row.each do |cell|
+      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, browser.table(:index, 2)[2].column_count)        
+  end
+  
+  def test_dynamic_tables
+    t = browser.table(:id, 't1')
+    assert_equal(5, t.row_count)
+    
+    browser.button(:value, 'add row').click
+    assert_equal(6, t.row_count)
+  end
+  
+  def test_columns
+    assert_raises(UnknownObjectException  ){ browser.table(:id, 'missingTable').column_count }
+    assert_raises(UnknownObjectException  ){ browser.table(:index, 77).column_count }
+    assert_equal(2, browser.table(:index, 1).column_count)
+    assert_equal(1, browser.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, browser.table(:index , 1).to_a )
+  end
+  
+  def test_links_and_images_in_table
+    table = browser.table(:id, 'pic_table')
+    image = table[1][2].image(:index,1)
+    assert_equal("106", image.width)
+    
+    link = table[2][2].link(:index,1)
+    assert_equal("Google", link.innerText)
+  end
+  
+  def test_cell_directly
+    assert( browser.cell(:id, 'cell1').exists? )
+    assert_false( browser.cell(:id, 'no_exist').exists? )
+    assert_equal( "Row 1 Col1",  browser.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",  browser.table(:index,1)[1][1].to_s.strip )
+    assert_equal(2, browser.cell(:id, "cell_with_colspan").colspan)
+  end
+  
+  def test_row_directly
+    assert( browser.row(:id, 'row1').exists? )  
+    assert_false( browser.row(:id, 'no_exist').exists? )
+    
+    assert_equal('Row 2 Col1' ,  browser.row(:id, 'row1')[1].to_s.strip )
+  end
+  
+  def test_row_iterator
+    t = browser.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
+  end
+  
+  def test_row_collection
+    t = browser.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
+  end 
+  
+  #def test_table_body
+  #  assert_equal( 1, browser.table(:index,1).bodies.length )
+  #  assert_equal( 3, browser.table(:id, 'body_test' ).bodies.length )
+  #  
+  #  count = 1
+  #  browser.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, browser.table(:id, 'body_test').bodies.length )
+  #  
+  #  assert_equal( "This text is in the THIRD TBODY." ,browser.table(:id, 'body_test' ).body(:index,3)[1][1].to_s.strip ) 
+  #  
+  #  # iterate through all the rows in a table body
+  #  count = 1
+  #  browser.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 { browser.table(:id, 't1').html }
+  end
+end    
+
+class TC_Tables_Simple < Test::Unit::TestCase
+  
+  
+  def setup
+    goto_page("simple_table.html")
+  end
+  
+  def test_simple_table_access
+    table = browser.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
+  
+  
+  def setup
+    goto_page("simple_table_buttons.html")
+  end
+  
+  def test_simple_table_buttons
+    table = browser.table(:index,1)
+    
+    table[1][1].button(:index,1).click
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK1/i))
+    table[2][1].button(:index,1).click
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/CLICK2/i))
+    
+    table[1][1].button(:id,'b1').click
+    assert(browser.text_field(: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(browser.text_field(:name,"confirmtext").verify_contains(/TOO/i))
+    
+    table[3][1].button(:value ,"Click too").click
+    assert(browser.text_field(:name,"confirmtext").verify_contains(/TOO/i))
+    
+    browser.table(:index,1)[4][1].text_field(:index,1).set("123")
+    assert(browser.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 ->' , browser.table(:index,1)[5][1].text_field(:index,1).value )
+    browser.table(:index,1)[5][1].text_field(:index,1).click
+    assert_equal( 'Click ->' , browser.table(:index,1)[5][1].text_field(:index,1).value )
+    
+    browser.table(:index,1)[5][1].button(:index,1).click
+    assert_equal( '' , browser.table(:index,1)[5][1].text_field(:index,1).value )
+  end
+  
+  def test_simple_table_gif
+    table = browser.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 = browser.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 = browser.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_table_from_element
+#    button = browser.button(:id, "b1")
+#    table = Table.create_from_element(browser, button)
+    
+#    table[2][1].button(:index, 1).click
+#    assert(browser.textField(:name, "confirmtext").verify_contains(/CLICK2/i))
+#  end
+end
+
+class TC_Table_Columns < Test::Unit::TestCase
+  
+  def setup
+    goto_page("simple_table_columns.html")
+  end
+  
+#  def test_get_columnvalues_single_column
+#    assert_equal(["R1C1", "R2C1", "R3C1"], browser.table(:index, 1).column_values(1))
+#  end
+
+  def test_colspan
+    assert_equal(2, browser.table(:index, 3)[2][1].colspan)
+    assert_equal(1, browser.table(:index, 3)[1][1].colspan)
+    assert_equal(3, browser.table(:index, 3)[4][1].colspan)
+  end
+
+  def test_get_columnvalues_multiple_column
+    assert_equal(["R1C1", "R2C1", "R3C1"], browser.table(:index, 2).column_values(1))
+    assert_equal(["R1C3", "R2C3", "R3C3"], browser.table(:index, 2).column_values(3))
+  end
+
+  def test_get_columnvalues_with_colspan
+    assert_equal(["R1C1", "R2C1", "R3C1", "R4C1", "R5C1", "R6C2"], browser.table(:index, 3).column_values(1))
+  end
+
+  def test_get_rowvalues_full_row
+    assert_equal(["R1C1", "R1C2", "R1C3"], browser.table(:index, 3).row_values(1))
+  end
+
+  def test_get_rowvalues_with_colspan
+    assert_equal(["R2C1", "R2C2"], browser.table(:index, 3).row_values(2))
+  end
+
+  def test_getrowvalues_with_rowspan
+    assert_equal(["R5C1", "R5C2", "R5C3"], browser.table(:index, 3).row_values(5))
+    assert_equal(["R6C2", "R6C3"], browser.table(:index, 3).row_values(6))
+  end
+end
+
+class TC_Tables_Complex < Test::Unit::TestCase
+  
+  def setup
+    goto_page("complex_table.html")
+  end
+
+  def test_complex_table_access
+    table = browser.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)
+  end
+    
+  def test_each_itterator
+    # for WTR-324: keep Watir::Table.each from crashing when run on nested tables
+    table = browser.table(:index,1)
+    assert_equal(table.row_count, 2)
+    example_row_count = 0
+    assert_nothing_thrown do 
+      table.each do
+        example_row_count += 1
+      end
+    end
+    assert_equal(example_row_count, 2)
+  end
+end
+
+class TC_Tables_Display < Test::Unit::TestCase
+  include CaptureIOHelper
+
+  tag_method :test_showTables, :fails_on_ie
+  def test_showTables
+    goto_page("table1.html")
+    actual = capture_stdout { browser.showTables }
+    assert_equal(<<END_OF_MESSAGE, actual)
+There are 7 tables
+table:   id: tblTest
+       rows: 2
+    columns: 2
+      index: 1
+table:   id: t1
+       rows: 5
+    columns: 1
+      index: 2
+table:   id: t2
+       rows: 2
+    columns: 2
+      index: 3
+table:   id: 
+       rows: 1
+    columns: 2
+      index: 4
+table:   id: body_test
+       rows: 5
+    columns: 1
+      index: 5
+table:   id: pic_table
+       rows: 2
+    columns: 2
+      index: 6
+table:   id: tblTest1
+       rows: 5
+    columns: 1
+      index: 7
+END_OF_MESSAGE
+  end
+end