Make integration test suites reusable by apps

x/auth/client/testutil/cli_test.go

@@ -0,0 +1,17 @@
+// +build norace
+
+package testutil
+
+import (
+	"testing"
+
+	"github.com/cosmos/cosmos-sdk/testutil/network"
+
+	"github.com/stretchr/testify/suite"
+)
+
+func TestIntegrationTestSuite(t *testing.T) {
+	cfg := network.DefaultConfig()
+	cfg.NumValidators = 2
+	suite.Run(t, NewIntegrationTestSuite(cfg))
+}

x/auth/vesting/client/testutil/cli_test.go

@@ -0,0 +1,17 @@
+// +build norace
+
+package testutil
+
+import (
+	"testing"
+
+	"github.com/cosmos/cosmos-sdk/testutil/network"
+
+	"github.com/stretchr/testify/suite"
+)
+
+func TestIntegrationTestSuite(t *testing.T) {
+	cfg := network.DefaultConfig()
+	cfg.NumValidators = 1
+	suite.Run(t, NewIntegrationTestSuite(cfg))
+}

x/auth/vesting/client/cli/cli_test.go → x/auth/vesting/client/testutil/suite.go

@@ -1,10 +1,7 @@
-// +build norace
-
-package cli_test
+package testutil
 
 import (
 	"fmt"
-	"testing"
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/suite"
@@ -23,14 +20,14 @@ type IntegrationTestSuite struct {
 	network *network.Network
 }
 
+func NewIntegrationTestSuite(cfg network.Config) *IntegrationTestSuite {
+	return &IntegrationTestSuite{cfg: cfg}
+}
+
 func (s *IntegrationTestSuite) SetupSuite() {
 	s.T().Log("setting up integration test suite")
 
-	cfg := network.DefaultConfig()
-	cfg.NumValidators = 1
-
-	s.cfg = cfg
-	s.network = network.New(s.T(), cfg)
+	s.network = network.New(s.T(), s.cfg)
 
 	_, err := s.network.WaitForHeight(1)
 	s.Require().NoError(err)
@@ -47,8 +44,8 @@ func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() {
 	testCases := map[string]struct {
 		args         []string
 		expectErr    bool
-		respType     proto.Message
 		expectedCode uint32
+		respType     proto.Message
 	}{
 		"create a continuous vesting account": {
 			args: []string{
@@ -61,8 +58,8 @@ func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() {
 				fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
 			},
 			expectErr:    false,
-			respType:     &sdk.TxResponse{},
 			expectedCode: 0,
+			respType:     &sdk.TxResponse{},
 		},
 		"create a delayed vesting account": {
 			args: []string{
@@ -76,8 +73,8 @@ func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() {
 				fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
 			},
 			expectErr:    false,
-			respType:     &sdk.TxResponse{},
 			expectedCode: 0,
+			respType:     &sdk.TxResponse{},
 		},
 		"invalid address": {
 			args: []string{
@@ -87,8 +84,8 @@ func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() {
 				fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address),
 			},
 			expectErr:    true,
-			respType:     &sdk.TxResponse{},
 			expectedCode: 0,
+			respType:     &sdk.TxResponse{},
 		},
 		"invalid coins": {
 			args: []string{
@@ -98,8 +95,8 @@ func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() {
 				fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address),
 			},
 			expectErr:    true,
-			respType:     &sdk.TxResponse{},
 			expectedCode: 0,
+			respType:     &sdk.TxResponse{},
 		},
 		"invalid end time": {
 			args: []string{
@@ -109,8 +106,8 @@ func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() {
 				fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address),
 			},
 			expectErr:    true,
-			respType:     &sdk.TxResponse{},
 			expectedCode: 0,
+			respType:     &sdk.TxResponse{},
 		},
 	}
 
@@ -133,7 +130,3 @@ func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() {
 		})
 	}
 }
-
-func TestIntegrationTestSuite(t *testing.T) {
-	suite.Run(t, new(IntegrationTestSuite))
-}

x/authz/client/testutil/cli_test.go

@@ -0,0 +1,17 @@
+// +build norace
+
+package testutil
+
+import (
+	"testing"
+
+	"github.com/cosmos/cosmos-sdk/testutil/network"
+
+	"github.com/stretchr/testify/suite"
+)
+
+func TestIntegrationTestSuite(t *testing.T) {
+	cfg := network.DefaultConfig()
+	cfg.NumValidators = 1
+	suite.Run(t, NewIntegrationTestSuite(cfg))
+}

x/authz/client/cli/query_test.go → x/authz/client/testutil/query.go

@@ -1,6 +1,4 @@
-// +build norace
-
-package cli_test
+package testutil
 
 import (
 	"fmt"
@@ -14,7 +12,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/authz/client/cli"
 
-	authztestutil "github.com/cosmos/cosmos-sdk/x/authz/client/testutil"
 	"github.com/cosmos/cosmos-sdk/x/authz/types"
 )
 
@@ -24,7 +21,7 @@ func (s *IntegrationTestSuite) TestQueryAuthorizations() {
 	grantee := s.grantee
 	twoHours := time.Now().Add(time.Minute * time.Duration(120)).Unix()
 
-	_, err := authztestutil.ExecGrantAuthorization(
+	_, err := ExecGrantAuthorization(
 		val,
 		[]string{
 			grantee.String(),
@@ -102,7 +99,7 @@ func (s *IntegrationTestSuite) TestQueryAuthorization() {
 	grantee := s.grantee
 	twoHours := time.Now().Add(time.Minute * time.Duration(120)).Unix()
 
-	_, err := authztestutil.ExecGrantAuthorization(
+	_, err := ExecGrantAuthorization(
 		val,
 		[]string{
 			grantee.String(),