Skip to content

Commit 7f2cf23

Browse files
bbasatabbasata
committed
green
1 parent 4b07f34 commit 7f2cf23

File tree

6 files changed

+197
-451
lines changed

6 files changed

+197
-451
lines changed

‎statecheck/compare_value_collection_test.go‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,6 @@ func TestCompareValueCollection_CheckState_ListNestedBlock_ValuesSame(t *testing
351351
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
352352
"test": providerserver.NewProviderServer(anTestProvider),
353353
},
354-
ProviderFactories: map[string]func() (*schema.Provider, error){
355-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
356-
return testProvider(), nil
357-
},
358-
},
359354
Steps: []r.TestStep{
360355
{
361356
Config: `resource "test_resource" "one" {
@@ -924,11 +919,6 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDiffer_Err
924919
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
925920
"test": providerserver.NewProviderServer(anTestProvider),
926921
},
927-
ProviderFactories: map[string]func() (*schema.Provider, error){
928-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
929-
return testProvider(), nil
930-
},
931-
},
932922
Steps: []r.TestStep{
933923
{
934924
Config: `resource "test_resource" "one" {
@@ -973,11 +963,6 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDiffer_Err
973963
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
974964
"test": providerserver.NewProviderServer(anTestProvider),
975965
},
976-
ProviderFactories: map[string]func() (*schema.Provider, error){
977-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
978-
return testProvider(), nil
979-
},
980-
},
981966
Steps: []r.TestStep{
982967
{
983968
Config: `resource "test_resource" "one" {
@@ -1021,11 +1006,6 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDiffer_Err
10211006
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
10221007
"test": providerserver.NewProviderServer(anTestProvider),
10231008
},
1024-
ProviderFactories: map[string]func() (*schema.Provider, error){
1025-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1026-
return testProvider(), nil
1027-
},
1028-
},
10291009
Steps: []r.TestStep{
10301010
{
10311011
Config: `resource "test_resource" "one" {
@@ -1068,11 +1048,6 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDifferAttr
10681048
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
10691049
"test": providerserver.NewProviderServer(anTestProvider),
10701050
},
1071-
ProviderFactories: map[string]func() (*schema.Provider, error){
1072-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1073-
return testProvider(), nil
1074-
},
1075-
},
10761051
Steps: []r.TestStep{
10771052
{
10781053
Config: `resource "test_resource" "one" {
@@ -1130,11 +1105,6 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDifferNest
11301105
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
11311106
"test": providerserver.NewProviderServer(anTestProvider),
11321107
},
1133-
ProviderFactories: map[string]func() (*schema.Provider, error){
1134-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1135-
return testProvider(), nil
1136-
},
1137-
},
11381108
Steps: []r.TestStep{
11391109
{
11401110
Config: `resource "test_resource" "one" {
@@ -1191,11 +1161,6 @@ func TestCompareValueCollection_CheckState_SetNestedNestedBlock_ValuesDifferNest
11911161
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
11921162
"test": providerserver.NewProviderServer(anTestProvider),
11931163
},
1194-
ProviderFactories: map[string]func() (*schema.Provider, error){
1195-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1196-
return testProvider(), nil
1197-
},
1198-
},
11991164
Steps: []r.TestStep{
12001165
{
12011166
Config: `resource "test_resource" "one" {
@@ -1251,11 +1216,6 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSame_ErrorAttribute(t
12511216
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
12521217
"test": providerserver.NewProviderServer(anTestProvider),
12531218
},
1254-
ProviderFactories: map[string]func() (*schema.Provider, error){
1255-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1256-
return testProvider(), nil
1257-
},
1258-
},
12591219
Steps: []r.TestStep{
12601220
{
12611221
Config: `resource "test_resource" "one" {
@@ -1314,11 +1274,6 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSame_ErrorNestedBlock
13141274
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
13151275
"test": providerserver.NewProviderServer(anTestProvider),
13161276
},
1317-
ProviderFactories: map[string]func() (*schema.Provider, error){
1318-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1319-
return testProvider(), nil
1320-
},
1321-
},
13221277
Steps: []r.TestStep{
13231278
{
13241279
Config: `resource "test_resource" "one" {
@@ -1376,11 +1331,6 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSame_ErrorNestedNeste
13761331
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
13771332
"test": providerserver.NewProviderServer(anTestProvider),
13781333
},
1379-
ProviderFactories: map[string]func() (*schema.Provider, error){
1380-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1381-
return testProvider(), nil
1382-
},
1383-
},
13841334
Steps: []r.TestStep{
13851335
{
13861336
Config: `resource "test_resource" "one" {
@@ -1437,11 +1387,6 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSameAttribute(t *test
14371387
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
14381388
"test": providerserver.NewProviderServer(anTestProvider),
14391389
},
1440-
ProviderFactories: map[string]func() (*schema.Provider, error){
1441-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1442-
return testProvider(), nil
1443-
},
1444-
},
14451390
Steps: []r.TestStep{
14461391
{
14471392
Config: `resource "test_resource" "one" {
@@ -1499,11 +1444,6 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSameNestedBlock(t *te
14991444
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
15001445
"test": providerserver.NewProviderServer(anTestProvider),
15011446
},
1502-
ProviderFactories: map[string]func() (*schema.Provider, error){
1503-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1504-
return testProvider(), nil
1505-
},
1506-
},
15071447
Steps: []r.TestStep{
15081448
{
15091449
Config: `resource "test_resource" "one" {
@@ -1560,11 +1500,6 @@ func TestCompareValueCollection_CheckState_SetNested_ValuesSameNestedNestedBlock
15601500
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
15611501
"test": providerserver.NewProviderServer(anTestProvider),
15621502
},
1563-
ProviderFactories: map[string]func() (*schema.Provider, error){
1564-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
1565-
return testProvider(), nil
1566-
},
1567-
},
15681503
Steps: []r.TestStep{
15691504
{
15701505
Config: `resource "test_resource" "one" {

‎statecheck/compare_value_pairs_test.go‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"regexp"
88
"testing"
99

10-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
10+
"github.com/hashicorp/terraform-plugin-go/tfprotov6"
1211
"github.com/hashicorp/terraform-plugin-testing/compare"
1312
r "github.com/hashicorp/terraform-plugin-testing/helper/resource"
13+
"github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/providerserver"
1414
"github.com/hashicorp/terraform-plugin-testing/statecheck"
1515
"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
1616
)
@@ -19,10 +19,8 @@ func TestCompareValuePairs_CheckState_ValuesSame_DifferError(t *testing.T) {
1919
t.Parallel()
2020

2121
r.Test(t, r.TestCase{
22-
ProviderFactories: map[string]func() (*schema.Provider, error){
23-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
24-
return testProvider(), nil
25-
},
22+
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
23+
"test": providerserver.NewProviderServer(anTestProvider),
2624
},
2725
Steps: []r.TestStep{
2826
{
@@ -50,10 +48,8 @@ func TestCompareValuePairs_CheckState_ValuesSame(t *testing.T) {
5048
t.Parallel()
5149

5250
r.Test(t, r.TestCase{
53-
ProviderFactories: map[string]func() (*schema.Provider, error){
54-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
55-
return testProvider(), nil
56-
},
51+
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
52+
"test": providerserver.NewProviderServer(anTestProvider),
5753
},
5854
Steps: []r.TestStep{
5955
{
@@ -83,10 +79,8 @@ func TestCompareValuePairs_CheckState_ValuesDiffer_SameError(t *testing.T) {
8379
t.Parallel()
8480

8581
r.Test(t, r.TestCase{
86-
ProviderFactories: map[string]func() (*schema.Provider, error){
87-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
88-
return testProvider(), nil
89-
},
82+
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
83+
"test": providerserver.NewProviderServer(anTestProvider),
9084
},
9185
Steps: []r.TestStep{
9286
{
@@ -116,10 +110,8 @@ func TestCompareValuePairs_CheckState_ValuesDiffer(t *testing.T) {
116110
t.Parallel()
117111

118112
r.Test(t, r.TestCase{
119-
ProviderFactories: map[string]func() (*schema.Provider, error){
120-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
121-
return testProvider(), nil
122-
},
113+
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
114+
"test": providerserver.NewProviderServer(anTestProvider),
123115
},
124116
Steps: []r.TestStep{
125117
{

‎statecheck/compare_value_test.go‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"regexp"
88
"testing"
99

10-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
10+
"github.com/hashicorp/terraform-plugin-go/tfprotov6"
1211
"github.com/hashicorp/terraform-plugin-testing/compare"
1312
r "github.com/hashicorp/terraform-plugin-testing/helper/resource"
13+
"github.com/hashicorp/terraform-plugin-testing/internal/testing/testsdk/providerserver"
1414
"github.com/hashicorp/terraform-plugin-testing/statecheck"
1515
"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
1616
)
@@ -21,10 +21,8 @@ func TestCompareValue_CheckState_NoStateValues(t *testing.T) {
2121
boolValuesDiffer := statecheck.CompareValue(compare.ValuesSame())
2222

2323
r.Test(t, r.TestCase{
24-
ProviderFactories: map[string]func() (*schema.Provider, error){
25-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
26-
return testProvider(), nil
27-
},
24+
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
25+
"test": providerserver.NewProviderServer(anTestProvider),
2826
},
2927
Steps: []r.TestStep{
3028
{
@@ -48,10 +46,8 @@ func TestCompareValue_CheckState_ValuesSame_ValueDiffersError(t *testing.T) {
4846
boolValuesDiffer := statecheck.CompareValue(compare.ValuesSame())
4947

5048
r.Test(t, r.TestCase{
51-
ProviderFactories: map[string]func() (*schema.Provider, error){
52-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
53-
return testProvider(), nil
54-
},
49+
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
50+
"test": providerserver.NewProviderServer(anTestProvider),
5551
},
5652
Steps: []r.TestStep{
5753
{
@@ -101,10 +97,8 @@ func TestCompareValue_CheckState_ValuesSame(t *testing.T) {
10197
boolValuesDiffer := statecheck.CompareValue(compare.ValuesSame())
10298

10399
r.Test(t, r.TestCase{
104-
ProviderFactories: map[string]func() (*schema.Provider, error){
105-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
106-
return testProvider(), nil
107-
},
100+
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
101+
"test": providerserver.NewProviderServer(anTestProvider),
108102
},
109103
Steps: []r.TestStep{
110104
{
@@ -141,10 +135,8 @@ func TestCompareValue_CheckState_ValuesDiffer_ValueSameError(t *testing.T) {
141135
boolValuesDiffer := statecheck.CompareValue(compare.ValuesDiffer())
142136

143137
r.Test(t, r.TestCase{
144-
ProviderFactories: map[string]func() (*schema.Provider, error){
145-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
146-
return testProvider(), nil
147-
},
138+
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
139+
"test": providerserver.NewProviderServer(anTestProvider),
148140
},
149141
Steps: []r.TestStep{
150142
{
@@ -194,10 +186,8 @@ func TestCompareValue_CheckState_ValuesDiffer(t *testing.T) {
194186
boolValuesDiffer := statecheck.CompareValue(compare.ValuesDiffer())
195187

196188
r.Test(t, r.TestCase{
197-
ProviderFactories: map[string]func() (*schema.Provider, error){
198-
"test": func() (*schema.Provider, error) { //nolint:unparam // required signature
199-
return testProvider(), nil
200-
},
189+
ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
190+
"test": providerserver.NewProviderServer(anTestProvider),
201191
},
202192
Steps: []r.TestStep{
203193
{

0 commit comments

Comments
 (0)