unittests/radios_xpath_test.rb in watir-1.5.6 vs unittests/radios_xpath_test.rb in watir-1.6.2

@@ -1,101 +1,101 @@
 # feature tests for Radio Buttons
-# revision: $Revision: 1348 $
+# revision: $Revision: 1544 $
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
 class TC_Radios_XPath < Test::Unit::TestCase
   include Watir::Exception
   
   def setup
     goto_page "radioButtons1.html"
   end
   
   def test_Radio_Exists
-    assert($ie.radio(:xpath, "//input[@name='box1']/").exists?)   
-    assert($ie.radio(:xpath, "//input[@id='box5']/").exists?)   
+    assert(browser.radio(:xpath, "//input[@name='box1']/").exists?)   
+    assert(browser.radio(:xpath, "//input[@id='box5']/").exists?)   
     
-    assert(!$ie.radio(:xpath, "//input[@name='missingname']/").exists?)   
-    assert(!$ie.radio(:xpath, "//input[@id='missingid']/").exists?)   
+    assert_false(browser.radio(:xpath, "//input[@name='missingname']/").exists?)   
+    assert_false(browser.radio(:xpath, "//input[@id='missingid']/").exists?)   
   end
   
   def test_Radio_Enabled
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").enabled?  }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@id='noName']/").enabled?  }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='box4' and @value='6']/").enabled?  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").enabled?  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@id='noName']/").enabled?  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='box4' and @value='6']/").enabled?  }  
     
-    assert(!$ie.radio(:xpath, "//input[@name='box2']/").enabled?)   
-    assert($ie.radio(:xpath, "//input[@id='box5']/").enabled?)   
-    assert($ie.radio(:xpath, "//input[@name='box1']/").enabled?)   
+    assert_false(browser.radio(:xpath, "//input[@name='box2']/").enabled?)   
+    assert(browser.radio(:xpath, "//input[@id='box5']/").enabled?)   
+    assert(browser.radio(:xpath, "//input[@name='box1']/").enabled?)   
   end
   
   def test_little
-    assert(!$ie.button(:xpath,"//input[@name='foo']/").enabled?)
+    assert_false(browser.button(:xpath,"//input[@name='foo']/").enabled?)
   end
   
   def test_onClick
-    assert(!$ie.button(:xpath,"//input[@name='foo']/").enabled?)          
-    $ie.radio(:xpath, "//input[@name='box5' and @value='1']/").set
-    assert($ie.button(:xpath,"//input[@name='foo']/").enabled?)        
+    assert_false(browser.button(:xpath,"//input[@name='foo']/").enabled?)          
+    browser.radio(:xpath, "//input[@name='box5' and @value='1']/").set
+    assert(browser.button(:xpath,"//input[@name='foo']/").enabled?)        
     
-    $ie.radio(:xpath, "//input[@name='box5' and @value='2']/").set
-    assert(!$ie.button(:xpath,"//input[@name='foo']/").enabled?)
+    browser.radio(:xpath, "//input[@name='box5' and @value='2']/").set
+    assert_false(browser.button(:xpath,"//input[@name='foo']/").enabled?)
   end
   
   def test_Radio_isSet
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").isSet?  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").isSet?  }  
     
-    puts "radio 1 is set : #{ $ie.radio(:xpath, "//input[@name='box1']/").isSet? } "
-    assert(!$ie.radio(:xpath, "//input[@name='box1']/").isSet?)   
+    puts "radio 1 is set : #{ browser.radio(:xpath, "//input[@name='box1']/").isSet? } "
+    assert_false(browser.radio(:xpath, "//input[@name='box1']/").isSet?)   
     
-    assert($ie.radio(:xpath, "//input[@name='box3']/").isSet?)   
-    assert(!$ie.radio(:xpath, "//input[@name='box2']/").isSet?)   
+    assert(browser.radio(:xpath, "//input[@name='box3']/").isSet?)   
+    assert_false(browser.radio(:xpath, "//input[@name='box2']/").isSet?)   
     
-    assert( $ie.radio(:xpath, "//input[@name='box4' and @value='1']/").isSet?)   
-    assert(!$ie.radio(:xpath, "//input[@name='box4' and @value='2']/").isSet?)   
+    assert( browser.radio(:xpath, "//input[@name='box4' and @value='1']/").isSet?)   
+    assert_false(browser.radio(:xpath, "//input[@name='box4' and @value='2']/").isSet?)   
   end
   
   def test_radio_clear
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").clear  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").clear  }  
     
-    $ie.radio(:xpath, "//input[@name='box1']/").clear
-    assert(!$ie.radio(:xpath, "//input[@name='box1']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box1']/").clear
+    assert_false(browser.radio(:xpath, "//input[@name='box1']/").isSet?)   
     
-    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='box2']/").clear  } 
-    assert(!$ie.radio(:xpath, "//input[@name='box2']/").isSet?)   
+    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   browser.radio(:xpath, "//input[@name='box2']/").clear  } 
+    assert_false(browser.radio(:xpath, "//input[@name='box2']/").isSet?)   
     
-    $ie.radio(:xpath, "//input[@name='box3']/").clear
-    assert(!$ie.radio(:xpath, "//input[@name='box3']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box3']/").clear
+    assert_false(browser.radio(:xpath, "//input[@name='box3']/").isSet?)   
     
-    $ie.radio(:xpath, "//input[@name='box4' and @value='1']/").clear
-    assert(!$ie.radio(:xpath, "//input[@name='box4' and @value='1']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box4' and @value='1']/").clear
+    assert_false(browser.radio(:xpath, "//input[@name='box4' and @value='1']/").isSet?)   
   end
   
   def test_radio_getState
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").getState  }  
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").getState  }  
     
-    assert_equal( false , $ie.radio(:xpath, "//input[@name='box1']/").getState )   
-    assert_equal( true , $ie.radio(:xpath, "//input[@name='box3']/").getState)   
+    assert_equal( false , browser.radio(:xpath, "//input[@name='box1']/").getState )   
+    assert_equal( true , browser.radio(:xpath, "//input[@name='box3']/").getState)   
     
     # radioes that have the same name but different values
-    assert_equal( false , $ie.radio(:xpath, "//input[@name='box4' and @value='2']/").getState )   
-    assert_equal( true , $ie.radio(:xpath, "//input[@name='box4' and @value='1']/").getState)   
+    assert_equal( false , browser.radio(:xpath, "//input[@name='box4' and @value='2']/").getState )   
+    assert_equal( true , browser.radio(:xpath, "//input[@name='box4' and @value='1']/").getState)   
   end
   
   def test_radio_set
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='noName']/").set  }  
-    $ie.radio(:xpath, "//input[@name='box1']/").set
-    assert($ie.radio(:xpath, "//input[@name='box1']/").isSet?)   
+    assert_raises(UnknownObjectException) {   browser.radio(:xpath, "//input[@name='noName']/").set  }  
+    browser.radio(:xpath, "//input[@name='box1']/").set
+    assert(browser.radio(:xpath, "//input[@name='box1']/").isSet?)   
     
-    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   $ie.radio(:xpath, "//input[@name='box2']/").set  }  
+    assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   browser.radio(:xpath, "//input[@name='box2']/").set  }  
     
-    $ie.radio(:xpath, "//input[@name='box3']/").set
-    assert($ie.radio(:xpath, "//input[@name='box3']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box3']/").set
+    assert(browser.radio(:xpath, "//input[@name='box3']/").isSet?)   
     
     # radioes that have the same name but different values
-    $ie.radio(:xpath, "//input[@name='box4' and @value='3']/").set
-    assert($ie.radio(:xpath, "//input[@name='box4' and @value='3']/").isSet?)   
+    browser.radio(:xpath, "//input[@name='box4' and @value='3']/").set
+    assert(browser.radio(:xpath, "//input[@name='box4' and @value='3']/").isSet?)   
   end
   
 end