Skip to content

Commit 3e1fc2d

Browse files
Ashi1993Ashi1993
authored
Merge pull request #842 from malshaniS/apim460
[Accelerator 4] - Fix Schema Validation Errors
2 parents a2da4a5 + 3852161 commit 3e1fc2d

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎fs-integration-test-suite/accelerator-tests/gateway-tests/schema.validation/src/test/groovy/org/wso2/financial/services/accelerator/gateway/integration/test/schema/validation/request_payload_validation/AccountsRequestPayloadValidationTest.groovy‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ class AccountsRequestPayloadValidationTest extends FSAPIMConnectorTest {
7373
Assert.assertEquals(consentResponse.statusCode(), ConnectorTestConstants.STATUS_CODE_400)
7474
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_MSG),
7575
ConnectorTestConstants.ERROR_CODE_BAD_REQUEST)
76-
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION),
76+
Assert.assertTrue(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION).contains(
7777
"Schema validation failed in the Request: [Path '/Data'] Object has missing required " +
78-
"properties ([\"Permissions\"])")
78+
"properties ([\"Permissions\"])"))
7979
}
8080

8181
@Test
@@ -86,8 +86,8 @@ class AccountsRequestPayloadValidationTest extends FSAPIMConnectorTest {
8686
Assert.assertEquals(consentResponse.statusCode(), ConnectorTestConstants.STATUS_CODE_400)
8787
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_MSG),
8888
ConnectorTestConstants.ERROR_CODE_BAD_REQUEST)
89-
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION),
90-
"Schema validation failed in the Request: Object has missing required properties ([\"Data\",\"Risk\"])")
89+
Assert.assertTrue(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION).contains(
90+
"Schema validation failed in the Request: Object has missing required properties ([\"Data\",\"Risk\"])"))
9191
}
9292

9393
@Test
@@ -98,9 +98,9 @@ class AccountsRequestPayloadValidationTest extends FSAPIMConnectorTest {
9898
Assert.assertEquals(consentResponse.statusCode(), ConnectorTestConstants.STATUS_CODE_400)
9999
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_MSG),
100100
ConnectorTestConstants.ERROR_CODE_BAD_REQUEST)
101-
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION),
101+
Assert.assertTrue(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION).contains(
102102
"Schema validation failed in the Request: Instance type (array) does not match any allowed " +
103-
"primitive type (allowed: [\"object\"])")
103+
"primitive type (allowed: [\"object\"])"))
104104
}
105105

106106
@Test
@@ -112,8 +112,8 @@ class AccountsRequestPayloadValidationTest extends FSAPIMConnectorTest {
112112
Assert.assertEquals(consentResponse.getStatusCode(), ConnectorTestConstants.STATUS_CODE_400)
113113
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_MSG),
114114
ConnectorTestConstants.ERROR_CODE_BAD_REQUEST)
115-
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION),
116-
"Schema validation failed in the Request: Object has missing required properties ([\"Data\"])")
115+
Assert.assertTrue(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION).contains(
116+
"Schema validation failed in the Request: Object has missing required properties ([\"Data\"])"))
117117
}
118118

119119
@Test
@@ -125,8 +125,8 @@ class AccountsRequestPayloadValidationTest extends FSAPIMConnectorTest {
125125
Assert.assertEquals(consentResponse.getStatusCode(), ConnectorTestConstants.STATUS_CODE_400)
126126
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_MSG),
127127
ConnectorTestConstants.ERROR_CODE_BAD_REQUEST)
128-
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION),
129-
"Schema validation failed in the Request: A request body is required but none found.")
128+
Assert.assertTrue(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION).contains(
129+
"Schema validation failed in the Request: A request body is required but none found."))
130130
}
131131

132132
@Test
@@ -138,10 +138,10 @@ class AccountsRequestPayloadValidationTest extends FSAPIMConnectorTest {
138138
Assert.assertEquals(consentResponse.getStatusCode(), ConnectorTestConstants.STATUS_CODE_400)
139139
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_MSG),
140140
ConnectorTestConstants.ERROR_CODE_BAD_REQUEST)
141-
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION),
141+
Assert.assertTrue(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION).contains(
142142
"Schema validation failed in the Request: [Path '/Data/Permissions/0'] Instance value " +
143143
"(\"ReadAccountsDetails\") not found in enum (possible values: [\"ReadAccountsBasic\"," +
144-
"\"ReadAccountsDetail\",\"ReadBalances\",\"ReadTransactionsDetail\"])")
144+
"\"ReadAccountsDetail\",\"ReadBalances\",\"ReadTransactionsDetail\"])"))
145145
}
146146

147147
@Test
@@ -153,9 +153,9 @@ class AccountsRequestPayloadValidationTest extends FSAPIMConnectorTest {
153153
Assert.assertEquals(consentResponse.getStatusCode(), ConnectorTestConstants.STATUS_CODE_400)
154154
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_MSG),
155155
ConnectorTestConstants.ERROR_CODE_BAD_REQUEST)
156-
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION),
156+
Assert.assertTrue(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION).contains(
157157
"Schema validation failed in the Request: [Path '/Data/Permissions'] Array is too short: must have " +
158-
"at least 1 elements but instance has 0 elements")
158+
"at least 1 elements but instance has 0 elements"))
159159
}
160160

161161
@Test
@@ -167,9 +167,9 @@ class AccountsRequestPayloadValidationTest extends FSAPIMConnectorTest {
167167
Assert.assertEquals(consentResponse.getStatusCode(), ConnectorTestConstants.STATUS_CODE_400)
168168
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_MSG),
169169
ConnectorTestConstants.ERROR_CODE_BAD_REQUEST)
170-
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION),
170+
Assert.assertTrue(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION).contains(
171171
"Schema validation failed in the Request: [Path '/Data/Permissions'] Instance type (string) does " +
172-
"not match any allowed primitive type (allowed: [\"array\"])")
172+
"not match any allowed primitive type (allowed: [\"array\"])"))
173173
}
174174

175175
@Test

‎fs-integration-test-suite/accelerator-tests/gateway-tests/schema.validation/src/test/groovy/org/wso2/financial/services/accelerator/gateway/integration/test/schema/validation/request_payload_validation/PaymentRequestPayloadValidationTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ class PaymentRequestPayloadValidationTest extends FSAPIMConnectorTest {
111111
Assert.assertEquals(consentResponse.statusCode(), ConnectorTestConstants.BAD_REQUEST)
112112
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_MSG),
113113
ConnectorTestConstants.ERROR_CODE_BAD_REQUEST)
114-
Assert.assertEquals(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION),
114+
Assert.assertTrue(TestUtil.parseResponseBody(consentResponse, ConnectorTestConstants.ERROR_ERRORS_DESCRIPTION).contains(
115115
"Schema validation failed in the Request: [Path '/Data/Initiation/InstructedAmount/Currency'] ECMA " +
116-
"262 regex \"^[A-Z]{3,3}\$\" does not match input string \"RUPEE\"")
116+
"262 regex \"^[A-Z]{3,3}\$\" does not match input string \"RUPEE\""))
117117
}
118118

119119
@Test

0 commit comments

Comments
 (0)