Skip to content

Commit 5b358c4

Browse files
govindrao55govindrao55
committed
fixing the TC assertion failure message logs
1 parent 0fe760d commit 5b358c4

File tree

572 files changed

+2492
-2452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

572 files changed

+2492
-2452
lines changed

‎oci/analytics_analytics_instance_private_access_channel_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestAnalyticsAnalyticsInstancePrivateAccessChannelResource_basic(t *testing
6969
{
7070
Config: config + compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstancePrivateAccessChannelResourceDependencies +
7171
generateResourceFromRepresentationMap("oci_analytics_analytics_instance_private_access_channel", "test_analytics_instance_private_access_channel", Required, Create, analyticsInstancePrivateAccessChannelRepresentation),
72-
Check: resource.ComposeAggregateTestCheckFunc(
72+
Check: ComposeAggregateTestCheckFuncWrapper(
7373
resource.TestCheckResourceAttrSet(resourceName, "analytics_instance_id"),
7474
resource.TestCheckResourceAttr(resourceName, "display_name", "example_private_access_channel"),
7575
resource.TestCheckResourceAttr(resourceName, "private_source_dns_zones.#", "1"),
@@ -93,7 +93,7 @@ func TestAnalyticsAnalyticsInstancePrivateAccessChannelResource_basic(t *testing
9393
{
9494
Config: config + compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstancePrivateAccessChannelResourceDependencies +
9595
generateResourceFromRepresentationMap("oci_analytics_analytics_instance_private_access_channel", "test_analytics_instance_private_access_channel", Optional, Update, analyticsInstancePrivateAccessChannelRepresentation),
96-
Check: resource.ComposeAggregateTestCheckFunc(
96+
Check: ComposeAggregateTestCheckFuncWrapper(
9797
resource.TestCheckResourceAttrSet(resourceName, "analytics_instance_id"),
9898
resource.TestCheckResourceAttr(resourceName, "display_name", "example_private_access_channel2"),
9999
resource.TestCheckResourceAttr(resourceName, "egress_source_ip_addresses.#", "2"),

‎oci/analytics_analytics_instance_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
116116
{
117117
Config: config + compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstanceResourceDependencies +
118118
generateResourceFromRepresentationMap("oci_analytics_analytics_instance", "test_analytics_instance", Required, Create, getUpdatedRepresentationCopy("name", Representation{repType: Required, create: analyticsinstanceName}, analyticsInstanceRepresentation)),
119-
Check: resource.ComposeAggregateTestCheckFunc(
119+
Check: ComposeAggregateTestCheckFuncWrapper(
120120
resource.TestCheckResourceAttr(resourceName, "capacity.#", "1"),
121121
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_type", "OLPU_COUNT"),
122122
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_value", "2"),
@@ -141,7 +141,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
141141
{
142142
Config: config + compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstanceResourceDependencies +
143143
generateResourceFromRepresentationMap("oci_analytics_analytics_instance", "test_analytics_instance", Optional, Create, analyticsInstanceRepresentation),
144-
Check: resource.ComposeAggregateTestCheckFunc(
144+
Check: ComposeAggregateTestCheckFuncWrapper(
145145
resource.TestCheckResourceAttr(resourceName, "capacity.#", "1"),
146146
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_type", "OLPU_COUNT"),
147147
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_value", "2"),
@@ -181,7 +181,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
181181
representationCopyWithNewProperties(analyticsInstanceRepresentation, map[string]interface{}{
182182
"compartment_id": Representation{repType: Required, create: `${var.compartment_id_for_update}`},
183183
})),
184-
Check: resource.ComposeAggregateTestCheckFunc(
184+
Check: ComposeAggregateTestCheckFuncWrapper(
185185
resource.TestCheckResourceAttr(resourceName, "capacity.#", "1"),
186186
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_type", "OLPU_COUNT"),
187187
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_value", "2"),
@@ -216,7 +216,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
216216
{
217217
Config: config + compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstanceResourceDependencies +
218218
generateResourceFromRepresentationMap("oci_analytics_analytics_instance", "test_analytics_instance", Optional, Update, analyticsInstanceRepresentation),
219-
Check: resource.ComposeAggregateTestCheckFunc(
219+
Check: ComposeAggregateTestCheckFuncWrapper(
220220
resource.TestCheckResourceAttr(resourceName, "capacity.#", "1"),
221221
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_type", "OLPU_COUNT"),
222222
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_value", "2"),
@@ -249,7 +249,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
249249
representationCopyWithNewProperties(representationCopyWithRemovedProperties(analyticsInstanceRepresentation, []string{"capacity"}), map[string]interface{}{
250250
"capacity": RepresentationGroup{Required, analyticsInstanceCapacityUpdateRepresentation},
251251
})),
252-
Check: resource.ComposeAggregateTestCheckFunc(
252+
Check: ComposeAggregateTestCheckFuncWrapper(
253253
resource.TestCheckResourceAttr(resourceName, "capacity.#", "1"),
254254
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_type", "OLPU_COUNT"),
255255
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_value", "4"),
@@ -279,7 +279,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
279279
{
280280
Config: config + compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstanceResourceDependencies +
281281
generateResourceFromRepresentationMap("oci_analytics_analytics_instance", "test_analytics_instance", Optional, Update, analyticsInstanceRepresentation),
282-
Check: resource.ComposeAggregateTestCheckFunc(
282+
Check: ComposeAggregateTestCheckFuncWrapper(
283283
resource.TestCheckResourceAttr(resourceName, "capacity.#", "1"),
284284
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_type", "OLPU_COUNT"),
285285
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_value", "2"),
@@ -315,7 +315,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
315315
generateResourceFromRepresentationMap("oci_analytics_analytics_instance", "test_analytics_instance", Optional, Update, representationCopyWithNewProperties(analyticsInstanceRepresentation, map[string]interface{}{
316316
"state": Representation{repType: Required, create: `INACTIVE`},
317317
})),
318-
Check: resource.ComposeAggregateTestCheckFunc(
318+
Check: ComposeAggregateTestCheckFuncWrapper(
319319
resource.TestCheckResourceAttr(resourceName, "capacity.#", "1"),
320320
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_type", "OLPU_COUNT"),
321321
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_value", "2"),
@@ -347,7 +347,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
347347
generateResourceFromRepresentationMap("oci_analytics_analytics_instance", "test_analytics_instance", Optional, Update, representationCopyWithNewProperties(analyticsInstanceRepresentation, map[string]interface{}{
348348
"state": Representation{repType: Required, create: `ACTIVE`},
349349
})),
350-
Check: resource.ComposeAggregateTestCheckFunc(
350+
Check: ComposeAggregateTestCheckFuncWrapper(
351351
resource.TestCheckResourceAttr(resourceName, "capacity.#", "1"),
352352
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_type", "OLPU_COUNT"),
353353
resource.TestCheckResourceAttr(resourceName, "capacity.0.capacity_value", "2"),
@@ -379,7 +379,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
379379
generateDataSourceFromRepresentationMap("oci_analytics_analytics_instances", "test_analytics_instances", Optional, Update, analyticsInstanceDataSourceRepresentation) +
380380
compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstanceResourceDependencies +
381381
generateResourceFromRepresentationMap("oci_analytics_analytics_instance", "test_analytics_instance", Optional, Update, analyticsInstanceRepresentation),
382-
Check: resource.ComposeAggregateTestCheckFunc(
382+
Check: ComposeAggregateTestCheckFuncWrapper(
383383
resource.TestCheckResourceAttr(datasourceName, "capacity_type", "OLPU_COUNT"),
384384
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
385385
resource.TestCheckResourceAttr(datasourceName, "feature_set", "ENTERPRISE_ANALYTICS"),
@@ -412,7 +412,7 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
412412
Config: config +
413413
generateDataSourceFromRepresentationMap("oci_analytics_analytics_instance", "test_analytics_instance", Required, Create, analyticsInstanceSingularDataSourceRepresentation) +
414414
compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstanceResourceConfig,
415-
Check: resource.ComposeAggregateTestCheckFunc(
415+
Check: ComposeAggregateTestCheckFuncWrapper(
416416
resource.TestCheckResourceAttrSet(singularDatasourceName, "analytics_instance_id"),
417417

418418
resource.TestCheckResourceAttr(singularDatasourceName, "capacity.#", "1"),

‎oci/analytics_analytics_instance_vanity_url_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func TestAnalyticsAnalyticsInstanceVanityUrlResource_basic(t *testing.T) {
104104
{
105105
Config: config + compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstanceVanityUrlResourceDependencies +
106106
generateResourceFromRepresentationMap("oci_analytics_analytics_instance_vanity_url", "test_analytics_instance_vanity_url", Required, Create, analyticsInstanceVanityUrlRepresentation1),
107-
Check: resource.ComposeAggregateTestCheckFunc(
107+
Check: ComposeAggregateTestCheckFuncWrapper(
108108
resource.TestCheckResourceAttrSet(resourceName, "analytics_instance_id"),
109109
resource.TestCheckResourceAttr(resourceName, "ca_certificate", ca_cert1_val),
110110
resource.TestCheckResourceAttr(resourceName, "hosts.#", "1"),
@@ -126,7 +126,7 @@ func TestAnalyticsAnalyticsInstanceVanityUrlResource_basic(t *testing.T) {
126126
{
127127
Config: config + compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstanceVanityUrlResourceDependencies +
128128
generateResourceFromRepresentationMap("oci_analytics_analytics_instance_vanity_url", "test_analytics_instance_vanity_url", Optional, Create, analyticsInstanceVanityUrlRepresentation2),
129-
Check: resource.ComposeAggregateTestCheckFunc(
129+
Check: ComposeAggregateTestCheckFuncWrapper(
130130
resource.TestCheckResourceAttrSet(resourceName, "analytics_instance_id"),
131131
resource.TestCheckResourceAttr(resourceName, "ca_certificate", ca_cert2_val),
132132
resource.TestCheckResourceAttr(resourceName, "description", "description"),
@@ -151,7 +151,7 @@ func TestAnalyticsAnalyticsInstanceVanityUrlResource_basic(t *testing.T) {
151151
{
152152
Config: config + compartmentIdVariableStr + idcsAccessTokenVariableStr + AnalyticsInstanceVanityUrlResourceDependencies +
153153
generateResourceFromRepresentationMap("oci_analytics_analytics_instance_vanity_url", "test_analytics_instance_vanity_url", Optional, Update, analyticsInstanceVanityUrlRepresentation2),
154-
Check: resource.ComposeAggregateTestCheckFunc(
154+
Check: ComposeAggregateTestCheckFuncWrapper(
155155
resource.TestCheckResourceAttrSet(resourceName, "analytics_instance_id"),
156156
resource.TestCheckResourceAttr(resourceName, "ca_certificate", ca_cert1_val),
157157
resource.TestCheckResourceAttr(resourceName, "description", "description"),

‎oci/apigateway_api_content_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestApigatewayApiContentResource_basic(t *testing.T) {
4747
Config: config +
4848
generateDataSourceFromRepresentationMap("oci_apigateway_api_content", "test_api_content", Required, Create, apiContentSingularDataSourceRepresentation) +
4949
compartmentIdVariableStr + ApiContentResourceConfig,
50-
Check: resource.ComposeAggregateTestCheckFunc(
50+
Check: ComposeAggregateTestCheckFuncWrapper(
5151
resource.TestCheckResourceAttrSet(singularDatasourceName, "api_id"),
5252
),
5353
},

‎oci/apigateway_api_deployment_specification_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestApigatewayApiDeploymentSpecificationResource_basic(t *testing.T) {
4747
Config: config +
4848
generateDataSourceFromRepresentationMap("oci_apigateway_api_deployment_specification", "test_api_deployment_specification", Required, Create, apiDeploymentSpecificationSingularDataSourceRepresentation) +
4949
compartmentIdVariableStr + ApiDeploymentSpecificationResourceConfig,
50-
Check: resource.ComposeAggregateTestCheckFunc(
50+
Check: ComposeAggregateTestCheckFuncWrapper(
5151
resource.TestCheckResourceAttrSet(singularDatasourceName, "api_id"),
5252

5353
resource.TestCheckResourceAttr(singularDatasourceName, "logging_policies.#", "0"),

‎oci/apigateway_api_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func TestApigatewayApiResource_basic(t *testing.T) {
8686
{
8787
Config: config + compartmentIdVariableStr + ApiResourceDependencies +
8888
generateResourceFromRepresentationMap("oci_apigateway_api", "test_api", Required, Create, apiRepresentation),
89-
Check: resource.ComposeAggregateTestCheckFunc(
89+
Check: ComposeAggregateTestCheckFuncWrapper(
9090
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
9191

9292
func(s *terraform.State) (err error) {
@@ -104,7 +104,7 @@ func TestApigatewayApiResource_basic(t *testing.T) {
104104
{
105105
Config: config + compartmentIdVariableStr + ApiResourceDependencies +
106106
generateResourceFromRepresentationMap("oci_apigateway_api", "test_api", Optional, Create, apiRepresentation),
107-
Check: resource.ComposeAggregateTestCheckFunc(
107+
Check: ComposeAggregateTestCheckFuncWrapper(
108108
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
109109
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
110110
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
@@ -130,7 +130,7 @@ func TestApigatewayApiResource_basic(t *testing.T) {
130130
representationCopyWithNewProperties(apiRepresentation, map[string]interface{}{
131131
"compartment_id": Representation{repType: Required, create: `${var.compartment_id_for_update}`},
132132
})),
133-
Check: resource.ComposeAggregateTestCheckFunc(
133+
Check: ComposeAggregateTestCheckFuncWrapper(
134134
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
135135
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
136136
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
@@ -151,7 +151,7 @@ func TestApigatewayApiResource_basic(t *testing.T) {
151151
{
152152
Config: config + compartmentIdVariableStr + ApiResourceDependencies +
153153
generateResourceFromRepresentationMap("oci_apigateway_api", "test_api", Optional, Update, apiRepresentation),
154-
Check: resource.ComposeAggregateTestCheckFunc(
154+
Check: ComposeAggregateTestCheckFuncWrapper(
155155
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
156156
resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
157157
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
@@ -173,7 +173,7 @@ func TestApigatewayApiResource_basic(t *testing.T) {
173173
generateDataSourceFromRepresentationMap("oci_apigateway_apis", "test_apis", Optional, Update, apiDataSourceRepresentation) +
174174
compartmentIdVariableStr + ApiResourceDependencies +
175175
generateResourceFromRepresentationMap("oci_apigateway_api", "test_api", Optional, Update, apiRepresentation),
176-
Check: resource.ComposeAggregateTestCheckFunc(
176+
Check: ComposeAggregateTestCheckFuncWrapper(
177177
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
178178
resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
179179
resource.TestCheckResourceAttr(datasourceName, "state", "ACTIVE"),
@@ -186,7 +186,7 @@ func TestApigatewayApiResource_basic(t *testing.T) {
186186
Config: config +
187187
generateDataSourceFromRepresentationMap("oci_apigateway_api", "test_api", Required, Create, apiSingularDataSourceRepresentation) +
188188
compartmentIdVariableStr + ApiResourceConfig,
189-
Check: resource.ComposeAggregateTestCheckFunc(
189+
Check: ComposeAggregateTestCheckFuncWrapper(
190190
resource.TestCheckResourceAttrSet(singularDatasourceName, "api_id"),
191191

192192
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),

‎oci/apigateway_api_validation_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestApigatewayApiValidationResource_basic(t *testing.T) {
4747
Config: config +
4848
generateDataSourceFromRepresentationMap("oci_apigateway_api_validation", "test_api_validation", Required, Create, apiValidationSingularDataSourceRepresentation) +
4949
compartmentIdVariableStr + ApiValidationResourceConfig,
50-
Check: resource.ComposeAggregateTestCheckFunc(
50+
Check: ComposeAggregateTestCheckFuncWrapper(
5151
resource.TestCheckResourceAttrSet(singularDatasourceName, "api_id"),
5252

5353
// there can be more validations done. Testing 1 which there will be always.

0 commit comments

Comments
 (0)