unittests/radios_test.rb in watir-1.5.4 vs unittests/radios_test.rb in watir-1.5.5

@@ -1,16 +1,16 @@
 # feature tests for Radio Buttons
-# revision: $Revision: 1164 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Radios < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "radioButtons1.html")
+    goto_page "radioButtons1.html"
   end
   
   def test_Radio_Exists
     assert($ie.radio(:name, "box1").exists?)   
     assert($ie.radio(:id, "box5").exists?)   
@@ -21,19 +21,16 @@
   
   def test_radio_class
     assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").class_name }  
     assert_equal("radio_style" , $ie.radio(:name, "box1").class_name)   
     assert_equal("" , $ie.radio(:id, "box5").class_name)   
-    
-    
-    
   end
   
   def test_Radio_Enabled
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").enabled?  }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:id, "noName").enabled?  }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "box4" , 6).enabled?  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").enabled?  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:id, "noName").enabled?  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "box4" , 6).enabled?  }  
     
     assert(!$ie.radio(:name, "box2").enabled?)   
     assert($ie.radio(:id, "box5").enabled?)   
     assert($ie.radio(:name, "box1").enabled?)   
   end
@@ -105,22 +102,22 @@
     $ie.radio(:name, "box4" , 1).clear
     assert(!$ie.radio(:name, "box4" , 1).isSet?)   
   end
   
   def test_radio_getState
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").getState  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").getState  }  
     
     assert_equal( false , $ie.radio(:name, "box1").getState )   
     assert_equal( true , $ie.radio(:name, "box3").getState)   
     
     # radioes that have the same name but different values
     assert_equal( false , $ie.radio(:name, "box4" , 2).getState )   
     assert_equal( true , $ie.radio(:name, "box4" , 1).getState)   
   end
   
   def test_radio_set
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").set  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").set  }  
     $ie.radio(:name, "box1").set
     assert($ie.radio(:name, "box1").isSet?)   
     
     assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   $ie.radio(:name, "box2").set  }  
     
@@ -132,15 +129,15 @@
     assert($ie.radio(:name, "box4" , 3).isSet?)   
   end
   
   def test_radio_properties
     
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).value}  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).name }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).id }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).disabled }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).type }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).value}  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).name }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).id }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).disabled }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).type }  
     
     assert_equal("on"   ,    $ie.radio(:index, 1).value)  
     assert_equal("box1" ,    $ie.radio(:index, 1).name )  
     assert_equal(""     ,    $ie.radio(:index, 1).id )  
     assert_equal("radio",    $ie.radio(:index, 1).type )  
@@ -187,9 +184,8 @@
     assert(!$ie.radio(:name, "box6" , 'Milk').isSet?)   
     assert($ie.radio(:name, "box6" , 'Tea').isSet?)   
     $ie.radio(:name, "box6", 'Tea').clear
     assert(!$ie.radio(:name, "box6" , 'Tea').isSet?)   
   end
-  
   
 end