Merge branch 'THRIFT-103'
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@682458 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/rb/spec/binaryprotocolaccelerated_spec.rb b/lib/rb/spec/binaryprotocolaccelerated_spec.rb
index 86101f8..6a3cc39 100644
--- a/lib/rb/spec/binaryprotocolaccelerated_spec.rb
+++ b/lib/rb/spec/binaryprotocolaccelerated_spec.rb
@@ -80,6 +80,59 @@
trans = Thrift::MemoryBuffer.new("\v\000\001\000\000\000\fHello\000World!\000")
@prot.decode_binary(SpecNamespace::Hello.new, trans).should == SpecNamespace::Hello.new(:greeting => "Hello\000World!")
end
+
+ it "should error when encoding a struct with a nil value in a list" do
+ Thrift.type_checking = false
+ sl = SpecNamespace::SimpleList
+ hello = SpecNamespace::Hello
+ # nil counts as false for bools
+ # lambda { @prot.encode_binary(sl.new(:bools => [true, false, nil, false])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:bytes => [1, 2, nil, 3])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:i16s => [1, 2, nil, 3])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:i32s => [1, 2, nil, 3])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:i64s => [1, 2, nil, 3])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:doubles => [1.0, 2.0, nil, 3.0])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:strings => ["one", "two", nil, "three"])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:lists => [[1, 2], nil, [3, 4]])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:maps => [{1 => 2}, nil, {3 => 4}])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:sets => [Set.new([1, 2]), nil, Set.new([3, 4])])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:structs => [hello.new, nil, hello.new(:greeting => "hi")])) }.should raise_error
+ end
+
+ it "should error when encoding a non-nil, non-correctly-typed value in a list" do
+ Thrift.type_checking = false
+ sl = SpecNamespace::SimpleList
+ hello = SpecNamespace::Hello
+ # bool should accept any value
+ # lambda { @prot.encode_binary(sl.new(:bools => [true, false, 3])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:bytes => [1, 2, "3", 5])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:i16s => ["one", 2, 3])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:i32s => [[1,2], 3, 4])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:i64s => [{1 => 2}, 3, 4])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:doubles => ["one", 2.3, 3.4])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:strings => ["one", "two", 3, 4])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:lists => [{1 => 2}, [3, 4]])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:maps => [{1 => 2}, [3, 4]])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:sets => [Set.new([1, 2]), 3, 4])) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:structs => [3, "four"])) }.should raise_error
+ end
+
+ it "should error when given nil to encode" do
+ lambda { @prot.encode_binary(nil) }.should raise_error
+ end
+
+ it "should error when encoding an improper object where a container is expected" do
+ Thrift.type_checking = false
+ sl = SpecNamespace::SimpleList
+ lambda { @prot.encode_binary(sl.new(:strings => {"one" => "two", nil => "three"})) }.should raise_error
+ lambda { @prot.encode_binary(sl.new(:maps => [[1, 2]])) }.should raise_error
+ end
+
+ it "should accept arrays and hashes as sets" do
+ Thrift.type_checking = false
+ sl = SpecNamespace::SimpleList
+ lambda { @prot.encode_binary(sl.new(:sets => [[1, 2], {3 => true, 4 => true}])) }.should_not raise_error
+ end
end
describe BinaryProtocolAcceleratedFactory do