From 21a38961437a4139321ab1c2601413e5f88c8e9c Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 22 Mar 2026 17:41:47 +0000 Subject: Serialize Patio data layouts to flatbuffers --- .../serialization/PatioSerializationTests.java | 97 +++++++++++++++++++ .../serialization/PatioToFlatbuffersTests.java | 16 ++++ .../patio/serialization/PatioToProtobufTests.java | 106 ++++----------------- 3 files changed, 129 insertions(+), 90 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/patio/serialization/PatioSerializationTests.java b/src/test/java/org/shedlang/compiler/patio/serialization/PatioSerializationTests.java index 74756c2a..3ed5ae0c 100644 --- a/src/test/java/org/shedlang/compiler/patio/serialization/PatioSerializationTests.java +++ b/src/test/java/org/shedlang/compiler/patio/serialization/PatioSerializationTests.java @@ -2,8 +2,12 @@ package org.shedlang.compiler.patio.serialization; import org.junit.jupiter.api.Test; import org.shedlang.compiler.patio.instructions.Patio; +import org.shedlang.compiler.patio.types.PatioDataLayout; +import org.shedlang.compiler.patio.types.PatioDataLayouts; import org.shedlang.compiler.patio.values.PatioDataPtrValue; +import java.util.List; + import static org.zwobble.precisely.AssertThat.assertThat; import static org.zwobble.precisely.Matchers.equalTo; @@ -34,4 +38,97 @@ public abstract class PatioSerializationTests { assertThat(deserializedDataPtrValue, equalTo(dataPtrValue)); } + + // == Data layouts == + + protected abstract PatioDataLayout deserializeDataLayout(byte[] buffer); + protected abstract byte[] serializeDataLayout(PatioDataLayout value); + + @Test + public void canSerializeDataLayoutArray() { + var layout = PatioDataLayouts.array(PatioDataLayouts.INT, 4); + + var deserializedLayout = deserializeDataLayout( + serializeDataLayout(layout) + ); + + assertThat(deserializedLayout, equalTo(layout)); + } + + @Test + public void canSerializeDataLayoutBool() { + var layout = PatioDataLayouts.BOOL; + + var deserializedLayout = deserializeDataLayout( + serializeDataLayout(layout) + ); + + assertThat(deserializedLayout, equalTo(layout)); + } + + @Test + public void canSerializeDataLayoutByte() { + var layout = PatioDataLayouts.BYTE; + + var deserializedLayout = deserializeDataLayout( + serializeDataLayout(layout) + ); + + assertThat(deserializedLayout, equalTo(layout)); + } + + @Test + public void canSerializeDataLayoutDataPtr() { + var layout = PatioDataLayouts.DATA_PTR; + + var deserializedLayout = deserializeDataLayout( + serializeDataLayout(layout) + ); + + assertThat(deserializedLayout, equalTo(layout)); + } + + @Test + public void canSerializeDataLayoutFunctionPtr() { + var layout = PatioDataLayouts.FUNCTION_PTR; + + var deserializedLayout = deserializeDataLayout( + serializeDataLayout(layout) + ); + + assertThat(deserializedLayout, equalTo(layout)); + } + + @Test + public void canSerializeDataLayoutInt() { + var layout = PatioDataLayouts.INT; + + var deserializedLayout = deserializeDataLayout( + serializeDataLayout(layout) + ); + + assertThat(deserializedLayout, equalTo(layout)); + } + + @Test + public void canSerializeDataLayoutInt32() { + var layout = PatioDataLayouts.INT32; + + var deserializedLayout = deserializeDataLayout( + serializeDataLayout(layout) + ); + + assertThat(deserializedLayout, equalTo(layout)); + } + + @Test + public void canSerializeDataLayoutStruct() { + var layout = PatioDataLayouts.struct(List.of(PatioDataLayouts.INT, PatioDataLayouts.INT, PatioDataLayouts.BYTE)); + + var deserializedLayout = deserializeDataLayout( + serializeDataLayout(layout) + ); + + assertThat(deserializedLayout, equalTo(layout)); + } } diff --git a/src/test/java/org/shedlang/compiler/patio/serialization/PatioToFlatbuffersTests.java b/src/test/java/org/shedlang/compiler/patio/serialization/PatioToFlatbuffersTests.java index 8222233f..eacb36cb 100644 --- a/src/test/java/org/shedlang/compiler/patio/serialization/PatioToFlatbuffersTests.java +++ b/src/test/java/org/shedlang/compiler/patio/serialization/PatioToFlatbuffersTests.java @@ -1,7 +1,9 @@ package org.shedlang.compiler.patio.serialization; import com.google.flatbuffers.FlatBufferBuilder; +import org.shedlang.compiler.patio.flatbuffers.PatioDataLayoutFbs; import org.shedlang.compiler.patio.flatbuffers.PatioDataPtrValueFbs; +import org.shedlang.compiler.patio.types.PatioDataLayout; import org.shedlang.compiler.patio.values.PatioDataPtrValue; import java.nio.ByteBuffer; @@ -20,4 +22,18 @@ public class PatioToFlatbuffersTests extends PatioSerializationTests { var valueFbs = PatioDataPtrValueFbs.getRootAsPatioDataPtrValueFbs(ByteBuffer.wrap(buffer)); return PatioToFlatbuffers.deserializeDataPtrValue(valueFbs); } + + @Override + protected byte[] serializeDataLayout(PatioDataLayout value) { + var builder = new FlatBufferBuilder(); + var valueFbs = PatioToFlatbuffers.serializeDataLayout(builder, value); + builder.finish(valueFbs); + return builder.sizedByteArray(); + } + + @Override + protected PatioDataLayout deserializeDataLayout(byte[] buffer) { + var valueFbs = PatioDataLayoutFbs.getRootAsPatioDataLayoutFbs(ByteBuffer.wrap(buffer)); + return PatioToFlatbuffers.deserializeDataLayout(valueFbs); + } } diff --git a/src/test/java/org/shedlang/compiler/patio/serialization/PatioToProtobufTests.java b/src/test/java/org/shedlang/compiler/patio/serialization/PatioToProtobufTests.java index ee4a8f82..a112af5c 100644 --- a/src/test/java/org/shedlang/compiler/patio/serialization/PatioToProtobufTests.java +++ b/src/test/java/org/shedlang/compiler/patio/serialization/PatioToProtobufTests.java @@ -7,6 +7,7 @@ import org.shedlang.compiler.patio.PatioFunctionDefinition; import org.shedlang.compiler.patio.PatioVisibility; import org.shedlang.compiler.patio.instructions.Patio; import org.shedlang.compiler.patio.protobuf.PatioProtobuf; +import org.shedlang.compiler.patio.types.PatioDataLayout; import org.shedlang.compiler.patio.types.PatioDataLayouts; import org.shedlang.compiler.patio.types.PatioDataValues; import org.shedlang.compiler.patio.types.PatioTypes; @@ -35,6 +36,21 @@ public class PatioToProtobufTests extends PatioSerializationTests { } } + @Override + protected byte[] serializeDataLayout(PatioDataLayout value) { + return PatioToProtobuf.serializeDataLayout(value).toByteArray(); + } + + @Override + protected PatioDataLayout deserializeDataLayout(byte[] buffer) { + try { + var valueProtobuf = PatioProtobuf.PatioDataLayout.parseFrom(buffer); + return PatioToProtobuf.deserializeDataLayout(valueProtobuf); + } catch (InvalidProtocolBufferException exception) { + throw new RuntimeException(exception); + } + } + // == Compilation unit == @Test @@ -862,96 +878,6 @@ public class PatioToProtobufTests extends PatioSerializationTests { assertThat(deserializedType, equalTo(type)); } - // == Data layouts == - - @Test - public void canSerializeDataLayoutArray() { - var layout = PatioDataLayouts.array(PatioDataLayouts.INT, 4); - - var deserializedLayout = PatioToProtobuf.deserializeDataLayout( - PatioToProtobuf.serializeDataLayout(layout) - ); - - assertThat(deserializedLayout, equalTo(layout)); - } - - @Test - public void canSerializeDataLayoutBool() { - var layout = PatioDataLayouts.BOOL; - - var deserializedLayout = PatioToProtobuf.deserializeDataLayout( - PatioToProtobuf.serializeDataLayout(layout) - ); - - assertThat(deserializedLayout, equalTo(layout)); - } - - @Test - public void canSerializeDataLayoutByte() { - var layout = PatioDataLayouts.BYTE; - - var deserializedLayout = PatioToProtobuf.deserializeDataLayout( - PatioToProtobuf.serializeDataLayout(layout) - ); - - assertThat(deserializedLayout, equalTo(layout)); - } - - @Test - public void canSerializeDataLayoutDataPtr() { - var layout = PatioDataLayouts.DATA_PTR; - - var deserializedLayout = PatioToProtobuf.deserializeDataLayout( - PatioToProtobuf.serializeDataLayout(layout) - ); - - assertThat(deserializedLayout, equalTo(layout)); - } - - @Test - public void canSerializeDataLayoutFunctionPtr() { - var layout = PatioDataLayouts.FUNCTION_PTR; - - var deserializedLayout = PatioToProtobuf.deserializeDataLayout( - PatioToProtobuf.serializeDataLayout(layout) - ); - - assertThat(deserializedLayout, equalTo(layout)); - } - - @Test - public void canSerializeDataLayoutInt() { - var layout = PatioDataLayouts.INT; - - var deserializedLayout = PatioToProtobuf.deserializeDataLayout( - PatioToProtobuf.serializeDataLayout(layout) - ); - - assertThat(deserializedLayout, equalTo(layout)); - } - - @Test - public void canSerializeDataLayoutInt32() { - var layout = PatioDataLayouts.INT32; - - var deserializedLayout = PatioToProtobuf.deserializeDataLayout( - PatioToProtobuf.serializeDataLayout(layout) - ); - - assertThat(deserializedLayout, equalTo(layout)); - } - - @Test - public void canSerializeDataLayoutStruct() { - var layout = PatioDataLayouts.struct(List.of(PatioDataLayouts.INT, PatioDataLayouts.INT, PatioDataLayouts.BYTE)); - - var deserializedLayout = PatioToProtobuf.deserializeDataLayout( - PatioToProtobuf.serializeDataLayout(layout) - ); - - assertThat(deserializedLayout, equalTo(layout)); - } - // == Data values == @Test -- cgit v1.2.3