diff options
author | Jiayu Liu <Jimexist@users.noreply.github.com> | 2022-05-06 12:56:42 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-06 00:56:42 -0400 |
commit | 53ec08228a14130909d4dd6fc2c98f47a09d76b0 (patch) | |
tree | 19fd3589502b5471be23efe4d1190ad26fcbc91e /lib/java/src/test/java/org/apache/thrift/TestTDeserializer.java | |
parent | 23b86364ef3dbccc19f5f3828e6d115f7b015651 (diff) | |
download | thrift-53ec08228a14130909d4dd6fc2c98f47a09d76b0.tar.gz |
THRIFT-5568: enforce consistent Java formatting (#2581)
* use spotless plugin and google-java-format to enforce a consistent code format
* add a step of spotless check before building
* only run spotless on the src/ directory
Co-authored-by: Christopher Tubbs <ctubbsii@apache.org>
Diffstat (limited to 'lib/java/src/test/java/org/apache/thrift/TestTDeserializer.java')
-rw-r--r-- | lib/java/src/test/java/org/apache/thrift/TestTDeserializer.java | 148 |
1 files changed, 111 insertions, 37 deletions
diff --git a/lib/java/src/test/java/org/apache/thrift/TestTDeserializer.java b/lib/java/src/test/java/org/apache/thrift/TestTDeserializer.java index c3b588e61..8a02e3a75 100644 --- a/lib/java/src/test/java/org/apache/thrift/TestTDeserializer.java +++ b/lib/java/src/test/java/org/apache/thrift/TestTDeserializer.java @@ -18,6 +18,9 @@ */ package org.apache.thrift; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.nio.ByteBuffer; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TJSONProtocol; @@ -29,21 +32,16 @@ import thrift.test.PrimitiveThenStruct; import thrift.test.StructWithAUnion; import thrift.test.TestUnion; -import java.nio.ByteBuffer; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class TestTDeserializer { +public class TestTDeserializer { - private static final TProtocolFactory[] PROTOCOLS = new TProtocolFactory[] { - new TBinaryProtocol.Factory(), - new TCompactProtocol.Factory(), - new TJSONProtocol.Factory() - }; + private static final TProtocolFactory[] PROTOCOLS = + new TProtocolFactory[] { + new TBinaryProtocol.Factory(), new TCompactProtocol.Factory(), new TJSONProtocol.Factory() + }; @Test public void testPartialDeserialize() throws Exception { - //Root:StructWithAUnion + // Root:StructWithAUnion // 1:Union // 1.3:OneOfEach OneOfEach level3OneOfEach = Fixtures.getOneOfEach(); @@ -55,73 +53,149 @@ public class TestTDeserializer { for (TProtocolFactory factory : PROTOCOLS) { - //Level 2 test - testPartialDeserialize(factory, level1SWU, new TestUnion(), level2TestUnion, StructWithAUnion._Fields.TEST_UNION); - - //Level 3 on 3rd field test - testPartialDeserialize(factory, level1SWU, new OneOfEach(), level3OneOfEach, StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD); - - //Test early termination when traversed path Field.id exceeds the one being searched for - testPartialDeserialize(factory, level1SWU, new OneOfEach(), new OneOfEach(), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.I32_FIELD); - - //Test that readStructBegin isn't called on primitive + // Level 2 test + testPartialDeserialize( + factory, + level1SWU, + new TestUnion(), + level2TestUnion, + StructWithAUnion._Fields.TEST_UNION); + + // Level 3 on 3rd field test + testPartialDeserialize( + factory, + level1SWU, + new OneOfEach(), + level3OneOfEach, + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.STRUCT_FIELD); + + // Test early termination when traversed path Field.id exceeds the one being searched for + testPartialDeserialize( + factory, + level1SWU, + new OneOfEach(), + new OneOfEach(), + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.I32_FIELD); + + // Test that readStructBegin isn't called on primitive testPartialDeserialize(factory, pts, new Backwards(), bw, PrimitiveThenStruct._Fields.BW); - //Test primitive types + // Test primitive types TDeserializer deserializer = new TDeserializer(factory); Boolean expectedBool = level3OneOfEach.isIm_true(); - Boolean resultBool = deserializer.partialDeserializeBool(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.IM_TRUE); + Boolean resultBool = + deserializer.partialDeserializeBool( + serialize(level1SWU, factory), + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.STRUCT_FIELD, + OneOfEach._Fields.IM_TRUE); assertEquals(expectedBool, resultBool); Byte expectedByte = level3OneOfEach.getA_bite(); - Byte resultByte = deserializer.partialDeserializeByte(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.A_BITE); + Byte resultByte = + deserializer.partialDeserializeByte( + serialize(level1SWU, factory), + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.STRUCT_FIELD, + OneOfEach._Fields.A_BITE); assertEquals(expectedByte, resultByte); Double expectedDouble = level3OneOfEach.getDouble_precision(); - Double resultDouble = deserializer.partialDeserializeDouble(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.DOUBLE_PRECISION); + Double resultDouble = + deserializer.partialDeserializeDouble( + serialize(level1SWU, factory), + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.STRUCT_FIELD, + OneOfEach._Fields.DOUBLE_PRECISION); assertEquals(expectedDouble, resultDouble); Short expectedI16 = level3OneOfEach.getInteger16(); - Short resultI16 = deserializer.partialDeserializeI16(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.INTEGER16); + Short resultI16 = + deserializer.partialDeserializeI16( + serialize(level1SWU, factory), + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.STRUCT_FIELD, + OneOfEach._Fields.INTEGER16); assertEquals(expectedI16, resultI16); Integer expectedI32 = level3OneOfEach.getInteger32(); - Integer resultI32 = deserializer.partialDeserializeI32(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.INTEGER32); + Integer resultI32 = + deserializer.partialDeserializeI32( + serialize(level1SWU, factory), + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.STRUCT_FIELD, + OneOfEach._Fields.INTEGER32); assertEquals(expectedI32, resultI32); Long expectedI64 = level3OneOfEach.getInteger64(); - Long resultI64= deserializer.partialDeserializeI64(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.INTEGER64); + Long resultI64 = + deserializer.partialDeserializeI64( + serialize(level1SWU, factory), + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.STRUCT_FIELD, + OneOfEach._Fields.INTEGER64); assertEquals(expectedI64, resultI64); String expectedString = level3OneOfEach.getSome_characters(); - String resultString = deserializer.partialDeserializeString(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.SOME_CHARACTERS); + String resultString = + deserializer.partialDeserializeString( + serialize(level1SWU, factory), + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.STRUCT_FIELD, + OneOfEach._Fields.SOME_CHARACTERS); assertEquals(expectedString, resultString); byte[] expectedBinary = level3OneOfEach.getBase64(); - ByteBuffer resultBinary = deserializer.partialDeserializeByteArray(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.BASE64); - assertEquals(expectedBinary.length, resultBinary.limit() - resultBinary.position() - resultBinary.arrayOffset()); + ByteBuffer resultBinary = + deserializer.partialDeserializeByteArray( + serialize(level1SWU, factory), + StructWithAUnion._Fields.TEST_UNION, + TestUnion._Fields.STRUCT_FIELD, + OneOfEach._Fields.BASE64); + assertEquals( + expectedBinary.length, + resultBinary.limit() - resultBinary.position() - resultBinary.arrayOffset()); assertEquals(ByteBuffer.wrap(expectedBinary), resultBinary); // Test field id in Union - short id = deserializer.partialDeserializeSetFieldIdInUnion(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION); + short id = + deserializer.partialDeserializeSetFieldIdInUnion( + serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION); assertEquals(level2TestUnion.getSetField().getThriftFieldId(), id); } } - private void testPartialDeserialize(TProtocolFactory protocolFactory, TBase input, TBase output, TBase expected, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException { + private void testPartialDeserialize( + TProtocolFactory protocolFactory, + TBase input, + TBase output, + TBase expected, + TFieldIdEnum fieldIdPathFirst, + TFieldIdEnum... fieldIdPathRest) + throws TException { byte[] record = serialize(input, protocolFactory); TDeserializer deserializer = new TDeserializer(protocolFactory); for (int i = 0; i < 2; i++) { TBase outputCopy = output.deepCopy(); deserializer.partialDeserialize(outputCopy, record, fieldIdPathFirst, fieldIdPathRest); - assertEquals(expected, - outputCopy, "on attempt " + i + ", with " + protocolFactory - + ", expected " + expected + " but got " + outputCopy); + assertEquals( + expected, + outputCopy, + "on attempt " + + i + + ", with " + + protocolFactory + + ", expected " + + expected + + " but got " + + outputCopy); } } - private static byte[] serialize(TBase input, TProtocolFactory protocolFactory) throws TException{ + private static byte[] serialize(TBase input, TProtocolFactory protocolFactory) throws TException { return new TSerializer(protocolFactory).serialize(input); } } |