diff --git a/internal/pipewire/client_test.go b/internal/pipewire/client_test.go index 96ea8fa..3eb8962 100644 --- a/internal/pipewire/client_test.go +++ b/internal/pipewire/client_test.go @@ -10,7 +10,7 @@ func TestClientInfo(t *testing.T) { t.Parallel() encodingTestCases[pipewire.ClientInfo, *pipewire.ClientInfo]{ - {"sample", []byte(recvmsg00Message02POD), pipewire.ClientInfo{ + {"sample", []byte(c1r2pod), pipewire.ClientInfo{ ID: 34, ChangeMask: pipewire.PW_CLIENT_CHANGE_MASK_PROPS, Props: &pipewire.SPADict{NItems: 9, Items: []pipewire.SPADictItem{ @@ -25,7 +25,7 @@ func TestClientInfo(t *testing.T) { {Key: "object.serial", Value: "34"}, }}}, nil}, - {"sample*", []byte(recvmsg00Message03POD), pipewire.ClientInfo{ + {"sample*", []byte(c1r3pod), pipewire.ClientInfo{ ID: 34, ChangeMask: pipewire.PW_CLIENT_CHANGE_MASK_PROPS, Props: &pipewire.SPADict{NItems: 38, Items: []pipewire.SPADictItem{ @@ -69,7 +69,7 @@ func TestClientInfo(t *testing.T) { {Key: "core.version", Value: "1.4.7"}, }}}, nil}, - {"sample**", []byte(recvmsg00Message04POD), pipewire.ClientInfo{ + {"sample**", []byte(c1r4pod), pipewire.ClientInfo{ ID: 34, ChangeMask: pipewire.PW_CLIENT_CHANGE_MASK_PROPS, Props: &pipewire.SPADict{NItems: 39, Items: []pipewire.SPADictItem{ @@ -120,7 +120,7 @@ func TestClientUpdateProperties(t *testing.T) { t.Parallel() encodingTestCases[pipewire.ClientUpdateProperties, *pipewire.ClientUpdateProperties]{ - {"sample", []byte(sendmsg00Message01POD), pipewire.ClientUpdateProperties{Props: &pipewire.SPADict{NItems: 0x1e, Items: []pipewire.SPADictItem{ + {"sample", []byte(c0s1pod), pipewire.ClientUpdateProperties{Props: &pipewire.SPADict{NItems: 0x1e, Items: []pipewire.SPADictItem{ {Key: "remote.intention", Value: "manager"}, {Key: "application.name", Value: "pw-container"}, {Key: "application.process.binary", Value: "pw-container"}, diff --git a/internal/pipewire/core_test.go b/internal/pipewire/core_test.go index 7d3fad3..a08d454 100644 --- a/internal/pipewire/core_test.go +++ b/internal/pipewire/core_test.go @@ -10,12 +10,12 @@ func TestFooterCoreGeneration(t *testing.T) { t.Parallel() encodingTestCases[pipewire.Footer[pipewire.FooterCoreGeneration], *pipewire.Footer[pipewire.FooterCoreGeneration]]{ - {"sample", []byte(recvmsg00Message00Footer), pipewire.Footer[pipewire.FooterCoreGeneration]{ + {"sample", []byte(c1r0footer), pipewire.Footer[pipewire.FooterCoreGeneration]{ Opcode: pipewire.FOOTER_CORE_OPCODE_GENERATION, Payload: pipewire.FooterCoreGeneration{RegistryGeneration: 0x22}, }, nil}, - {"sample*", []byte(recvmsg00Message05Footer), pipewire.Footer[pipewire.FooterCoreGeneration]{ + {"sample*", []byte(c1r5footer), pipewire.Footer[pipewire.FooterCoreGeneration]{ Opcode: pipewire.FOOTER_CORE_OPCODE_GENERATION, Payload: pipewire.FooterCoreGeneration{RegistryGeneration: 0x23}, }, nil}, @@ -26,7 +26,7 @@ func TestCoreInfo(t *testing.T) { t.Parallel() encodingTestCases[pipewire.CoreInfo, *pipewire.CoreInfo]{ - {"sample", []byte(recvmsg00Message00POD), pipewire.CoreInfo{ + {"sample", []byte(c1r0pod), pipewire.CoreInfo{ ID: 0, Cookie: -2069267610, UserName: "alice", @@ -74,7 +74,7 @@ func TestCoreDone(t *testing.T) { t.Parallel() encodingTestCases[pipewire.CoreDone, *pipewire.CoreDone]{ - {"sample", []byte(recvmsg00Message05POD), pipewire.CoreDone{ + {"sample", []byte(c1r5pod), pipewire.CoreDone{ ID: -1, Sequence: 0, }, nil}, @@ -85,7 +85,7 @@ func TestCoreBoundProps(t *testing.T) { t.Parallel() encodingTestCases[pipewire.CoreBoundProps, *pipewire.CoreBoundProps]{ - {"sample", []byte(recvmsg00Message01POD), pipewire.CoreBoundProps{ + {"sample", []byte(c1r1pod), pipewire.CoreBoundProps{ ID: pipewire.PW_ID_CLIENT, GlobalID: 34, Props: &pipewire.SPADict{NItems: 7, Items: []pipewire.SPADictItem{ @@ -104,7 +104,7 @@ func TestCoreHello(t *testing.T) { t.Parallel() encodingTestCases[pipewire.CoreHello, *pipewire.CoreHello]{ - {"sample", []byte(sendmsg00Message00POD), pipewire.CoreHello{ + {"sample", []byte(c0s0pod), pipewire.CoreHello{ Version: pipewire.PW_VERSION_CORE, }, nil}, }.run(t) @@ -114,7 +114,7 @@ func TestCoreSync(t *testing.T) { t.Parallel() encodingTestCases[pipewire.CoreSync, *pipewire.CoreSync]{ - {"sample", []byte(sendmsg00Message03POD), pipewire.CoreSync{ + {"sample", []byte(c0s3pod), pipewire.CoreSync{ ID: pipewire.PW_ID_CORE, Sequence: pipewire.CoreSyncSequenceOffset + 3, }, nil}, @@ -125,7 +125,7 @@ func TestCoreGetRegistry(t *testing.T) { t.Parallel() encodingTestCases[pipewire.CoreGetRegistry, *pipewire.CoreGetRegistry]{ - {"sample", []byte(sendmsg00Message02POD), pipewire.CoreGetRegistry{ + {"sample", []byte(c0s2pod), pipewire.CoreGetRegistry{ Version: pipewire.PW_VERSION_REGISTRY, NewID: 2, }, nil}, diff --git a/internal/pipewire/header_test.go b/internal/pipewire/header_test.go index fba5d83..a555ab2 100644 --- a/internal/pipewire/header_test.go +++ b/internal/pipewire/header_test.go @@ -11,61 +11,61 @@ func TestHeader(t *testing.T) { t.Parallel() encodingTestCases[pipewire.Header, *pipewire.Header]{ - {"PW_CORE_METHOD_HELLO", []byte(sendmsg00Message00Header), pipewire.Header{ + {"PW_CORE_METHOD_HELLO", []byte(c0s0header), pipewire.Header{ ID: pipewire.PW_ID_CORE, Opcode: pipewire.PW_CORE_METHOD_HELLO, Size: 0x18, Sequence: 0, FileCount: 0, }, nil}, - {"PW_CLIENT_METHOD_UPDATE_PROPERTIES", []byte(sendmsg00Message01Header), pipewire.Header{ + {"PW_CLIENT_METHOD_UPDATE_PROPERTIES", []byte(c0s1header), pipewire.Header{ ID: pipewire.PW_ID_CLIENT, Opcode: pipewire.PW_CLIENT_METHOD_UPDATE_PROPERTIES, Size: 0x600, Sequence: 1, FileCount: 0, }, nil}, - {"PW_CORE_METHOD_GET_REGISTRY", []byte(sendmsg00Message02Header), pipewire.Header{ + {"PW_CORE_METHOD_GET_REGISTRY", []byte(c0s2header), pipewire.Header{ ID: pipewire.PW_ID_CORE, Opcode: pipewire.PW_CORE_METHOD_GET_REGISTRY, Size: 0x28, Sequence: 2, FileCount: 0, }, nil}, - {"PW_CORE_METHOD_SYNC", []byte(sendmsg00Message03Header), pipewire.Header{ + {"PW_CORE_METHOD_SYNC", []byte(c0s3header), pipewire.Header{ ID: pipewire.PW_ID_CORE, Opcode: pipewire.PW_CORE_METHOD_SYNC, Size: 0x28, Sequence: 3, FileCount: 0, }, nil}, - {"PW_CORE_EVENT_INFO", []byte(recvmsg00Message00Header), pipewire.Header{ + {"PW_CORE_EVENT_INFO", []byte(c1r0header), pipewire.Header{ ID: pipewire.PW_ID_CORE, Opcode: pipewire.PW_CORE_EVENT_INFO, Size: 0x6b8, Sequence: 0, FileCount: 0, }, nil}, - {"PW_CORE_EVENT_BOUND_PROPS", []byte(recvmsg00Message01Header), pipewire.Header{ + {"PW_CORE_EVENT_BOUND_PROPS", []byte(c1r1header), pipewire.Header{ ID: pipewire.PW_ID_CORE, Opcode: pipewire.PW_CORE_EVENT_BOUND_PROPS, Size: 0x198, Sequence: 1, FileCount: 0, }, nil}, - {"PW_CLIENT_EVENT_INFO", []byte(recvmsg00Message02Header), pipewire.Header{ + {"PW_CLIENT_EVENT_INFO", []byte(c1r2header), pipewire.Header{ ID: pipewire.PW_ID_CLIENT, Opcode: pipewire.PW_CLIENT_EVENT_INFO, Size: 0x1f0, Sequence: 2, FileCount: 0, }, nil}, - {"PW_CLIENT_EVENT_INFO*", []byte(recvmsg00Message03Header), pipewire.Header{ + {"PW_CLIENT_EVENT_INFO*", []byte(c1r3header), pipewire.Header{ ID: pipewire.PW_ID_CLIENT, Opcode: pipewire.PW_CLIENT_EVENT_INFO, Size: 0x7a0, Sequence: 3, FileCount: 0, }, nil}, - {"PW_CLIENT_EVENT_INFO**", []byte(recvmsg00Message04Header), pipewire.Header{ + {"PW_CLIENT_EVENT_INFO**", []byte(c1r4header), pipewire.Header{ ID: pipewire.PW_ID_CLIENT, Opcode: pipewire.PW_CLIENT_EVENT_INFO, Size: 0x7d0, Sequence: 4, FileCount: 0, }, nil}, - {"PW_CORE_EVENT_DONE", []byte(recvmsg00Message05Header), pipewire.Header{ + {"PW_CORE_EVENT_DONE", []byte(c1r5header), pipewire.Header{ ID: pipewire.PW_ID_CORE, Opcode: pipewire.PW_CORE_EVENT_DONE, Size: 0x58, Sequence: 5, FileCount: 0, diff --git a/internal/pipewire/pipewire_test.go b/internal/pipewire/pipewire_test.go index 78e44f4..586e5f6 100644 --- a/internal/pipewire/pipewire_test.go +++ b/internal/pipewire/pipewire_test.go @@ -5,57 +5,57 @@ import ( ) var ( - //go:embed testdata/00-sendmsg00-message00-header - sendmsg00Message00Header string - //go:embed testdata/01-sendmsg00-message00-POD - sendmsg00Message00POD string + //go:embed testdata/c0s0p0 + c0s0header string + //go:embed testdata/c0s0p1 + c0s0pod string - //go:embed testdata/02-sendmsg00-message01-header - sendmsg00Message01Header string - //go:embed testdata/03-sendmsg00-message01-POD - sendmsg00Message01POD string + //go:embed testdata/c0s1p0 + c0s1header string + //go:embed testdata/c0s1p1 + c0s1pod string - //go:embed testdata/04-sendmsg00-message02-header - sendmsg00Message02Header string - //go:embed testdata/05-sendmsg00-message02-POD - sendmsg00Message02POD string + //go:embed testdata/c0s2p0 + c0s2header string + //go:embed testdata/c0s2p1 + c0s2pod string - //go:embed testdata/06-sendmsg00-message03-header - sendmsg00Message03Header string - //go:embed testdata/07-sendmsg00-message03-POD - sendmsg00Message03POD string + //go:embed testdata/c0s3p0 + c0s3header string + //go:embed testdata/c0s3p1 + c0s3pod string - //go:embed testdata/08-recvmsg00-message00-header - recvmsg00Message00Header string - //go:embed testdata/09-recvmsg00-message00-POD - recvmsg00Message00POD string - //go:embed testdata/10-recvmsg00-message00-footer - recvmsg00Message00Footer string + //go:embed testdata/c1r0p0 + c1r0header string + //go:embed testdata/c1r0p1 + c1r0pod string + //go:embed testdata/c1r0p2 + c1r0footer string - //go:embed testdata/11-recvmsg00-message01-header - recvmsg00Message01Header string - //go:embed testdata/12-recvmsg00-message01-POD - recvmsg00Message01POD string + //go:embed testdata/c1r1p0 + c1r1header string + //go:embed testdata/c1r1p1 + c1r1pod string - //go:embed testdata/13-recvmsg00-message02-header - recvmsg00Message02Header string - //go:embed testdata/14-recvmsg00-message02-POD - recvmsg00Message02POD string + //go:embed testdata/c1r2p0 + c1r2header string + //go:embed testdata/c1r2p1 + c1r2pod string - //go:embed testdata/15-recvmsg00-message03-header - recvmsg00Message03Header string - //go:embed testdata/16-recvmsg00-message03-POD - recvmsg00Message03POD string + //go:embed testdata/c1r3p0 + c1r3header string + //go:embed testdata/c1r3p1 + c1r3pod string - //go:embed testdata/17-recvmsg00-message04-header - recvmsg00Message04Header string - //go:embed testdata/18-recvmsg00-message04-POD - recvmsg00Message04POD string + //go:embed testdata/c1r4p0 + c1r4header string + //go:embed testdata/c1r4p1 + c1r4pod string - //go:embed testdata/19-recvmsg00-message05-header - recvmsg00Message05Header string - //go:embed testdata/20-recvmsg00-message05-POD - recvmsg00Message05POD string - //go:embed testdata/21-recvmsg00-message05-footer - recvmsg00Message05Footer string + //go:embed testdata/c1r5p0 + c1r5header string + //go:embed testdata/c1r5p1 + c1r5pod string + //go:embed testdata/c1r5p2 + c1r5footer string ) diff --git a/internal/pipewire/testdata/00-sendmsg00-message00-header b/internal/pipewire/testdata/c0s0p0 similarity index 100% rename from internal/pipewire/testdata/00-sendmsg00-message00-header rename to internal/pipewire/testdata/c0s0p0 diff --git a/internal/pipewire/testdata/01-sendmsg00-message00-POD b/internal/pipewire/testdata/c0s0p1 similarity index 100% rename from internal/pipewire/testdata/01-sendmsg00-message00-POD rename to internal/pipewire/testdata/c0s0p1 diff --git a/internal/pipewire/testdata/02-sendmsg00-message01-header b/internal/pipewire/testdata/c0s1p0 similarity index 100% rename from internal/pipewire/testdata/02-sendmsg00-message01-header rename to internal/pipewire/testdata/c0s1p0 diff --git a/internal/pipewire/testdata/03-sendmsg00-message01-POD b/internal/pipewire/testdata/c0s1p1 similarity index 100% rename from internal/pipewire/testdata/03-sendmsg00-message01-POD rename to internal/pipewire/testdata/c0s1p1 diff --git a/internal/pipewire/testdata/04-sendmsg00-message02-header b/internal/pipewire/testdata/c0s2p0 similarity index 100% rename from internal/pipewire/testdata/04-sendmsg00-message02-header rename to internal/pipewire/testdata/c0s2p0 diff --git a/internal/pipewire/testdata/05-sendmsg00-message02-POD b/internal/pipewire/testdata/c0s2p1 similarity index 100% rename from internal/pipewire/testdata/05-sendmsg00-message02-POD rename to internal/pipewire/testdata/c0s2p1 diff --git a/internal/pipewire/testdata/06-sendmsg00-message03-header b/internal/pipewire/testdata/c0s3p0 similarity index 100% rename from internal/pipewire/testdata/06-sendmsg00-message03-header rename to internal/pipewire/testdata/c0s3p0 diff --git a/internal/pipewire/testdata/07-sendmsg00-message03-POD b/internal/pipewire/testdata/c0s3p1 similarity index 100% rename from internal/pipewire/testdata/07-sendmsg00-message03-POD rename to internal/pipewire/testdata/c0s3p1 diff --git a/internal/pipewire/testdata/08-recvmsg00-message00-header b/internal/pipewire/testdata/c1r0p0 similarity index 100% rename from internal/pipewire/testdata/08-recvmsg00-message00-header rename to internal/pipewire/testdata/c1r0p0 diff --git a/internal/pipewire/testdata/09-recvmsg00-message00-POD b/internal/pipewire/testdata/c1r0p1 similarity index 100% rename from internal/pipewire/testdata/09-recvmsg00-message00-POD rename to internal/pipewire/testdata/c1r0p1 diff --git a/internal/pipewire/testdata/10-recvmsg00-message00-footer b/internal/pipewire/testdata/c1r0p2 similarity index 100% rename from internal/pipewire/testdata/10-recvmsg00-message00-footer rename to internal/pipewire/testdata/c1r0p2 diff --git a/internal/pipewire/testdata/11-recvmsg00-message01-header b/internal/pipewire/testdata/c1r1p0 similarity index 100% rename from internal/pipewire/testdata/11-recvmsg00-message01-header rename to internal/pipewire/testdata/c1r1p0 diff --git a/internal/pipewire/testdata/12-recvmsg00-message01-POD b/internal/pipewire/testdata/c1r1p1 similarity index 100% rename from internal/pipewire/testdata/12-recvmsg00-message01-POD rename to internal/pipewire/testdata/c1r1p1 diff --git a/internal/pipewire/testdata/13-recvmsg00-message02-header b/internal/pipewire/testdata/c1r2p0 similarity index 100% rename from internal/pipewire/testdata/13-recvmsg00-message02-header rename to internal/pipewire/testdata/c1r2p0 diff --git a/internal/pipewire/testdata/14-recvmsg00-message02-POD b/internal/pipewire/testdata/c1r2p1 similarity index 100% rename from internal/pipewire/testdata/14-recvmsg00-message02-POD rename to internal/pipewire/testdata/c1r2p1 diff --git a/internal/pipewire/testdata/15-recvmsg00-message03-header b/internal/pipewire/testdata/c1r3p0 similarity index 100% rename from internal/pipewire/testdata/15-recvmsg00-message03-header rename to internal/pipewire/testdata/c1r3p0 diff --git a/internal/pipewire/testdata/16-recvmsg00-message03-POD b/internal/pipewire/testdata/c1r3p1 similarity index 100% rename from internal/pipewire/testdata/16-recvmsg00-message03-POD rename to internal/pipewire/testdata/c1r3p1 diff --git a/internal/pipewire/testdata/17-recvmsg00-message04-header b/internal/pipewire/testdata/c1r4p0 similarity index 100% rename from internal/pipewire/testdata/17-recvmsg00-message04-header rename to internal/pipewire/testdata/c1r4p0 diff --git a/internal/pipewire/testdata/18-recvmsg00-message04-POD b/internal/pipewire/testdata/c1r4p1 similarity index 100% rename from internal/pipewire/testdata/18-recvmsg00-message04-POD rename to internal/pipewire/testdata/c1r4p1 diff --git a/internal/pipewire/testdata/19-recvmsg00-message05-header b/internal/pipewire/testdata/c1r5p0 similarity index 100% rename from internal/pipewire/testdata/19-recvmsg00-message05-header rename to internal/pipewire/testdata/c1r5p0 diff --git a/internal/pipewire/testdata/20-recvmsg00-message05-POD b/internal/pipewire/testdata/c1r5p1 similarity index 100% rename from internal/pipewire/testdata/20-recvmsg00-message05-POD rename to internal/pipewire/testdata/c1r5p1 diff --git a/internal/pipewire/testdata/21-recvmsg00-message05-footer b/internal/pipewire/testdata/c1r5p2 similarity index 100% rename from internal/pipewire/testdata/21-recvmsg00-message05-footer rename to internal/pipewire/testdata/c1r5p2