diff --git a/cli-plugins/manager/candidate_test.go b/cli-plugins/manager/candidate_test.go index a0dbb0dd7b..976aa74bb5 100644 --- a/cli-plugins/manager/candidate_test.go +++ b/cli-plugins/manager/candidate_test.go @@ -151,7 +151,7 @@ func TestValidateCandidate(t *testing.T) { assert.ErrorContains(t, err, tc.err) case tc.invalid != "": assert.NilError(t, err) - assert.Assert(t, is.ErrorType(p.Err, reflect.TypeOf(&pluginError{}))) + assert.Assert(t, is.ErrorType(p.Err, reflect.TypeFor[*pluginError]())) assert.ErrorContains(t, p.Err, tc.invalid) default: assert.NilError(t, err) diff --git a/cli/compose/loader/merge_test.go b/cli/compose/loader/merge_test.go index 40445d6c42..03040cb444 100644 --- a/cli/compose/loader/merge_test.go +++ b/cli/compose/loader/merge_test.go @@ -1153,7 +1153,7 @@ func TestLoadMultipleServiceVolumes(t *testing.T) { func TestMergeUlimitsConfig(t *testing.T) { specials := &specials{ m: map[reflect.Type]func(dst, src reflect.Value) error{ - reflect.TypeOf(&types.UlimitsConfig{}): mergeUlimitsConfig, + reflect.TypeFor[*types.UlimitsConfig](): mergeUlimitsConfig, }, } base := map[string]*types.UlimitsConfig{ @@ -1189,7 +1189,7 @@ func TestMergeUlimitsConfig(t *testing.T) { func TestMergeServiceNetworkConfig(t *testing.T) { specials := &specials{ m: map[reflect.Type]func(dst, src reflect.Value) error{ - reflect.TypeOf(&types.ServiceNetworkConfig{}): mergeServiceNetworkConfig, + reflect.TypeFor[*types.ServiceNetworkConfig](): mergeServiceNetworkConfig, }, } base := map[string]*types.ServiceNetworkConfig{