fix: fix tests

modules/core/genesis_test.go

@@ -1,6 +1,7 @@
 package ibc_test
 
 import (
+	"errors"
 	"fmt"
 	"testing"
 
@@ -62,12 +63,12 @@ func (suite *IBCTestSuite) TestValidateGenesis() {
 	testCases := []struct {
 		name     string
 		genState *types.GenesisState
-		expPass  bool
+		expError error
 	}{
 		{
 			name:     "default",
 			genState: types.DefaultGenesisState(),
-			expPass:  true,
+			expError: nil,
 		},
 		{
 			name: "valid genesis",
@@ -145,7 +146,7 @@ func (suite *IBCTestSuite) TestValidateGenesis() {
 					channeltypes.Params{UpgradeTimeout: channeltypes.DefaultTimeout},
 				),
 			},
-			expPass: true,
+			expError: nil,
 		},
 		{
 			name: "invalid client genesis",
@@ -172,7 +173,7 @@ func (suite *IBCTestSuite) TestValidateGenesis() {
 				),
 				ConnectionGenesis: connectiontypes.DefaultGenesisState(),
 			},
-			expPass: false,
+			expError: errors.New("genesis metadata key cannot be empty"),
 		},
 		{
 			name: "invalid connection genesis",
@@ -189,7 +190,7 @@ func (suite *IBCTestSuite) TestValidateGenesis() {
 					connectiontypes.Params{},
 				),
 			},
-			expPass: false,
+			expError: errors.New("invalid connection"),
 		},
 		{
 			name: "invalid channel genesis",
@@ -202,17 +203,18 @@ func (suite *IBCTestSuite) TestValidateGenesis() {
 					},
 				},
 			},
-			expPass: false,
+			expError: errors.New("invalid acknowledgement"),
 		},
 	}
 
 	for _, tc := range testCases {
 		tc := tc
 		err := tc.genState.Validate()
-		if tc.expPass {
+		if tc.expError == nil {
 			suite.Require().NoError(err, tc.name)
 		} else {
 			suite.Require().Error(err, tc.name)
+			suite.Require().Contains(err.Error(), tc.expError.Error())
 		}
 	}
 }

modules/core/keeper/keeper_test.go

@@ -51,29 +51,39 @@ func (suite *KeeperTestSuite) TestNewKeeper() {
 	testCases := []struct {
 		name     string
 		malleate func()
-		expPass  bool
+		expPanic string
 	}{
-		{"failure: empty upgrade keeper value", func() {
-			emptyUpgradeKeeperValue := upgradekeeper.Keeper{}
-
-			upgradeKeeper = emptyUpgradeKeeperValue
-		}, false},
-		{"failure: empty upgrade keeper pointer", func() {
-			emptyUpgradeKeeperPointer := &upgradekeeper.Keeper{}
-
-			upgradeKeeper = emptyUpgradeKeeperPointer
-		}, false},
-		{"failure: empty authority", func() {
-			newIBCKeeperFn = func() {
-				ibckeeper.NewKeeper(
-					suite.chainA.GetSimApp().AppCodec(),
-					runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)),
-					suite.chainA.GetSimApp().GetSubspace(ibcexported.ModuleName),
-					upgradeKeeper,
-					"", // authority
-				)
-			}
-		}, false},
+		{
+			name: "failure: empty upgrade keeper value",
+			malleate: func() {
+				emptyUpgradeKeeperValue := upgradekeeper.Keeper{}
+				upgradeKeeper = emptyUpgradeKeeperValue
+			},
+			expPanic: "cannot initialize IBC keeper: empty upgrade keeper",
+		},
+		{
+			name: "failure: empty upgrade keeper pointer",
+			malleate: func() {
+				emptyUpgradeKeeperPointer := &upgradekeeper.Keeper{}
+				upgradeKeeper = emptyUpgradeKeeperPointer
+			},
+			expPanic: "cannot initialize IBC keeper: empty upgrade keeper",
+		},
+		{
+			name: "failure: empty authority",
+			malleate: func() {
+				newIBCKeeperFn = func() {
+					ibckeeper.NewKeeper(
+						suite.chainA.GetSimApp().AppCodec(),
+						runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)),
+						suite.chainA.GetSimApp().GetSubspace(ibcexported.ModuleName),
+						upgradeKeeper,
+						"", // authority
+					)
+				}
+			},
+			expPanic: "authority cannot be empty",
+		},
 	}
 
 	for _, tc := range testCases {
@@ -96,14 +106,19 @@ func (suite *KeeperTestSuite) TestNewKeeper() {
 
 			tc.malleate()
 
-			if tc.expPass {
-				suite.Require().NotPanics(
-					newIBCKeeperFn,
-				)
+			if tc.expPanic != "" {
+				suite.Require().Panics(func() {
+					newIBCKeeperFn()
+				}, "expected panic but no panic occurred")
+
+				defer func() {
+					if r := recover(); r != nil {
+						suite.Require().Contains(r.(error).Error(), tc.expPanic, "unexpected panic message")
+					}
+				}()
+
 			} else {
-				suite.Require().Panics(
-					newIBCKeeperFn,
-				)
+				suite.Require().NotPanics(newIBCKeeperFn, "unexpected panic occurred")
 			}
 		})
 	}