From 189bc7cd55675b95c1e23e9b41b7bf50f8743673 Mon Sep 17 00:00:00 2001 From: Dave Kwon Date: Mon, 3 Feb 2025 17:39:23 -0800 Subject: [PATCH] Remove custom default test for terse write [1/n] Summary: Remove from thrift/test/terse_write and java test Reviewed By: yoney, rmakheja Differential Revision: D69074226 fbshipit-source-id: 860e76c9f64b15075dcd6c64725812b952fbb5b8 --- .../thrift/terse/TerseWriteProtocolTest.java | 2 - .../facebook/thrift/terse/TerseWriteTest.java | 50 ------ .../lib/java/test-if/terse_write.thrift | 34 ---- .../lib/py3/test/auto_migrate/serializer.py | 27 --- .../src/thrift/lib/python/test/serializer.py | 35 ---- .../test/terse_write/TerseWriteTest.cpp | 160 +----------------- .../terse_write/tablebased_terse_write.thrift | 33 ---- .../test/terse_write/terse_write.thrift | 43 ----- 8 files changed, 2 insertions(+), 382 deletions(-) diff --git a/third-party/thrift/src/thrift/lib/java/runtime/src/test/java/com/facebook/thrift/terse/TerseWriteProtocolTest.java b/third-party/thrift/src/thrift/lib/java/runtime/src/test/java/com/facebook/thrift/terse/TerseWriteProtocolTest.java index 928b890906459c..a8b241167318b6 100644 --- a/third-party/thrift/src/thrift/lib/java/runtime/src/test/java/com/facebook/thrift/terse/TerseWriteProtocolTest.java +++ b/third-party/thrift/src/thrift/lib/java/runtime/src/test/java/com/facebook/thrift/terse/TerseWriteProtocolTest.java @@ -320,11 +320,9 @@ public void testAdaptedTerseStruct() { assertEquals(IntrinsicDefaults.defaultLong(), received.getLongField()); assertEquals(IntrinsicDefaults.defaultByteArray(), received.getB1()); assertEquals(IntrinsicDefaults.defaultList(), received.getBinaryListField()); - assertEquals(5000, received.getLongDefault()); assertEquals(null, received.isOptionalBooleanField()); assertEquals(null, received.getOptionalB1()); assertEquals(IntrinsicDefaults.defaultInt(), received.getIntField2()); - assertEquals(3000, received.getIntDefault2()); assertEquals(IntrinsicDefaults.defaultInt(), received.getDoubleTypedefIntField()); } diff --git a/third-party/thrift/src/thrift/lib/java/runtime/src/test/java/com/facebook/thrift/terse/TerseWriteTest.java b/third-party/thrift/src/thrift/lib/java/runtime/src/test/java/com/facebook/thrift/terse/TerseWriteTest.java index 81eb4bac65f49c..9241e0a758d509 100644 --- a/third-party/thrift/src/thrift/lib/java/runtime/src/test/java/com/facebook/thrift/terse/TerseWriteTest.java +++ b/third-party/thrift/src/thrift/lib/java/runtime/src/test/java/com/facebook/thrift/terse/TerseWriteTest.java @@ -24,7 +24,6 @@ import com.facebook.thrift.payload.ThriftSerializable; import com.facebook.thrift.protocol.ByteBufTProtocol; import com.facebook.thrift.test.terse.AdaptedTerseStruct; -import com.facebook.thrift.test.terse.EmptyStruct; import com.facebook.thrift.test.terse.FieldLevelTerseStruct; import com.facebook.thrift.test.terse.InnerTerseStruct; import com.facebook.thrift.test.terse.MyEnum; @@ -32,7 +31,6 @@ import com.facebook.thrift.test.terse.PackageLevelTerseStruct; import com.facebook.thrift.test.terse.StructLevelTerseStruct; import com.facebook.thrift.test.terse.TerseException; -import com.facebook.thrift.test.terse.TerseStructWithCustomDefault; import com.facebook.thrift.test.terse.TerseStructWithPrimitiveTypeAdapter; import com.facebook.thrift.test.terse.TerseStructWithStructTypeAdapter; import com.facebook.thrift.util.IntrinsicDefaults; @@ -79,52 +77,6 @@ public void testStructLevelTerseStruct() { assertNotNull(st.getInnerField()); } - @Test - public void testTerseStructWithCustomDefault() { - TerseStructWithCustomDefault st = new TerseStructWithCustomDefault.Builder().build(); - assertEquals(true, st.isBoolField()); - assertEquals(1, st.getByteField()); - assertEquals(2, st.getShortField()); - assertEquals(3, st.getIntField()); - assertEquals(4, st.getLongField()); - assertEquals(5.0f, st.getFloatField(), 0); - assertEquals(6.0d, st.getDoubleField(), 0); - assertEquals("7", st.getStringField()); - assertArrayEquals(new byte[] {56}, st.getBinaryField()); - assertEquals(MyEnum.ME1, st.getEnumField()); - assertEquals(1, (short) st.getListField().get(0)); - assertEquals(1, st.getSetField().iterator().next().intValue()); - assertEquals(1, st.getMapField().size()); - assertEquals(1, (short) st.getMapField().get((short) 1)); - assertEquals("5000", st.getAdaptedIntField()); - assertEquals((Long) 6000L, (Long) st.getDoubleAdaptedIntField()); - assertNotNull(st.getStructField()); - } - - @Test - public void testTerseStructWithCustomDefaultDeserialized() { - ByteBufTProtocol protocol = serialize(new EmptyStruct.Builder().build()); - // create from an empty struct - TerseStructWithCustomDefault st = TerseStructWithCustomDefault.read0(protocol); - - assertEquals(IntrinsicDefaults.defaultBoolean(), st.isBoolField()); - assertEquals(IntrinsicDefaults.defaultByte(), st.getByteField()); - assertEquals(IntrinsicDefaults.defaultShort(), st.getShortField()); - assertEquals(IntrinsicDefaults.defaultInt(), st.getIntField()); - assertEquals(IntrinsicDefaults.defaultLong(), st.getLongField()); - assertEquals(IntrinsicDefaults.defaultFloat(), st.getFloatField(), 0); - assertEquals(IntrinsicDefaults.defaultDouble(), st.getDoubleField(), 0); - assertEquals(IntrinsicDefaults.defaultString(), st.getStringField()); - assertArrayEquals(IntrinsicDefaults.defaultByteArray(), st.getBinaryField()); - assertEquals(MyEnum.ME0, st.getEnumField()); - assertEquals(IntrinsicDefaults.defaultList(), st.getListField()); - assertEquals(IntrinsicDefaults.defaultSet(), st.getSetField()); - assertEquals(IntrinsicDefaults.defaultMap(), st.getMapField()); - assertEquals("0", st.getAdaptedIntField()); - assertEquals((Long) IntrinsicDefaults.defaultLong(), (Long) st.getDoubleAdaptedIntField()); - assertNotNull(st.getStructField()); - } - @Test public void testFieldLevelTerseStruct() { FieldLevelTerseStruct st = new FieldLevelTerseStruct.Builder().build(); @@ -249,11 +201,9 @@ public void testAdaptedTerseStruct() { assertEquals("0", st.getAdaptedLongField()); assertEquals(IntrinsicDefaults.defaultByteBuf(), st.getB1()); assertEquals("", st.getAdaptedBinaryListField()); - assertEquals("5000", st.getAdaptedLongDefault()); assertEquals(null, st.isOptionalAdaptedBooleanField()); assertEquals(null, st.getOptionalB1()); assertEquals((Long) 0L, (Long) st.getDoubleAdaptedIntField()); - assertEquals((Long) 3000L, (Long) st.getDoubleAdaptedIntDefault()); assertEquals("0", st.getDoubleTypedefAdaptedIntField()); } } diff --git a/third-party/thrift/src/thrift/lib/java/test-if/terse_write.thrift b/third-party/thrift/src/thrift/lib/java/test-if/terse_write.thrift index 0e4934c19d923d..c24abf67386954 100644 --- a/third-party/thrift/src/thrift/lib/java/test-if/terse_write.thrift +++ b/third-party/thrift/src/thrift/lib/java/test-if/terse_write.thrift @@ -184,30 +184,6 @@ struct FieldLevelTerseStruct { 34: MyUnion union_field; } -@thrift.TerseWrite -struct TerseStructWithCustomDefault { - 1: bool bool_field = true; - 2: byte byte_field = 1; - 3: i16 short_field = 2; - 4: i32 int_field = 3; - 5: i64 long_field = 4; - 6: float float_field = 5.0; - 7: double double_field = 6.0; - 8: string string_field = "7"; - 9: binary binary_field = "8"; - 10: MyEnum enum_field = MyEnum.ME1; - 11: list list_field = [1]; - 12: set set_field = [1]; - 13: map map_field = {1: 1}; - 14: MyStructWithCustomDefault struct_field; - 15: adaptedInt adaptedInt_field = 5000; - @java.Adapter{ - adapterClassName = "com.facebook.thrift.adapter.test.StringToLongTypeAdapter", - typeClassName = "java.lang.Long", - } - 16: adaptedInt doubleAdaptedInt_field = 6000; -} - @thrift.TerseWrite struct TerseStructSingleField { 1: i32 int_field; @@ -255,15 +231,12 @@ struct TestV0 { 1: bool boolean_field; 2: byte byte_field; 3: i16 short_field; - 4: i32 int_field = 5; } struct TestV1 { 1: bool boolean_field; 2: byte byte_field; 3: i16 short_field; - @thrift.TerseWrite - 4: i32 int_field = 5; } @java.Adapter{ @@ -313,7 +286,6 @@ struct AdaptedTerseStruct { 5: adaptedLong adaptedLong_field; 10: SlicedByteBuf b1; 21: adaptedBinaryList adaptedBinaryList_field; - 55: adaptedLong adaptedLong_default = 5000; 101: optional adaptedBoolean optionalAdaptedBoolean_field; 102: optional SlicedByteBuf optional_b1; @java.Adapter{ @@ -321,11 +293,6 @@ struct AdaptedTerseStruct { typeClassName = "java.lang.Long", } 204: adaptedInt doubleAdaptedInt_field; - @java.Adapter{ - adapterClassName = "com.facebook.thrift.adapter.test.StringToLongTypeAdapter", - typeClassName = "java.lang.Long", - } - 205: adaptedInt doubleAdaptedInt_default = 3000; 206: doubleTypedefInt doubleTypedefAdaptedInt_field; } @@ -337,7 +304,6 @@ struct TerseStruct { 5: i64 long_field; 10: binary b1; 21: list binaryList_field; - 55: i64 long_default = 5000; 101: optional bool optionalBoolean_field; 102: optional binary optional_b1; 204: i32 int_field2; diff --git a/third-party/thrift/src/thrift/lib/py3/test/auto_migrate/serializer.py b/third-party/thrift/src/thrift/lib/py3/test/auto_migrate/serializer.py index cf5f961c0c79b4..ef04ede0fcf714 100644 --- a/third-party/thrift/src/thrift/lib/py3/test/auto_migrate/serializer.py +++ b/third-party/thrift/src/thrift/lib/py3/test/auto_migrate/serializer.py @@ -25,8 +25,6 @@ FieldLevelTerseStruct, MyEnum, MyStruct, - MyStructWithCustomDefault, - TerseStructWithCustomDefault, ) from testing.thrift_types import easy as python_easy, hard as python_hard from testing.types import ( @@ -392,31 +390,6 @@ def test_field_level_terse_write(self) -> None: encoded_empty = serialize(empty, protocol=proto) self.assertEqual(encoded, encoded_empty) - # Since empty serializd binary is deserialized, all terse fields should equal - # to the intrinsic default. - def test_terse_struct_with_custom_default(self) -> None: - empty = EmptyStruct() - for proto in Protocol: - encoded_empty = serialize(empty, protocol=proto) - decoded, length = deserialize_with_length( - TerseStructWithCustomDefault, encoded_empty, protocol=proto - ) - self.assertIsInstance(decoded, TerseStructWithCustomDefault) - self.assertEqual(decoded.bool_field, False) - self.assertEqual(decoded.byte_field, 0) - self.assertEqual(decoded.short_field, 0) - self.assertEqual(decoded.int_field, 0) - self.assertEqual(decoded.long_field, 0) - self.assertEqual(decoded.float_field, 0.0) - self.assertEqual(decoded.double_field, 0.0) - self.assertEqual(decoded.string_field, "") - self.assertEqual(decoded.binary_field, b"") - self.assertEqual(decoded.enum_field, MyEnum.ME0) - self.assertEqual(decoded.list_field, []) - self.assertEqual(decoded.set_field, set()) - self.assertEqual(decoded.map_field, {}) - self.assertEqual(decoded.struct_field, MyStructWithCustomDefault(field1=0)) - class SerializerForwardCompat(SerializerTestBase): def test_with_header(self) -> None: diff --git a/third-party/thrift/src/thrift/lib/python/test/serializer.py b/third-party/thrift/src/thrift/lib/python/test/serializer.py index 5666995849a40f..3f3395429d67ec 100644 --- a/third-party/thrift/src/thrift/lib/python/test/serializer.py +++ b/third-party/thrift/src/thrift/lib/python/test/serializer.py @@ -42,14 +42,12 @@ FieldLevelTerseStruct, MyEnum, MyStruct, - MyStructWithCustomDefault, MyUnion, TerseSafePatch, TerseStructs, TerseStructs1, TerseStructs2, TerseStructs3, - TerseStructWithCustomDefault, ) from folly.iobuf import IOBuf @@ -527,13 +525,7 @@ def setUp(self) -> None: # pyre-ignore[16]: has no attribute `test_types` self.test_types.FieldLevelTerseStruct ) - self.TerseStructWithCustomDefault: Type[TerseStructWithCustomDefault] = ( - self.test_types.TerseStructWithCustomDefault - ) self.MyStruct: Type[MyStruct] = self.test_types.MyStruct - self.MyStructWithCustomDefault: Type[MyStructWithCustomDefault] = ( - self.test_types.MyStructWithCustomDefault - ) self.MyUnion: Type[MyUnion] = self.test_types.MyUnion self.EmptyStruct: Type[EmptyStruct] = self.test_types.EmptyStruct self.MyEnum: Type[MyEnum] = self.test_types.MyEnum @@ -602,33 +594,6 @@ def test_field_level_terse_write(self) -> None: encoded_empty = self.serializer.serialize(empty, protocol=proto) self.assertEqual(encoded, encoded_empty) - # Since empty serializd binary is deserialized, all terse fields should equal - # to their intrinsic default values. - def test_terse_struct_with_custom_default(self) -> None: - empty = self.EmptyStruct() - for proto in Protocol: - encoded_empty = self.serializer.serialize(empty, protocol=proto) - decoded, length = self.serializer.deserialize_with_length( - self.TerseStructWithCustomDefault, encoded_empty, protocol=proto - ) - self.assertIsInstance(decoded, self.TerseStructWithCustomDefault) - self.assertEqual(decoded.bool_field, False) - self.assertEqual(decoded.byte_field, 0) - self.assertEqual(decoded.short_field, 0) - self.assertEqual(decoded.int_field, 0) - self.assertEqual(decoded.long_field, 0) - self.assertEqual(decoded.float_field, 0.0) - self.assertEqual(decoded.double_field, 0.0) - self.assertEqual(decoded.string_field, "") - self.assertEqual(decoded.binary_field, b"") - self.assertEqual(decoded.enum_field, self.MyEnum.ME0) - self.assertEqual(decoded.list_field, []) - self.assertEqual(decoded.set_field, set()) - self.assertEqual(decoded.map_field, {}) - self.assertEqual( - decoded.struct_field, self.MyStructWithCustomDefault(field1=0) - ) - def test_terse_structs_optimization(self) -> None: # empty empty = self.EmptyStruct() diff --git a/third-party/thrift/src/thrift/test/terse_write/TerseWriteTest.cpp b/third-party/thrift/src/thrift/test/terse_write/TerseWriteTest.cpp index 41cc903a54d141..70aa6ff4a99926 100644 --- a/third-party/thrift/src/thrift/test/terse_write/TerseWriteTest.cpp +++ b/third-party/thrift/src/thrift/test/terse_write/TerseWriteTest.cpp @@ -122,10 +122,7 @@ void expect_intrinsic_default(const T& obj) { EXPECT_TRUE(obj.set_field()->empty()); EXPECT_TRUE(obj.map_field()->empty()); EXPECT_TRUE(apache::thrift::empty(*obj.struct_field())); - if constexpr (!std::is_same:: - value) { - EXPECT_TRUE(apache::thrift::empty(*obj.union_field())); - } + EXPECT_TRUE(apache::thrift::empty(*obj.union_field())); } TYPED_TEST_CASE_P(TerseWriteTests); @@ -225,28 +222,6 @@ void test_mixed_fields_struct() { EXPECT_EQ(obj, objd); } -template -void test_mixed_fields_struct_with_custom_default() { - T obj; - - apache::thrift::clear(obj); - - auto objs = Serializer::template serialize(obj); - T objd; - EXPECT_EQ(objd.terse_int_field(), 1); - EXPECT_EQ(objd.def_int_field(), 2); - EXPECT_EQ(objd.opt_int_field().value_unchecked(), 3); - - Serializer::template deserialize(objs, objd); - - EXPECT_EQ(objd.terse_int_field(), 0); - EXPECT_EQ(objd.def_int_field(), 0); - // Note, since `opt_int_field` is default constructed and the serialization is - // skipped, the deserializer will not set the field. Therefore, it will have - // custom default value with isset is false. - EXPECT_EQ(objd.opt_int_field().value_unchecked(), 3); -} - template void test_nested_mixed_struct() { T obj; @@ -259,22 +234,12 @@ void test_nested_mixed_struct() { EXPECT_EQ(objd.mixed_field()->terse_int_field(), 0); EXPECT_EQ(objd.mixed_field()->def_int_field(), 0); EXPECT_EQ(objd.mixed_field()->opt_int_field().value_unchecked(), 0); - EXPECT_EQ(objd.mixed_field_with_custom_default()->terse_int_field(), 1); - EXPECT_EQ(objd.mixed_field_with_custom_default()->def_int_field(), 2); - EXPECT_EQ( - objd.mixed_field_with_custom_default()->opt_int_field().value_unchecked(), - 3); Serializer::template deserialize(objs, objd); EXPECT_EQ(objd.mixed_field()->terse_int_field(), 0); EXPECT_EQ(objd.mixed_field()->def_int_field(), 0); EXPECT_EQ(objd.mixed_field()->opt_int_field().value_unchecked(), 0); - EXPECT_EQ(objd.mixed_field_with_custom_default()->terse_int_field(), 0); - EXPECT_EQ(objd.mixed_field_with_custom_default()->def_int_field(), 0); - EXPECT_EQ( - objd.mixed_field_with_custom_default()->opt_int_field().value_unchecked(), - 3); } TYPED_TEST_P(TerseWriteSerializerTests, MixedFieldsStruct) { @@ -284,15 +249,6 @@ TYPED_TEST_P(TerseWriteSerializerTests, MixedFieldsStruct) { TypeParam>(); } -TYPED_TEST_P(TerseWriteSerializerTests, MixedFieldsStructWithCustomDefault) { - test_mixed_fields_struct_with_custom_default< - terse_write::MixedFieldsStructWithCustomDefault, - TypeParam>(); - test_mixed_fields_struct_with_custom_default< - tablebased_terse_write::MixedFieldsStructWithCustomDefault, - TypeParam>(); -} - TYPED_TEST_P(TerseWriteSerializerTests, NestedMixedStruct) { test_nested_mixed_struct(); test_nested_mixed_struct< @@ -347,43 +303,6 @@ TYPED_TEST_P(TerseWriteSerializerTests, CppRefTerseStruct_Empty) { EXPECT_EQ(objs, emptys); } -TYPED_TEST_P(TerseWriteSerializerTests, TerseInternBoxWithCustomDefault) { - terse_write::TerseInternBoxedStructWithCustomDefault obj; - terse_write::EmptyStruct empty; - - const auto& objc = obj; - - EXPECT_FALSE(apache::thrift::empty(obj)); - - // reset the field to shared default value. - obj.intern_boxed_field_with_custom_default().reset(); - obj.intern_boxed_field_with_custom_default_adapted().reset(); - - EXPECT_EQ(objc.intern_boxed_field_with_custom_default()->field1(), 1); - EXPECT_EQ( - objc.intern_boxed_field_with_custom_default_adapted()->value.field1(), 1); - - EXPECT_FALSE(apache::thrift::empty(obj)); - - // clear the field to shared intrinsic default value. - apache::thrift::clear(obj); - - EXPECT_EQ(objc.intern_boxed_field_with_custom_default()->field1(), 0); - EXPECT_EQ( - objc.intern_boxed_field_with_custom_default_adapted()->value.field1(), 0); - - EXPECT_TRUE(apache::thrift::empty(obj)); - - auto objs = TypeParam::template serialize(obj); - auto emptys = TypeParam::template serialize(empty); - - EXPECT_EQ(objs, emptys); - - terse_write::TerseInternBoxedStructWithCustomDefault objd; - TypeParam::template deserialize(objs, objd); - EXPECT_EQ(objd, obj); -} - TYPED_TEST_P(TerseWriteSerializerTests, CustomStringFields) { tablebased_terse_write::CustomStringFields obj; terse_write::EmptyStruct empty; @@ -398,8 +317,6 @@ TYPED_TEST_P(TerseWriteSerializerTests, CustomStringFields) { obj.iobuf_field()->clear(); (*obj.iobuf_ptr_field())->clear(); - obj.iobuf_field_with_custom_default()->clear(); - (*obj.iobuf_ptr_field_with_custom_default())->clear(); objs = TypeParam::template serialize(obj); @@ -416,8 +333,6 @@ TYPED_TEST_P(TerseWriteSerializerTests, CustomStringFieldsDeserialization) { EXPECT_TRUE(objd.iobuf_field()->empty()); EXPECT_FALSE((*objd.iobuf_ptr_field())); - EXPECT_TRUE(objd.iobuf_field_with_custom_default()->empty()); - EXPECT_TRUE((*objd.iobuf_ptr_field_with_custom_default())->empty()); } TYPED_TEST_P(TerseWriteSerializerTests, EmptiableStructField) { @@ -443,71 +358,6 @@ TYPED_TEST_P(TerseWriteSerializerTests, EmptiableStructField) { EXPECT_EQ(emptys, objs); } -TYPED_TEST_P(TerseWriteSerializerTests, TerseStructWithCustomDefault) { - terse_write::TerseStructWithCustomDefault obj; - terse_write::EmptyStruct empty; - - auto emptys = TypeParam::template serialize(empty); - auto objs = TypeParam::template serialize(obj); - - EXPECT_NE(emptys, objs); - - apache::thrift::clear(obj); - - objs = TypeParam::template serialize(obj); - - EXPECT_EQ(emptys, objs); -} - -// A terse field needs to be cleared before deserialization for the consistent -// behavior when it is missing during deserialization. There are two reasons why -// a terse field might be missing: -// 1. Serialization is skipped for a terse field since it is equal to the -// intrinsic default. -// 2. IDL version mismatch. -// Since we sent empty serialized binary, all terse fields in deserialized -// object should equal to cleared object. -TYPED_TEST_P( - TerseWriteSerializerTests, TerseStructWithCustomDefaultDeserialization) { - terse_write::TerseStructWithCustomDefault obj; - - apache::thrift::clear(obj); - - auto objs = TypeParam::template serialize(obj); - terse_write::TerseStructWithCustomDefault objd; - TypeParam::template deserialize(objs, objd); - - EXPECT_EQ(obj, objd); -} - -// Since empty serializd binary is deserialized, all terse fields should equal -// to the intrinsic default. -TYPED_TEST_P( - TerseWriteSerializerTests, TerseStructWithCustomDefaultClearTerseFields) { - terse_write::EmptyStruct empty; - - auto emptys = TypeParam::template serialize(empty); - - terse_write::TerseStructWithCustomDefault objd; - TypeParam::template deserialize(emptys, objd); - - expect_intrinsic_default(objd); -} - -TYPED_TEST_P( - TerseWriteSerializerTests, - TableBasedTerseStructWithCustomDefaultDeserialization) { - tablebased_terse_write::TerseStructWithCustomDefault obj; - - apache::thrift::clear(obj); - - auto objs = TypeParam::template serialize(obj); - tablebased_terse_write::TerseStructWithCustomDefault objd; - TypeParam::template deserialize(objs, objd); - - EXPECT_EQ(obj, objd); -} - template void terse_struct_optimization_test() { SCOPED_TRACE(folly::pretty_name()); @@ -699,7 +549,6 @@ REGISTER_TYPED_TEST_CASE_P( AdaptedStringFields, AdaptedListFields, MixedFieldsStruct, - MixedFieldsStructWithCustomDefault, NestedMixedStruct, CppRefTerseStruct, CppRefTerseStruct_Empty, @@ -707,12 +556,7 @@ REGISTER_TYPED_TEST_CASE_P( CustomStringFieldsDeserialization, EmptiableStructField, TerseException, - TerseInternBoxWithCustomDefault, - TerseStructWithCustomDefault, - TerseStructWithCustomDefaultDeserialization, - TerseStructWithCustomDefaultClearTerseFields, - TerseStructs, - TableBasedTerseStructWithCustomDefaultDeserialization); + TerseStructs); using Serializers = ::testing::Types< BinarySerializer, diff --git a/third-party/thrift/src/thrift/test/terse_write/tablebased_terse_write.thrift b/third-party/thrift/src/thrift/test/terse_write/tablebased_terse_write.thrift index 59780b91d5ba47..0148cc5e019620 100644 --- a/third-party/thrift/src/thrift/test/terse_write/tablebased_terse_write.thrift +++ b/third-party/thrift/src/thrift/test/terse_write/tablebased_terse_write.thrift @@ -111,8 +111,6 @@ struct FieldLevelTerseStruct { struct CustomStringFields { 1: IOBuf iobuf_field; 2: IOBufPtr iobuf_ptr_field; - 3: IOBuf iobuf_field_with_custom_default = "3"; - 4: IOBufPtr iobuf_ptr_field_with_custom_default = "4"; } struct EmptiableStruct { @@ -133,40 +131,9 @@ struct MixedFieldsStruct { 3: optional i32 opt_int_field; } -struct MixedFieldsStructWithCustomDefault { - @thrift.TerseWrite - 1: i32 terse_int_field = 1; - 2: i32 def_int_field = 2; - 3: optional i32 opt_int_field = 3; -} - @thrift.TerseWrite struct NestedMixedStruct { 1: MixedFieldsStruct mixed_field; - 2: MixedFieldsStructWithCustomDefault mixed_field_with_custom_default; -} - -@thrift.TerseWrite -struct MyStructWithCustomDefault { - 1: i32 field1 = 1; -} - -@thrift.TerseWrite -struct TerseStructWithCustomDefault { - 1: bool bool_field = true; - 2: byte byte_field = 1; - 3: i16 short_field = 2; - 4: i32 int_field = 3; - 5: i64 long_field = 4; - 6: float float_field = 5.0; - 7: double double_field = 6.0; - 8: string string_field = "7"; - 9: binary binary_field = "8"; - 10: MyEnum enum_field = MyEnum.ME1; - 11: list list_field = [1]; - 12: set set_field = [1]; - 13: map map_field = {1: 1}; - 14: MyStructWithCustomDefault struct_field; } @thrift.TerseWrite diff --git a/third-party/thrift/src/thrift/test/terse_write/terse_write.thrift b/third-party/thrift/src/thrift/test/terse_write/terse_write.thrift index 2db84486399200..92cec0c5495a26 100644 --- a/third-party/thrift/src/thrift/test/terse_write/terse_write.thrift +++ b/third-party/thrift/src/thrift/test/terse_write/terse_write.thrift @@ -132,47 +132,13 @@ struct MixedFieldsStruct { 3: optional i32 opt_int_field; } -struct MixedFieldsStructWithCustomDefault { - @thrift.TerseWrite - 1: i32 terse_int_field = 1; - 2: i32 def_int_field = 2; - 3: optional i32 opt_int_field = 3; -} - @thrift.TerseWrite struct NestedMixedStruct { 1: MixedFieldsStruct mixed_field; - 2: MixedFieldsStructWithCustomDefault mixed_field_with_custom_default; } struct EmptyStruct {} -@thrift.TerseWrite -struct MyStructWithCustomDefault { - 1: i32 field1 = 1; -} - -@cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"} -typedef MyStructWithCustomDefault MyStructWithCustomDefaultAdapted - -@thrift.TerseWrite -struct TerseStructWithCustomDefault { - 1: bool bool_field = true; - 2: byte byte_field = 1; - 3: i16 short_field = 2; - 4: i32 int_field = 3; - 5: i64 long_field = 4; - 6: float float_field = 5.0; - 7: double double_field = 6.0; - 8: string string_field = "7"; - 9: binary binary_field = "8"; - 10: MyEnum enum_field = MyEnum.ME1; - 11: list list_field = [1]; - 12: set set_field = [1]; - 13: map map_field = {1: 1}; - 14: MyStructWithCustomDefault struct_field; -} - @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"} typedef i32 AdaptedInteger @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"} @@ -281,15 +247,6 @@ struct TerseStructs3 { 3: MyStruct field3; } -@thrift.TerseWrite -struct TerseInternBoxedStructWithCustomDefault { - @thrift.InternBox - 1: MyStructWithCustomDefault intern_boxed_field_with_custom_default; - @python.Py3Hidden - @thrift.InternBox - 2: MyStructWithCustomDefaultAdapted intern_boxed_field_with_custom_default_adapted; -} - @thrift.TerseWrite struct TerseSafePatch { 1: i32 version;