update the model

wso2 · Jan 8, 2024 · e7cdcc7 · e7cdcc7
1 parent bc605fd
commit e7cdcc7
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 92 deletions.
diff --git a/...tity/integration/test/rest/api/server/validation/rules/v1/ValidationRulesSuccessTest.java b/...tity/integration/test/rest/api/server/validation/rules/v1/ValidationRulesSuccessTest.java
@@ -79,29 +79,8 @@ public void testDefaultResponse() throws Exception {
  "Response of the get /validation-rules doesn't match.");
  }
 
- @Test (description = "test put email type user name validation update", dependsOnMethods = "testDefaultResponse")
- public void testEnableEmailTypeUserNameValidation() throws Exception {
-
- ObjectMapper jsonWriter = new ObjectMapper(new JsonFactory());
- String emailTypeValidationRequestBody
- = readResource("put-enable-email-type-username-validation-positive.json");
-
- Response responseOfPut = getResponseOfPut(VALIDATION_RULES_PATH, emailTypeValidationRequestBody);
- responseOfPut.then()
- .log().ifValidationFails()
- .assertThat()
- .statusCode(HttpStatus.SC_OK);
- List<ValidationConfigModel> retrievedValidationConfigModels =
- Arrays.asList(jsonWriter.readValue(responseOfPut.asString(), ValidationConfigModel[].class));
- Assert.assertEquals(retrievedValidationConfigModels.get(1).getField(), "username",
- "Response of the put /validation-rules doesn't contain username filed.");
- Assert.assertEquals(retrievedValidationConfigModels.get(1).getRules().get(0).getValidator(),
- "EmailFormatValidator",
- "Response of the put /validation-rules doesn't contain email as username validator.");
- }
-
  @Test (description = "test for put /validation-rules/password end point",
- dependsOnMethods = "testEnableEmailTypeUserNameValidation")
+ dependsOnMethods = "testDefaultResponse")
  public void testUpdatePasswordValidation() throws Exception {
 
  ObjectMapper jsonWriter = new ObjectMapper(new JsonFactory());
@@ -121,8 +100,27 @@ public void testUpdatePasswordValidation() throws Exception {
  RuleModel ruleModel = new RuleModel();
  ruleModel.setValidator("LengthValidator");
  ruleModel.addPropertiesItem(new MappingModel().key("min.length").value("10"));
+ ruleModel.addPropertiesItem(new MappingModel().key("max.length").value("30"));
  Assert.assertTrue(retrievedValidationConfigModel.getRules().contains(ruleModel),
  "Response of the put /validation-rules/password doesn't contain 10 as min length.");
+
+ ruleModel = new RuleModel();
+ ruleModel.setValidator("UpperCaseValidator");
+ ruleModel.addPropertiesItem(new MappingModel().key("min.length").value("0"));
+ Assert.assertTrue(retrievedValidationConfigModel.getRules().contains(ruleModel),
+ "Response of the put /validation-rules/password doesn't contain 0 as UpperCaseValidator.");
+
+ ruleModel = new RuleModel();
+ ruleModel.setValidator("LowerCaseValidator");
+ ruleModel.addPropertiesItem(new MappingModel().key("min.length").value("0"));
+ Assert.assertTrue(retrievedValidationConfigModel.getRules().contains(ruleModel),
+ "Response of the put /validation-rules/password doesn't contain 0 as LowerCaseValidator.");
+
+ ruleModel = new RuleModel();
+ ruleModel.setValidator("SpecialCharacterValidator");
+ ruleModel.addPropertiesItem(new MappingModel().key("min.length").value("0"));
+ Assert.assertTrue(retrievedValidationConfigModel.getRules().contains(ruleModel),
+ "Response of the put /validation-rules/password doesn't contain 0 as SpecialCharacterValidator.");
  }
 
  @Test (description = "Test to set configuration to default.",dependsOnMethods = "testUpdatePasswordValidation")

diff --git a/...ntity/integration/test/rest/api/server/validation/rules/v1/default-response-positive.json b/...ntity/integration/test/rest/api/server/validation/rules/v1/default-response-positive.json
@@ -11,6 +11,15 @@
  }
  ]
  },
+ {
+ "validator": "LengthValidator",
+ "properties": [
+ {
+ "key": "max.length",
+ "value": "30"
+ }
+ ]
+ },
  {
  "validator": "NumeralValidator",
  "properties": [

diff --git a/...st/api/server/validation/rules/v1/put-enable-email-type-username-validation-positive.json b/...st/api/server/validation/rules/v1/put-enable-email-type-username-validation-positive.json
diff --git a/...ion/test/rest/api/server/validation/rules/v1/put-password-validation-update-positive.json b/...ion/test/rest/api/server/validation/rules/v1/put-password-validation-update-positive.json
@@ -9,6 +9,15 @@
  }
  ]
  },
+ {
+ "validator": "LengthValidator",
+ "properties": [
+ {
+ "key": "max.length",
+ "value": "30"
+ }
+ ]
+ },
  {
  "validator": "NumeralValidator",
  "properties": [
@@ -23,7 +32,7 @@
  "properties": [
  {
  "key": "min.length",
- "value": "1"
+ "value": "0"
  }
  ]
  },
@@ -32,7 +41,7 @@
  "properties": [
  {
  "key": "min.length",
- "value": "1"
+ "value": "0"
  }
  ]
  },
@@ -41,7 +50,7 @@
  "properties": [
  {
  "key": "min.length",
- "value": "1"
+ "value": "0"
  }
  ]
  }

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml
@@ -215,7 +215,6 @@
  <class name="org.wso2.identity.integration.test.rest.api.server.organization.management.v1.OrganizationManagementSuccessTest"/>
  <class name="org.wso2.identity.integration.test.rest.api.server.validation.rules.v1.ValidationRulesSuccessTest"/>
  <class name="org.wso2.identity.integration.test.rest.api.server.validation.rules.v1.ValidationRulesNegativeTest"/>
- <class name="org.wso2.identity.integration.test.rest.api.server.validation.rules.v1.ValidationRulesTestBase"/>
  </classes>
  </test>