Skip to content

Commit

Permalink
Fix linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
lassilaiho committed Oct 31, 2023
1 parent b090a1b commit 69417c1
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion pkg/gogen/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"testing"

"github.com/bradleyjkemp/cupaloy/v2"
. "github.com/smartystreets/goconvey/convey"
. "github.com/smartystreets/goconvey/convey" //nolint:revive
)

var nilAry []string
Expand Down
8 changes: 4 additions & 4 deletions pkg/rclgo/action.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ func NewDefaultStatusQosProfile() QosProfile {
type goalIDMessage interface {
types.Message
GetGoalID() *types.GoalID
SetGoalID(*types.GoalID)
SetGoalID(id *types.GoalID)
}

type goalRequestMessage interface {
goalIDMessage
GetGoalDescription() types.Message
SetGoalDescription(types.Message)
SetGoalDescription(goal types.Message)
}

type goalResponseMessage interface {
GetGoalAccepted() bool
}

type forEach interface {
CallForEach(func(interface{}))
CallForEach(f func(interface{}))
}

type GoalStatus int8
Expand Down Expand Up @@ -245,7 +245,7 @@ type Action interface {
//
// ExecuteGoal may be called multiple times in parallel by the ActionServer.
// Each call will receive a different GoalHandle.
ExecuteGoal(context.Context, *GoalHandle) (types.Message, error)
ExecuteGoal(ctx context.Context, goal *GoalHandle) (types.Message, error)

// TypeSupport returns the type support for the action. The same value
// must be returned on every invocation.
Expand Down
2 changes: 1 addition & 1 deletion pkg/rclgo/action_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/bradleyjkemp/cupaloy/v2"
. "github.com/smartystreets/goconvey/convey"
. "github.com/smartystreets/goconvey/convey" //nolint:revive
action_msgs_msg "github.com/tiiuae/rclgo/internal/msgs/action_msgs/msg"
action_msgs_srv "github.com/tiiuae/rclgo/internal/msgs/action_msgs/srv"
test_msgs_action "github.com/tiiuae/rclgo/internal/msgs/test_msgs/action"
Expand Down
2 changes: 1 addition & 1 deletion pkg/rclgo/context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"errors"
"testing"

. "github.com/smartystreets/goconvey/convey"
. "github.com/smartystreets/goconvey/convey" //nolint:revive
example_interfaces_action "github.com/tiiuae/rclgo/internal/msgs/example_interfaces/action"
std_msgs "github.com/tiiuae/rclgo/internal/msgs/std_msgs/msg"
std_srvs_srv "github.com/tiiuae/rclgo/internal/msgs/std_srvs/srv"
Expand Down
2 changes: 1 addition & 1 deletion pkg/rclgo/logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package rclgo
import (
"testing"

. "github.com/smartystreets/goconvey/convey"
. "github.com/smartystreets/goconvey/convey" //nolint:revive
)

func TestInitLogging(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/rclgo/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package rclgo_test
import (
"testing"

. "github.com/smartystreets/goconvey/convey"
. "github.com/smartystreets/goconvey/convey" //nolint:revive
std_msgs_msg "github.com/tiiuae/rclgo/internal/msgs/std_msgs/msg"
"github.com/tiiuae/rclgo/pkg/rclgo"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/rclgo/pubsub_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"testing"
"time"

. "github.com/smartystreets/goconvey/convey"
. "github.com/smartystreets/goconvey/convey" //nolint:revive
std_msgs "github.com/tiiuae/rclgo/internal/msgs/std_msgs/msg"
test_msgs "github.com/tiiuae/rclgo/internal/msgs/test_msgs/msg"
"github.com/tiiuae/rclgo/pkg/rclgo"
Expand Down
2 changes: 1 addition & 1 deletion pkg/rclgo/rcl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func getUnusedDomainID() int {
}

func setNewDomainID() {
os.Setenv("ROS_DOMAIN_ID", fmt.Sprint(getUnusedDomainID()))
os.Setenv("ROS_DOMAIN_ID", strconv.Itoa(getUnusedDomainID()))
}

func TestMain(m *testing.M) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/rclgo/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

. "github.com/smartystreets/goconvey/convey"
. "github.com/smartystreets/goconvey/convey" //nolint:revive
example_interfaces_srv "github.com/tiiuae/rclgo/internal/msgs/example_interfaces/srv"
"github.com/tiiuae/rclgo/pkg/rclgo"
"github.com/tiiuae/rclgo/pkg/rclgo/types"
Expand Down
6 changes: 3 additions & 3 deletions pkg/rclgo/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ type Message interface {
type MessageTypeSupport interface {
New() Message
PrepareMemory() unsafe.Pointer
ReleaseMemory(unsafe.Pointer)
AsCStruct(unsafe.Pointer, Message)
AsGoStruct(Message, unsafe.Pointer)
ReleaseMemory(p unsafe.Pointer)
AsCStruct(dst unsafe.Pointer, src Message)
AsGoStruct(dst Message, src unsafe.Pointer)
TypeSupport() unsafe.Pointer // *C.rosidl_message_type_support_t
}

Expand Down
2 changes: 1 addition & 1 deletion test/gogen/serdes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"unsafe"

. "github.com/smartystreets/goconvey/convey"
. "github.com/smartystreets/goconvey/convey" //nolint:revive

sensor_msgs "github.com/tiiuae/rclgo/internal/msgs/sensor_msgs/msg"
std_msgs "github.com/tiiuae/rclgo/internal/msgs/std_msgs/msg"
Expand Down
2 changes: 1 addition & 1 deletion test/typemap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package test
import (
"testing"

. "github.com/smartystreets/goconvey/convey"
. "github.com/smartystreets/goconvey/convey" //nolint:revive
std_srvs_srv "github.com/tiiuae/rclgo/internal/msgs/std_srvs/srv"
"github.com/tiiuae/rclgo/pkg/rclgo/typemap"
)
Expand Down

0 comments on commit 69417c1

Please sign in to comment.