Skip to content

Commit

Permalink
fix: retest FIXME issues in tests (#289)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lechnerc77
lechnerc77 authored Jul 13, 2023
1 parent cc79927 commit 23b00bb
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 2,128 deletions.
33 changes: 14 additions & 19 deletions internal/provider/datasource_directory_users_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,21 @@ func TestDataSourceDirectoryUsers(t *testing.T) {
},
})
})
// FIXME ends in unmarshal error
/*
t.Run("error path - non existing idp", func(t *testing.T) {
rec := setupVCR(t, "fixtures/datasource_directory_users.non_existing_idp")
defer stopQuietly(rec)
t.Run("error path - non existing idp", func(t *testing.T) {
rec := setupVCR(t, "fixtures/datasource_directory_users.non_existing_idp")
defer stopQuietly(rec)

resource.Test(t, resource.TestCase{
IsUnitTest: true,
ProtoV6ProviderFactories: getProviders(rec.GetDefaultClient()),
Steps: []resource.TestStep{
{
Config: hclProvider() + hclDatasourceDirectoryUsersWithCustomIdp("uut", "05368777-4934-41e8-9f3c-6ec5f4d564b9", "this-doesnt-exist"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_directory_users.uut", "directory_id", "05368777-4934-41e8-9f3c-6ec5f4d564b9"),
resource.TestCheckResourceAttr("data.btp_directory_users.uut", "values.#", "2"),
),
},
},
})
})*/
resource.Test(t, resource.TestCase{
IsUnitTest: true,
ProtoV6ProviderFactories: getProviders(rec.GetDefaultClient()),
Steps: []resource.TestStep{
{
Config: hclProvider() + hclDatasourceDirectoryUsersWithCustomIdp("uut", "05368777-4934-41e8-9f3c-6ec5f4d564b9", "this-doesnt-exist"),
ExpectError: regexp.MustCompile(`API Error Reading Resource Users \(Directory\)`),
},
},
})
})
t.Run("error path - directory_id mandatory", func(t *testing.T) {
resource.Test(t, resource.TestCase{
IsUnitTest: true,
Expand Down
15 changes: 6 additions & 9 deletions internal/provider/datasource_globalaccount_role_collection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ func TestDataSourceGlobalaccountRoleCollection(t *testing.T) {
},
})
})
// FIXME https://github.com/SAP/terraform-provider-btp/issues/160
/*t.Run("happy path - role collection not available", func(t *testing.T) {

t.Run("error path - role collection not available", func(t *testing.T) {
rec := setupVCR(t, "fixtures/datasource_globalaccount_role_collection.role_collection_not_available")
defer stopQuietly(rec)

Expand All @@ -42,16 +42,13 @@ func TestDataSourceGlobalaccountRoleCollection(t *testing.T) {
ProtoV6ProviderFactories: getProviders(rec.GetDefaultClient()),
Steps: []resource.TestStep{
{
Config: hclProvider() + hclDatasourceGlobalaccountRoleCollection("uut", "fuh"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_globalaccount_role_collection.uut", "description", ""),
resource.TestCheckResourceAttr("data.btp_globalaccount_role_collection.uut", "read_only", "false"),
resource.TestCheckResourceAttr("data.btp_globalaccount_role_collection.uut", "roles.#", "0"),
),
Config: hclProvider() + hclDatasourceGlobalaccountRoleCollection("uut", "fuh"),
ExpectError: regexp.MustCompile(`API Error Reading Resource Role Collection \(Global Account\)`),
},
},
})
})*/
})

t.Run("error path - name must not be empty", func(t *testing.T) {
resource.Test(t, resource.TestCase{
IsUnitTest: true,
Expand Down
18 changes: 4 additions & 14 deletions internal/provider/datasource_globalaccount_trust_configuration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ func TestDataSourceGlobalaccountTrustConfiguration(t *testing.T) {
},
})
})
// FIXME https://github.com/SAP/terraform-provider-btp/issues/167
/*t.Run("happy path - custom idp - not existing", func(t *testing.T) {
t.Run("error path - custom idp - not existing", func(t *testing.T) {
rec := setupVCR(t, "fixtures/datasource_globalaccount_trust_configuration.custom_idp_not_existing")
defer stopQuietly(rec)

Expand All @@ -71,21 +70,12 @@ func TestDataSourceGlobalaccountTrustConfiguration(t *testing.T) {
ProtoV6ProviderFactories: getProviders(rec.GetDefaultClient()),
Steps: []resource.TestStep{
{
Config: hclProvider() + hclDatasourceGlobalaccountTrustConfiguration("uut", "fuh"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "id", ""),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "description", ""),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "identity_provider", ""),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "name", ""),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "protocol", ""),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "read_only", "false"),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "status", ""),
resource.TestCheckResourceAttr("data.btp_globalaccount_trust_configuration.uut", "type", ""),
),
Config: hclProvider() + hclDatasourceGlobalaccountTrustConfiguration("uut", "fuh"),
ExpectError: regexp.MustCompile(`API Error Reading Resource Trust Configuration \(Global Account\)`),
},
},
})
})*/
})
t.Run("error path - origin must not be empty", func(t *testing.T) {
resource.Test(t, resource.TestCase{
IsUnitTest: true,
Expand Down
18 changes: 4 additions & 14 deletions internal/provider/datasource_subaccount_trust_configuration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ func TestDataSourceSubaccountTrustConfiguration(t *testing.T) {
},
})
})
// FIXME https://github.com/SAP/terraform-provider-btp/issues/167
/*t.Run("happy path", func(t *testing.T) {
t.Run("error path - custom idp not existing", func(t *testing.T) {
rec := setupVCR(t, "fixtures/datasource_subaccount_trust_configuration.custom_idp_not_existing")
defer stopQuietly(rec)

Expand All @@ -71,21 +70,12 @@ func TestDataSourceSubaccountTrustConfiguration(t *testing.T) {
ProtoV6ProviderFactories: getProviders(rec.GetDefaultClient()),
Steps: []resource.TestStep{
{
Config: hclProvider() + hclDatasourceSubaccountTrustConfiguration("uut", "ef23ace8-6ade-4d78-9c1f-8df729548bbf", "fuh"),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "id", ""),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "description", ""),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "identity_provider", ""),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "name", ""),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "protocol", ""),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "read_only", "false"),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "status", ""),
resource.TestCheckResourceAttr("data.btp_subaccount_trust_configuration.uut", "type", ""),
),
Config: hclProvider() + hclDatasourceSubaccountTrustConfiguration("uut", "ef23ace8-6ade-4d78-9c1f-8df729548bbf", "fuh"),
ExpectError: regexp.MustCompile(`API Error Reading Resource Trust Configuration \(Subaccount\)`),
},
},
})
})*/
})
t.Run("error path - origin must not be empty", func(t *testing.T) {
resource.Test(t, resource.TestCase{
IsUnitTest: true,
Expand Down
26 changes: 13 additions & 13 deletions internal/provider/fixtures/datasource_directory_users.non_existing_idp.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interactions:
proto: HTTP/1.1
proto_major: 1
proto_minor: 1
content_length: 115
content_length: 118
transfer_encoding: []
trailer: {}
host: cpcli.cf.sap.hana.ondemand.com
Expand All @@ -19,9 +19,9 @@ interactions:
Content-Type:
- application/json
User-Agent:
- Terraform/1.3.9 terraform-provider-btp/dev
- Terraform/1.5.2 terraform-provider-btp/dev
X-Correlationid:
- 2d18dfc7-4fe3-7f3c-465f-9f3fcb2e34f2
- 55499ef8-d702-331d-5070-96a6191987ac
X-Cpcli-Format:
- json
url: https://cpcli.cf.sap.hana.ondemand.com/login/v2.38.0
Expand All @@ -32,18 +32,18 @@ interactions:
proto_minor: 0
transfer_encoding: []
trailer: {}
content_length: 143
content_length: 149
uncompressed: false
body: '{"issuer":"accounts.sap.com","refreshToken":"redacted","user":"[email protected]","mail":"[email protected]"}'
headers:
Cache-Control:
- no-cache, no-store, max-age=0, must-revalidate
Content-Length:
- "143"
- "149"
Content-Type:
- application/json
Date:
- Thu, 15 Jun 2023 10:08:19 GMT
- Wed, 12 Jul 2023 13:13:25 GMT
Expires:
- "0"
Pragma:
Expand All @@ -57,12 +57,12 @@ interactions:
X-Frame-Options:
- DENY
X-Vcap-Request-Id:
- 14a9c909-5b96-47ec-6e0f-0a107f1473d8
- 5b391618-243c-4b96-6a8f-f96b7c10c6f7
X-Xss-Protection:
- "0"
status: 200 OK
code: 200
duration: 966.583683ms
duration: 759.7271ms
- id: 1
request:
proto: HTTP/1.1
Expand All @@ -81,9 +81,9 @@ interactions:
Content-Type:
- application/json
User-Agent:
- Terraform/1.3.9 terraform-provider-btp/dev
- Terraform/1.5.2 terraform-provider-btp/dev
X-Correlationid:
- 743f177f-60bc-1c0e-721c-8b3b4549bab3
- 921d6ebb-acf0-4774-5ac9-5c6a76b06ef9
X-Cpcli-Customidp:
- ""
X-Cpcli-Format:
Expand All @@ -109,7 +109,7 @@ interactions:
Content-Type:
- application/json
Date:
- Thu, 15 Jun 2023 10:08:21 GMT
- Wed, 12 Jul 2023 13:13:26 GMT
Expires:
- "0"
Pragma:
Expand All @@ -131,9 +131,9 @@ interactions:
X-Frame-Options:
- DENY
X-Vcap-Request-Id:
- a713b570-dd5e-421c-634d-1c554cd89ecd
- 0e706860-07c7-45a5-49b2-61ee135de91a
X-Xss-Protection:
- "0"
status: 200 OK
code: 200
duration: 652.213329ms
duration: 444.1048ms
Loading

0 comments on commit 23b00bb

Please sign in to comment.