Skip to content

Commit e5c84aa

Browse files
deigadeiga
committed
Refactor to use ConfigStateChecks instead of Check in tests
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
1 parent beca488 commit e5c84aa

1 file changed

Lines changed: 44 additions & 112 deletions

File tree

‎github/resource_github_repository_autolink_reference_test.go‎

Lines changed: 44 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -55,68 +55,34 @@ func TestAccGithubRepositoryAutolinkReference(t *testing.T) {
5555
}
5656
`, repoName)
5757

58-
check := resource.ComposeTestCheckFunc(
59-
// autolink_default
60-
resource.TestCheckResourceAttr(
61-
"github_repository_autolink_reference.autolink_default", "key_prefix", "TEST1-",
62-
),
63-
resource.TestCheckResourceAttr(
64-
"github_repository_autolink_reference.autolink_default", "target_url_template", "https://example.com/TEST-<num>",
65-
),
66-
resource.TestCheckResourceAttr(
67-
"github_repository_autolink_reference.autolink_default", "is_alphanumeric", "true",
68-
),
69-
resource.TestCheckResourceAttrSet(
70-
"github_repository_autolink_reference.autolink_default", "repository_id",
71-
),
72-
// autolink_alphanumeric
73-
resource.TestCheckResourceAttr(
74-
"github_repository_autolink_reference.autolink_alphanumeric", "key_prefix", "TEST2-",
75-
),
76-
resource.TestCheckResourceAttr(
77-
"github_repository_autolink_reference.autolink_alphanumeric", "target_url_template", "https://example.com/TEST-<num>",
78-
),
79-
resource.TestCheckResourceAttr(
80-
"github_repository_autolink_reference.autolink_alphanumeric", "is_alphanumeric", "true",
81-
),
82-
resource.TestCheckResourceAttrSet(
83-
"github_repository_autolink_reference.autolink_alphanumeric", "repository_id",
84-
),
85-
// autolink_numeric
86-
resource.TestCheckResourceAttr(
87-
"github_repository_autolink_reference.autolink_numeric", "key_prefix", "TEST3-",
88-
),
89-
resource.TestCheckResourceAttr(
90-
"github_repository_autolink_reference.autolink_numeric", "target_url_template", "https://example.com/TEST-<num>",
91-
),
92-
resource.TestCheckResourceAttr(
93-
"github_repository_autolink_reference.autolink_numeric", "is_alphanumeric", "false",
94-
),
95-
resource.TestCheckResourceAttrSet(
96-
"github_repository_autolink_reference.autolink_numeric", "repository_id",
97-
),
98-
// autolink_with_port
99-
resource.TestCheckResourceAttr(
100-
"github_repository_autolink_reference.autolink_with_port", "key_prefix", "TEST4-",
101-
),
102-
resource.TestCheckResourceAttr(
103-
"github_repository_autolink_reference.autolink_with_port", "target_url_template", "https://example.com:8443/TEST-<num>",
104-
),
105-
resource.TestCheckResourceAttr(
106-
"github_repository_autolink_reference.autolink_with_port", "is_alphanumeric", "true",
107-
),
108-
resource.TestCheckResourceAttrSet(
109-
"github_repository_autolink_reference.autolink_with_port", "repository_id",
110-
),
111-
)
112-
11358
resource.Test(t, resource.TestCase{
11459
PreCheck: func() { skipUnauthenticated(t) },
11560
ProviderFactories: providerFactories,
11661
Steps: []resource.TestStep{
11762
{
11863
Config: config,
119-
Check: check,
64+
ConfigStateChecks: []statecheck.StateCheck{
65+
// autolink_default
66+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_default", tfjsonpath.New("key_prefix"), knownvalue.StringExact("TEST1-")),
67+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_default", tfjsonpath.New("target_url_template"), knownvalue.StringExact("https://example.com/TEST-<num>")),
68+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_default", tfjsonpath.New("is_alphanumeric"), knownvalue.Bool(true)),
69+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_default", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
70+
// autolink_alphanumeric
71+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_alphanumeric", tfjsonpath.New("key_prefix"), knownvalue.StringExact("TEST2-")),
72+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_alphanumeric", tfjsonpath.New("target_url_template"), knownvalue.StringExact("https://example.com/TEST-<num>")),
73+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_alphanumeric", tfjsonpath.New("is_alphanumeric"), knownvalue.Bool(true)),
74+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_alphanumeric", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
75+
// autolink_numeric
76+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_numeric", tfjsonpath.New("key_prefix"), knownvalue.StringExact("TEST3-")),
77+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_numeric", tfjsonpath.New("target_url_template"), knownvalue.StringExact("https://example.com/TEST-<num>")),
78+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_numeric", tfjsonpath.New("is_alphanumeric"), knownvalue.Bool(false)),
79+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_numeric", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
80+
// autolink_with_port
81+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_with_port", tfjsonpath.New("key_prefix"), knownvalue.StringExact("TEST4-")),
82+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_with_port", tfjsonpath.New("target_url_template"), knownvalue.StringExact("https://example.com:8443/TEST-<num>")),
83+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_with_port", tfjsonpath.New("is_alphanumeric"), knownvalue.Bool(true)),
84+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_with_port", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
85+
},
12086
},
12187
},
12288
})
@@ -162,68 +128,34 @@ func TestAccGithubRepositoryAutolinkReference(t *testing.T) {
162128
}
163129
`, repoName)
164130

165-
check := resource.ComposeTestCheckFunc(
166-
// autolink_default
167-
resource.TestCheckResourceAttr(
168-
"github_repository_autolink_reference.autolink_default", "key_prefix", "TEST1-",
169-
),
170-
resource.TestCheckResourceAttr(
171-
"github_repository_autolink_reference.autolink_default", "target_url_template", "https://example.com/TEST-<num>",
172-
),
173-
resource.TestCheckResourceAttr(
174-
"github_repository_autolink_reference.autolink_default", "is_alphanumeric", "true",
175-
),
176-
resource.TestCheckResourceAttrSet(
177-
"github_repository_autolink_reference.autolink_default", "repository_id",
178-
),
179-
// autolink_alphanumeric
180-
resource.TestCheckResourceAttr(
181-
"github_repository_autolink_reference.autolink_alphanumeric", "key_prefix", "TEST2-",
182-
),
183-
resource.TestCheckResourceAttr(
184-
"github_repository_autolink_reference.autolink_alphanumeric", "target_url_template", "https://example.com/TEST-<num>",
185-
),
186-
resource.TestCheckResourceAttr(
187-
"github_repository_autolink_reference.autolink_alphanumeric", "is_alphanumeric", "true",
188-
),
189-
resource.TestCheckResourceAttrSet(
190-
"github_repository_autolink_reference.autolink_alphanumeric", "repository_id",
191-
),
192-
// autolink_numeric
193-
resource.TestCheckResourceAttr(
194-
"github_repository_autolink_reference.autolink_numeric", "key_prefix", "TEST3-",
195-
),
196-
resource.TestCheckResourceAttr(
197-
"github_repository_autolink_reference.autolink_numeric", "target_url_template", "https://example.com/TEST-<num>",
198-
),
199-
resource.TestCheckResourceAttr(
200-
"github_repository_autolink_reference.autolink_numeric", "is_alphanumeric", "false",
201-
),
202-
resource.TestCheckResourceAttrSet(
203-
"github_repository_autolink_reference.autolink_numeric", "repository_id",
204-
),
205-
// autolink_with_port
206-
resource.TestCheckResourceAttr(
207-
"github_repository_autolink_reference.autolink_with_port", "key_prefix", "TEST4-",
208-
),
209-
resource.TestCheckResourceAttr(
210-
"github_repository_autolink_reference.autolink_with_port", "target_url_template", "https://example.com:8443/TEST-<num>",
211-
),
212-
resource.TestCheckResourceAttr(
213-
"github_repository_autolink_reference.autolink_with_port", "is_alphanumeric", "true",
214-
),
215-
resource.TestCheckResourceAttrSet(
216-
"github_repository_autolink_reference.autolink_with_port", "repository_id",
217-
),
218-
)
219-
220131
resource.Test(t, resource.TestCase{
221132
PreCheck: func() { skipUnauthenticated(t) },
222133
ProviderFactories: providerFactories,
223134
Steps: []resource.TestStep{
224135
{
225136
Config: config,
226-
Check: check,
137+
ConfigStateChecks: []statecheck.StateCheck{
138+
// autolink_default
139+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_default", tfjsonpath.New("key_prefix"), knownvalue.StringExact("TEST1-")),
140+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_default", tfjsonpath.New("target_url_template"), knownvalue.StringExact("https://example.com/TEST-<num>")),
141+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_default", tfjsonpath.New("is_alphanumeric"), knownvalue.Bool(true)),
142+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_default", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
143+
// autolink_alphanumeric
144+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_alphanumeric", tfjsonpath.New("key_prefix"), knownvalue.StringExact("TEST2-")),
145+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_alphanumeric", tfjsonpath.New("target_url_template"), knownvalue.StringExact("https://example.com/TEST-<num>")),
146+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_alphanumeric", tfjsonpath.New("is_alphanumeric"), knownvalue.Bool(true)),
147+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_alphanumeric", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
148+
// autolink_numeric
149+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_numeric", tfjsonpath.New("key_prefix"), knownvalue.StringExact("TEST3-")),
150+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_numeric", tfjsonpath.New("target_url_template"), knownvalue.StringExact("https://example.com/TEST-<num>")),
151+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_numeric", tfjsonpath.New("is_alphanumeric"), knownvalue.Bool(false)),
152+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_numeric", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
153+
// autolink_with_port
154+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_with_port", tfjsonpath.New("key_prefix"), knownvalue.StringExact("TEST4-")),
155+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_with_port", tfjsonpath.New("target_url_template"), knownvalue.StringExact("https://example.com:8443/TEST-<num>")),
156+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_with_port", tfjsonpath.New("is_alphanumeric"), knownvalue.Bool(true)),
157+
statecheck.ExpectKnownValue("github_repository_autolink_reference.autolink_with_port", tfjsonpath.New("repository_id"), knownvalue.NotNull()),
158+
},
227159
},
228160
// autolink_default
229161
{

0 commit comments

Comments
 (0)