Changeset 1030

Timestamp:

11/02/03 20:53:35 (5 years ago)

Author:

nahi

Message:

better 1.6 support.

Files:

• trunk/test/soap/marshal/test_marshal.rb (modified) (3 diffs)

trunk/test/soap/marshal/test_marshal.rb

@@ -288 +288 @@
-
-  MyStruct = Struct.new("MyStruct", :a, :b)
+  if RUBY_VERSION < "1.8.0"
+    # Struct#== is not defined in ruby/1.6
+    class MyStruct
+      def ==(rhs)
+        return true if __id__ == rhs.__id__
+        return false unless rhs.is_a?(::Struct) 
+        return false if self.class != rhs.class
+        members.each do |member|
+          return false if self.__send__(member) != rhs.__send__(member)
+        end
+        return true
+      end
+    end
+  end
-  class MySubStruct < MyStruct; def initialize(v, *args) super(*args); @v = v; end end
-  def test_struct
@@ -294 +308 @@
-
-  def test_struct_subclass
+    if RUBY_VERSION < "1.8.0"
+      # Substruct instance cannot be dumped in ruby/1.6
+      # ::Marshal.dump(MySubStruct.new(10, 1, 2)) #=> uninitialized struct
+      return false
+    end
-    marshal_equal(MySubStruct.new(10,1,2))
-  end
@@ -455 +474 @@
-
-  MyStruct2 = Struct.new(:a, :b)
+  if RUBY_VERSION < "1.8.0"
+    # Struct#== is not defined in ruby/1.6
+    class MyStruct2
+      def ==(rhs)
+        return true if __id__ == rhs.__id__
+        return false unless rhs.is_a?(::Struct) 
+        return false if self.class != rhs.class
+        members.each do |member|
+          return false if self.__send__(member) != rhs.__send__(member)
+        end
+        return true
+      end
+    end
+  end
-  def test_struct_toplevel
-
+
+
-  end
-end