test_nestedexception.rb in soap4r-sgonyea-1.6.0

- old
+ new

@@ -1,7 +1,6 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/soap'
 
 
 module SOAP
 
@@ -37,35 +36,21 @@
       trace = trace.map { |line| line.sub(/\A[^:]*/, '') }
       assert_equal(TOBE, trace)
     end
   end
 
-  if (RUBY_VERSION.to_f >= 1.9)
-    TOBE = [
-      ":16:in `rescue in foo'",
-      ":13:in `foo'",
-      ":34:in `test_nestedexception'",
-      ":24:in `rescue in bar': bar (SOAP::TestNestedException::MyError) [NESTED]",
-      ":21:in `bar'",
-      ":14:in `foo'",
-      ":34:in `test_nestedexception'",
-      ":29:in `baz': baz (SOAP::TestNestedException::MyError) [NESTED]",
-      ":22:in `bar'",
-      ":14:in `foo'",
-      ":34:in `test_nestedexception'"
-    ]  
-  else
-    TOBE = [
-      ":16:in `foo'",
-      ":34:in `test_nestedexception'",
-      ":24:in `bar': bar (SOAP::TestNestedException::MyError) [NESTED]",
-      ":14:in `foo'",
-      ":34:in `test_nestedexception'",
-      ":29:in `baz': baz (SOAP::TestNestedException::MyError) [NESTED]",
-      ":22:in `bar'",
-      ":14:in `foo'",
-      ":34:in `test_nestedexception'",
-    ]
-  end
+  TOBE = [
+    ":15:in `foo'",
+    ":33:in `test_nestedexception'",
+    ":23:in `bar': bar (SOAP::TestNestedException::MyError) [NESTED]",
+    ":13:in `foo'",
+    ":33:in `test_nestedexception'",
+    ":28:in `baz': baz (SOAP::TestNestedException::MyError) [NESTED]",
+    ":21:in `bar'",
+    ":13:in `foo'",
+    ":33:in `test_nestedexception'",
+  ]
+
 end
+
 
 end