From 33f1ee033cb508cf73cf0bd44279c74619f850d8 Mon Sep 17 00:00:00 2001
From: Mark Puha
Date: Fri, 13 Jun 2025 23:03:28 +0200
Subject: [PATCH] fix: tests
---
device/awg/junk_creator_test.go | 2 +-
device/awg/tag_junk_packet_generator_test.go | 12 ++++-----
device/awg/tag_junk_packet_generators_test.go | 26 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/device/awg/junk_creator_test.go b/device/awg/junk_creator_test.go
index ce1aa65..9f80d83 100644
--- a/device/awg/junk_creator_test.go
+++ b/device/awg/junk_creator_test.go
@@ -34,7 +34,7 @@ func Test_junkCreator_createJunkPackets(t *testing.T) {
return
}
t.Run("valid", func(t *testing.T) {
- got := make([][]byte, jc.aSecCfg.JunkPacketCount)
+ got := make([][]byte, 0, jc.aSecCfg.JunkPacketCount)
err := jc.CreateJunkPackets(&got)
if err != nil {
t.Errorf(
diff --git a/device/awg/tag_junk_packet_generator_test.go b/device/awg/tag_junk_packet_generator_test.go
index d4a724f..309d425 100644
--- a/device/awg/tag_junk_packet_generator_test.go
+++ b/device/awg/tag_junk_packet_generator_test.go
@@ -52,10 +52,10 @@ func TestNewTagJunkGenerator(t *testing.T) {
tc := tc // capture range variable
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
- result := newTagJunkPacketGenerator(tc.genName, tc.size)
+ result := newTagJunkPacketGenerator(tc.genName, "", tc.size)
require.Equal(t, tc.expected.name, result.name)
require.Equal(t, tc.expected.packetSize, result.packetSize)
- require.Len(t, result.generators, len(tc.expected.generators))
+ require.Equal(t, cap(result.generators), len(tc.expected.generators))
})
}
}
@@ -72,7 +72,7 @@ func TestTagJunkGeneratorAppend(t *testing.T) {
}{
{
name: "Append to empty generator",
- initialState: newTagJunkPacketGenerator("T1", 0),
+ initialState: newTagJunkPacketGenerator("T1", "", 0),
mockSize: 5,
expectedLength: 1,
expectedSize: 5,
@@ -121,14 +121,14 @@ func TestTagJunkGeneratorGenerate(t *testing.T) {
{
name: "Generate with empty generators",
setupGenerator: func() TagJunkPacketGenerator {
- return newTagJunkPacketGenerator("T1", 0)
+ return newTagJunkPacketGenerator("T1", "", 0)
},
expected: []byte{},
},
{
name: "Generate with single generator",
setupGenerator: func() TagJunkPacketGenerator {
- tg := newTagJunkPacketGenerator("T2", 0)
+ tg := newTagJunkPacketGenerator("T2", "", 0)
tg.append(mockGen1)
return tg
},
@@ -137,7 +137,7 @@ func TestTagJunkGeneratorGenerate(t *testing.T) {
{
name: "Generate with multiple generators",
setupGenerator: func() TagJunkPacketGenerator {
- tg := newTagJunkPacketGenerator("T3", 0)
+ tg := newTagJunkPacketGenerator("T3", "", 0)
tg.append(mockGen1)
tg.append(mockGen2)
return tg
diff --git a/device/awg/tag_junk_packet_generators_test.go b/device/awg/tag_junk_packet_generators_test.go
index e006426..6b1fd47 100644
--- a/device/awg/tag_junk_packet_generators_test.go
+++ b/device/awg/tag_junk_packet_generators_test.go
@@ -14,7 +14,7 @@ func TestTagJunkGeneratorHandlerAppendGenerator(t *testing.T) {
}{
{
name: "append single generator",
- generator: newTagJunkPacketGenerator("t1", 10),
+ generator: newTagJunkPacketGenerator("t1", "", 10),
},
}
@@ -47,8 +47,8 @@ func TestTagJunkGeneratorHandlerValidate(t *testing.T) {
{
name: "bad start",
generators: []TagJunkPacketGenerator{
- newTagJunkPacketGenerator("t3", 10),
- newTagJunkPacketGenerator("t4", 10),
+ newTagJunkPacketGenerator("t3", "", 10),
+ newTagJunkPacketGenerator("t4", "", 10),
},
wantErr: true,
errMsg: "junk packet index should be consecutive",
@@ -56,8 +56,8 @@ func TestTagJunkGeneratorHandlerValidate(t *testing.T) {
{
name: "non-consecutive indices",
generators: []TagJunkPacketGenerator{
- newTagJunkPacketGenerator("t1", 10),
- newTagJunkPacketGenerator("t3", 10), // Missing t2
+ newTagJunkPacketGenerator("t1", "", 10),
+ newTagJunkPacketGenerator("t3", "", 10), // Missing t2
},
wantErr: true,
errMsg: "junk packet index should be consecutive",
@@ -65,17 +65,17 @@ func TestTagJunkGeneratorHandlerValidate(t *testing.T) {
{
name: "consecutive indices",
generators: []TagJunkPacketGenerator{
- newTagJunkPacketGenerator("t1", 10),
- newTagJunkPacketGenerator("t2", 10),
- newTagJunkPacketGenerator("t3", 10),
- newTagJunkPacketGenerator("t4", 10),
- newTagJunkPacketGenerator("t5", 10),
+ newTagJunkPacketGenerator("t1", "", 10),
+ newTagJunkPacketGenerator("t2", "", 10),
+ newTagJunkPacketGenerator("t3", "", 10),
+ newTagJunkPacketGenerator("t4", "", 10),
+ newTagJunkPacketGenerator("t5", "", 10),
},
},
{
name: "nameIndex error",
generators: []TagJunkPacketGenerator{
- newTagJunkPacketGenerator("error", 10),
+ newTagJunkPacketGenerator("error", "", 10),
},
wantErr: true,
errMsg: "name must be 2 character long",
@@ -116,10 +116,10 @@ func TestTagJunkGeneratorHandlerGenerate(t *testing.T) {
{
name: "generate with no default junk",
setupGenerator: func() []TagJunkPacketGenerator {
- tg1 := newTagJunkPacketGenerator("t1", 0)
+ tg1 := newTagJunkPacketGenerator("t1", "", 0)
tg1.append(mockGen1)
tg1.append(mockGen2)
- tg2 := newTagJunkPacketGenerator("t2", 0)
+ tg2 := newTagJunkPacketGenerator("t2", "", 0)
tg2.append(mockGen2)
tg2.append(mockGen1)