Skip to content

Commit debacf3

Browse files
aler9aler9
authored
use black-box testing where possible (#276)
1 parent 553459d commit debacf3

293 files changed

Lines changed: 1693 additions & 1394 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/dialects-gen/main.go‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ const (
2020
var tplTest = template.Must(template.New("").Parse(
2121
`//autogenerated:yes
2222
//nolint:revive
23-
package dialects
23+
package dialects_test
2424
2525
import (
26-
"testing"
2726
"encoding"
2827
"reflect"
28+
"testing"
2929
3030
"github.com/stretchr/testify/require"
3131
@@ -74,18 +74,19 @@ func TestEnumMarshalText(t *testing.T) {
7474
var tplDialectTest = template.Must(template.New("").Parse(
7575
`//autogenerated:yes
7676
//nolint:revive
77-
package {{ .PkgName }}
77+
package {{ .PkgName }}_test
7878
7979
import (
8080
"testing"
8181
8282
"github.com/stretchr/testify/require"
8383
8484
"github.com/bluenviron/gomavlib/v4/pkg/dialect"
85+
dialectpkg "github.com/bluenviron/gomavlib/v4/pkg/dialects/{{ .PkgName }}"
8586
)
8687
8788
func TestDialect(t *testing.T) {
88-
d := &dialect.ReadWriter{Dialect: Dialect}
89+
d := &dialect.ReadWriter{Dialect: dialectpkg.Dialect}
8990
err := d.Initialize()
9091
require.NoError(t, err)
9192
}
@@ -94,30 +95,32 @@ func TestDialect(t *testing.T) {
9495
var tplEnumTest = template.Must(template.New("").Parse(
9596
`//autogenerated:yes
9697
//nolint:revive,govet,errcheck
97-
package {{ .PkgName }}
98+
package {{ .PkgName }}_test
9899
99100
import (
100101
"testing"
102+
101103
"github.com/stretchr/testify/require"
104+
dialectpkg "github.com/bluenviron/gomavlib/v4/pkg/dialects/{{ .PkgName }}"
102105
)
103106
104107
func TestEnum_{{ .Name }}(t *testing.T) {
105108
t.Run("zero", func(t *testing.T) {
106-
var e {{ .Name }}
109+
var e dialectpkg.{{ .Name }}
107110
e.UnmarshalText([]byte{})
108111
e.MarshalText()
109112
e.String()
110113
})
111114
112115
t.Run("first entry", func(t *testing.T) {
113-
enc, err := {{ .FirstEntry }}.MarshalText()
116+
enc, err := dialectpkg.{{ .FirstEntry }}.MarshalText()
114117
require.NoError(t, err)
115118
116-
var dec {{ .Name }}
119+
var dec dialectpkg.{{ .Name }}
117120
err = dec.UnmarshalText(enc)
118121
require.NoError(t, err)
119122
120-
require.Equal(t, {{ .FirstEntry }}, dec)
123+
require.Equal(t, dialectpkg.{{ .FirstEntry }}, dec)
121124
})
122125
}
123126
`))

‎pkg/conversion/conversion_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package conversion
1+
package conversion_test
22

33
import (
44
"os"
55
"testing"
66

77
"github.com/stretchr/testify/require"
8+
9+
"github.com/bluenviron/gomavlib/v4/pkg/conversion"
810
)
911

1012
const testDialect = `<?xml version="1.0"?>
@@ -174,7 +176,7 @@ func TestConversion(t *testing.T) {
174176
err = os.WriteFile("testdialect.xml", []byte(testDialect), 0o644)
175177
require.NoError(t, err)
176178

177-
err = Convert("testdialect.xml", true)
179+
err = conversion.Convert("testdialect.xml", true)
178180
require.NoError(t, err)
179181

180182
buf, err := os.ReadFile("testdialect/message_a_message.go")

‎pkg/dialect/readwriter_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package dialect
1+
package dialect_test
22

33
import (
44
"testing"
55

66
"github.com/stretchr/testify/require"
77

8+
"github.com/bluenviron/gomavlib/v4/pkg/dialect"
89
"github.com/bluenviron/gomavlib/v4/pkg/message"
910
)
1011

@@ -35,8 +36,8 @@ func (*Invalid) GetID() uint32 {
3536
}
3637

3738
func TestReadWriter(t *testing.T) {
38-
rw := &ReadWriter{
39-
Dialect: &Dialect{3, []message.Message{&MessageHeartbeat{}}},
39+
rw := &dialect.ReadWriter{
40+
Dialect: &dialect.Dialect{3, []message.Message{&MessageHeartbeat{}}},
4041
}
4142
err := rw.Initialize()
4243
require.NoError(t, err)
@@ -51,27 +52,27 @@ func TestReadWriter(t *testing.T) {
5152
func TestReadWriterErrors(t *testing.T) {
5253
for _, ca := range []struct {
5354
name string
54-
dialect *Dialect
55+
dialect *dialect.Dialect
5556
err string
5657
}{
5758
{
5859
"duplicate message",
59-
&Dialect{3, []message.Message{
60+
&dialect.Dialect{3, []message.Message{
6061
&MessageHeartbeat{},
6162
&MessageHeartbeat{},
6263
}},
6364
"duplicate message with id 0",
6465
},
6566
{
6667
"invalid message",
67-
&Dialect{3, []message.Message{
68+
&dialect.Dialect{3, []message.Message{
6869
&Invalid{},
6970
}},
70-
"message *dialect.Invalid: struct name must begin with 'Message'",
71+
"message *dialect_test.Invalid: struct name must begin with 'Message'",
7172
},
7273
} {
7374
t.Run(ca.name, func(t *testing.T) {
74-
rw := &ReadWriter{
75+
rw := &dialect.ReadWriter{
7576
Dialect: ca.dialect,
7677
}
7778
err := rw.Initialize()

‎pkg/dialects/all/dialect_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
//autogenerated:yes
22
//nolint:revive
3-
package all
3+
package all_test
44

55
import (
66
"testing"
77

88
"github.com/stretchr/testify/require"
99

1010
"github.com/bluenviron/gomavlib/v4/pkg/dialect"
11+
dialectpkg "github.com/bluenviron/gomavlib/v4/pkg/dialects/all"
1112
)
1213

1314
func TestDialect(t *testing.T) {
14-
d := &dialect.ReadWriter{Dialect: Dialect}
15+
d := &dialect.ReadWriter{Dialect: dialectpkg.Dialect}
1516
err := d.Initialize()
1617
require.NoError(t, err)
1718
}

‎pkg/dialects/all/enum_mav_cmd_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
//autogenerated:yes
22
//nolint:revive,govet,errcheck
3-
package all
3+
package all_test
44

55
import (
66
"testing"
77

8+
dialectpkg "github.com/bluenviron/gomavlib/v4/pkg/dialects/all"
89
"github.com/stretchr/testify/require"
910
)
1011

1112
func TestEnum_MAV_CMD(t *testing.T) {
1213
t.Run("zero", func(t *testing.T) {
13-
var e MAV_CMD
14+
var e dialectpkg.MAV_CMD
1415
e.UnmarshalText([]byte{})
1516
e.MarshalText()
1617
e.String()
1718
})
1819

1920
t.Run("first entry", func(t *testing.T) {
20-
enc, err := MAV_CMD_NAV_WAYPOINT.MarshalText()
21+
enc, err := dialectpkg.MAV_CMD_NAV_WAYPOINT.MarshalText()
2122
require.NoError(t, err)
2223

23-
var dec MAV_CMD
24+
var dec dialectpkg.MAV_CMD
2425
err = dec.UnmarshalText(enc)
2526
require.NoError(t, err)
2627

27-
require.Equal(t, MAV_CMD_NAV_WAYPOINT, dec)
28+
require.Equal(t, dialectpkg.MAV_CMD_NAV_WAYPOINT, dec)
2829
})
2930
}

‎pkg/dialects/ardupilotmega/dialect_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
//autogenerated:yes
22
//nolint:revive
3-
package ardupilotmega
3+
package ardupilotmega_test
44

55
import (
66
"testing"
77

88
"github.com/stretchr/testify/require"
99

1010
"github.com/bluenviron/gomavlib/v4/pkg/dialect"
11+
dialectpkg "github.com/bluenviron/gomavlib/v4/pkg/dialects/ardupilotmega"
1112
)
1213

1314
func TestDialect(t *testing.T) {
14-
d := &dialect.ReadWriter{Dialect: Dialect}
15+
d := &dialect.ReadWriter{Dialect: dialectpkg.Dialect}
1516
err := d.Initialize()
1617
require.NoError(t, err)
1718
}

‎pkg/dialects/ardupilotmega/enum_accelcal_vehicle_pos_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
//autogenerated:yes
22
//nolint:revive,govet,errcheck
3-
package ardupilotmega
3+
package ardupilotmega_test
44

55
import (
66
"testing"
77

8+
dialectpkg "github.com/bluenviron/gomavlib/v4/pkg/dialects/ardupilotmega"
89
"github.com/stretchr/testify/require"
910
)
1011

1112
func TestEnum_ACCELCAL_VEHICLE_POS(t *testing.T) {
1213
t.Run("zero", func(t *testing.T) {
13-
var e ACCELCAL_VEHICLE_POS
14+
var e dialectpkg.ACCELCAL_VEHICLE_POS
1415
e.UnmarshalText([]byte{})
1516
e.MarshalText()
1617
e.String()
1718
})
1819

1920
t.Run("first entry", func(t *testing.T) {
20-
enc, err := ACCELCAL_VEHICLE_POS_LEVEL.MarshalText()
21+
enc, err := dialectpkg.ACCELCAL_VEHICLE_POS_LEVEL.MarshalText()
2122
require.NoError(t, err)
2223

23-
var dec ACCELCAL_VEHICLE_POS
24+
var dec dialectpkg.ACCELCAL_VEHICLE_POS
2425
err = dec.UnmarshalText(enc)
2526
require.NoError(t, err)
2627

27-
require.Equal(t, ACCELCAL_VEHICLE_POS_LEVEL, dec)
28+
require.Equal(t, dialectpkg.ACCELCAL_VEHICLE_POS_LEVEL, dec)
2829
})
2930
}

‎pkg/dialects/ardupilotmega/enum_camera_feedback_flags_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
//autogenerated:yes
22
//nolint:revive,govet,errcheck
3-
package ardupilotmega
3+
package ardupilotmega_test
44

55
import (
66
"testing"
77

8+
dialectpkg "github.com/bluenviron/gomavlib/v4/pkg/dialects/ardupilotmega"
89
"github.com/stretchr/testify/require"
910
)
1011

1112
func TestEnum_CAMERA_FEEDBACK_FLAGS(t *testing.T) {
1213
t.Run("zero", func(t *testing.T) {
13-
var e CAMERA_FEEDBACK_FLAGS
14+
var e dialectpkg.CAMERA_FEEDBACK_FLAGS
1415
e.UnmarshalText([]byte{})
1516
e.MarshalText()
1617
e.String()
1718
})
1819

1920
t.Run("first entry", func(t *testing.T) {
20-
enc, err := CAMERA_FEEDBACK_PHOTO.MarshalText()
21+
enc, err := dialectpkg.CAMERA_FEEDBACK_PHOTO.MarshalText()
2122
require.NoError(t, err)
2223

23-
var dec CAMERA_FEEDBACK_FLAGS
24+
var dec dialectpkg.CAMERA_FEEDBACK_FLAGS
2425
err = dec.UnmarshalText(enc)
2526
require.NoError(t, err)
2627

27-
require.Equal(t, CAMERA_FEEDBACK_PHOTO, dec)
28+
require.Equal(t, dialectpkg.CAMERA_FEEDBACK_PHOTO, dec)
2829
})
2930
}

‎pkg/dialects/ardupilotmega/enum_camera_status_types_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
//autogenerated:yes
22
//nolint:revive,govet,errcheck
3-
package ardupilotmega
3+
package ardupilotmega_test
44

55
import (
66
"testing"
77

8+
dialectpkg "github.com/bluenviron/gomavlib/v4/pkg/dialects/ardupilotmega"
89
"github.com/stretchr/testify/require"
910
)
1011

1112
func TestEnum_CAMERA_STATUS_TYPES(t *testing.T) {
1213
t.Run("zero", func(t *testing.T) {
13-
var e CAMERA_STATUS_TYPES
14+
var e dialectpkg.CAMERA_STATUS_TYPES
1415
e.UnmarshalText([]byte{})
1516
e.MarshalText()
1617
e.String()
1718
})
1819

1920
t.Run("first entry", func(t *testing.T) {
20-
enc, err := CAMERA_STATUS_TYPE_HEARTBEAT.MarshalText()
21+
enc, err := dialectpkg.CAMERA_STATUS_TYPE_HEARTBEAT.MarshalText()
2122
require.NoError(t, err)
2223

23-
var dec CAMERA_STATUS_TYPES
24+
var dec dialectpkg.CAMERA_STATUS_TYPES
2425
err = dec.UnmarshalText(enc)
2526
require.NoError(t, err)
2627

27-
require.Equal(t, CAMERA_STATUS_TYPE_HEARTBEAT, dec)
28+
require.Equal(t, dialectpkg.CAMERA_STATUS_TYPE_HEARTBEAT, dec)
2829
})
2930
}

‎pkg/dialects/ardupilotmega/enum_copter_mode_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
//autogenerated:yes
22
//nolint:revive,govet,errcheck
3-
package ardupilotmega
3+
package ardupilotmega_test
44

55
import (
66
"testing"
77

8+
dialectpkg "github.com/bluenviron/gomavlib/v4/pkg/dialects/ardupilotmega"
89
"github.com/stretchr/testify/require"
910
)
1011

1112
func TestEnum_COPTER_MODE(t *testing.T) {
1213
t.Run("zero", func(t *testing.T) {
13-
var e COPTER_MODE
14+
var e dialectpkg.COPTER_MODE
1415
e.UnmarshalText([]byte{})
1516
e.MarshalText()
1617
e.String()
1718
})
1819

1920
t.Run("first entry", func(t *testing.T) {
20-
enc, err := COPTER_MODE_STABILIZE.MarshalText()
21+
enc, err := dialectpkg.COPTER_MODE_STABILIZE.MarshalText()
2122
require.NoError(t, err)
2223

23-
var dec COPTER_MODE
24+
var dec dialectpkg.COPTER_MODE
2425
err = dec.UnmarshalText(enc)
2526
require.NoError(t, err)
2627

27-
require.Equal(t, COPTER_MODE_STABILIZE, dec)
28+
require.Equal(t, dialectpkg.COPTER_MODE_STABILIZE, dec)
2829
})
2930
}

0 commit comments

Comments
 (0)