diff --git a/prometeu-app/build.gradle.kts b/prometeu-app/build.gradle.kts index fcd33719..1dba5470 100644 --- a/prometeu-app/build.gradle.kts +++ b/prometeu-app/build.gradle.kts @@ -160,7 +160,6 @@ tasks.register("headlessMcpDesktopTest") { // Subprocess tests exercise the actual Studio main and OS ownership boundaries. tasks.withType().configureEach { systemProperty("studio.test.classpath", sourceSets["test"].runtimeClasspath.asPath) - systemProperty("studio.test.protocolFixtures", rootProject.file("../runtime/devtools/studio-protocol/fixtures").absolutePath) systemProperty("studio.test.studioHost", providers.gradleProperty("studioPlayHost").getOrElse( rootProject.file("../runtime/target/debug/prometeu-host-desktop-winit" + if (System.getProperty("os.name").startsWith("Windows")) ".exe" else "").absolutePath)) systemProperty("studio.test.studioCartridge", rootProject.file("../runtime/test-cartridges/dummy-boy").absolutePath) diff --git a/prometeu-app/src/test/java/p/studio/app/runtime/studio/StudioWireTest.java b/prometeu-app/src/test/java/p/studio/app/runtime/studio/StudioWireTest.java index 1cdbf56a..de029891 100644 --- a/prometeu-app/src/test/java/p/studio/app/runtime/studio/StudioWireTest.java +++ b/prometeu-app/src/test/java/p/studio/app/runtime/studio/StudioWireTest.java @@ -2,7 +2,7 @@ package p.studio.app.runtime.studio; import org.junit.jupiter.api.Test; import java.io.*; -import java.nio.file.*; +import java.nio.charset.StandardCharsets; import java.util.HexFormat; import p.studio.app.runtime.studio.StudioWire.Reader; import static org.junit.jupiter.api.Assertions.*; @@ -16,16 +16,19 @@ class StudioWireTest { assertEquals(3,logs.size());assertEquals("ready",logs.getFirst().message()); assertEquals(8193,logs.get(1).message().length());assertEquals("last",logs.getLast().message()); } - private byte[] fixture() throws IOException { - String hex=Files.readString(Path.of(System.getProperty("studio.test.protocolFixtures"),"pause.hex")); - return HexFormat.of().parseHex(hex.replaceAll("\\s+","")); + private byte[] fixture(String name) throws IOException { + try (InputStream resource = StudioWireTest.class.getResourceAsStream("/studio-protocol/fixtures/" + name)) { + assertNotNull(resource, "Missing protocol fixture: " + name); + String hex = new String(resource.readAllBytes(), StandardCharsets.US_ASCII); + return HexFormat.of().parseHex(hex.replaceAll("\\s+", "")); + } } @Test void headerMatchesSharedRustFixture() throws Exception { - assertArrayEquals(fixture(),new Header(PAUSE,0,1,42).encode()); - assertEquals(42,Header.decode(fixture()).request()); + assertArrayEquals(fixture("pause.hex"),new Header(PAUSE,0,1,42).encode()); + assertEquals(42,Header.decode(fixture("pause.hex")).request()); } @Test void fragmentedReadsWorkButTruncationAndReplayFail() throws Exception { - byte[] bytes=fixture(); + byte[] bytes=fixture("pause.hex"); InputStream fragmented=new FilterInputStream(new ByteArrayInputStream(bytes)) { @Override public int read(byte[] b,int off,int len)throws IOException {return super.read(b,off,Math.min(len,3));} }; @@ -36,9 +39,9 @@ class StudioWireTest { assertThrows(IOException.class,reader::receive); } @Test void validatesBeforeAllocatingPayload() throws Exception { - for(int offset:new int[]{0,4,6,8,10}) {byte[] bad=fixture();bad[offset]=(byte)255; + for(int offset:new int[]{0,4,6,8,10}) {byte[] bad=fixture("pause.hex");bad[offset]=(byte)255; assertThrows(IOException.class,()->Header.decode(bad));} - byte[] huge=fixture();java.util.Arrays.fill(huge,12,16,(byte)255); + byte[] huge=fixture("pause.hex");java.util.Arrays.fill(huge,12,16,(byte)255); assertThrows(IOException.class,()->Header.decode(huge)); assertThrows(IOException.class,()->frameBytes(Integer.MAX_VALUE,Integer.MAX_VALUE,Integer.MAX_VALUE)); assertThrows(IOException.class,()->frameBytes(480,270,481)); @@ -46,8 +49,7 @@ class StudioWireTest { assertThrows(IOException.class,()->text(new byte[]{(byte)0xff},0)); } @Test void rgbaPayloadMatchesSharedFixture() throws Exception { - byte[] bytes=HexFormat.of().parseHex(Files.readString(Path.of( - System.getProperty("studio.test.protocolFixtures"),"rgba.hex")).replaceAll("\\s+","")); + byte[] bytes=fixture("rgba.hex"); var reader=new Reader(new ByteArrayInputStream(bytes));var h=reader.nextHeader(); assertEquals(FRAME,h.kind());assertEquals(56,h.length()); byte[] metadata=new byte[48];reader.readFully(metadata,0,48); diff --git a/prometeu-app/src/test/resources/studio-protocol/fixtures/README.md b/prometeu-app/src/test/resources/studio-protocol/fixtures/README.md new file mode 100644 index 00000000..c5e3bf00 --- /dev/null +++ b/prometeu-app/src/test/resources/studio-protocol/fixtures/README.md @@ -0,0 +1,10 @@ +# Studio protocol test vectors + +These protocol 1.0 vectors mirror `devtools/studio-protocol/fixtures` in +`prometeu-runtime`. Keep both copies identical when changing the protocol. + +`pause.hex` checks the control header; `rgba.hex` checks frame metadata and pixels. +They are fixed reference bytes, independent of the Java encoder under test. +Studio unit tests load these resources from the classpath so a standalone checkout +does not need a sibling runtime repository. Cross-repository qualification belongs +to `prometeu-tooling`. diff --git a/prometeu-app/src/test/resources/studio-protocol/fixtures/pause.hex b/prometeu-app/src/test/resources/studio-protocol/fixtures/pause.hex new file mode 100644 index 00000000..7e2bf24b --- /dev/null +++ b/prometeu-app/src/test/resources/studio-protocol/fixtures/pause.hex @@ -0,0 +1,2 @@ +50 53 54 31 01 00 00 00 04 00 00 00 00 00 00 00 +01 00 00 00 00 00 00 00 2a 00 00 00 00 00 00 00 diff --git a/prometeu-app/src/test/resources/studio-protocol/fixtures/rgba.hex b/prometeu-app/src/test/resources/studio-protocol/fixtures/rgba.hex new file mode 100644 index 00000000..d20ae4e7 --- /dev/null +++ b/prometeu-app/src/test/resources/studio-protocol/fixtures/rgba.hex @@ -0,0 +1,6 @@ +50 53 54 31 01 00 00 00 09 00 00 00 38 00 00 00 +01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f +01 00 00 00 00 00 00 00 07 00 00 00 00 00 00 00 +02 00 00 00 01 00 00 00 02 00 00 00 01 00 00 00 +ff 00 00 ff 00 00 ff 80