ZhouXY108
/
wisemapping-open-source
mirror of https://github.com/wisemapping/wisemapping-open-source.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix label test.

main
Paulo Gustavo Veiga 2024-01-23 22:31:46 -08:00
parent 740da238fa
commit 1059643b0f
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/java/com/wisemapping/model/Label.java
View File

@ -90,7 +90,7 @@ public class Label implements Serializable {
return color;
}
public void setColor(@NotNull String color) {
public void setColor(String color) {
this.color = color;
}

2
wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java
View File

@ -56,7 +56,7 @@ public class RestLabel {
label.setTitle(title);
}
public void setColor(@NotNull final String color) {
public void setColor(final String color) {
label.setColor(color);
}

17
wise-webapp/src/main/java/com/wisemapping/validator/LabelValidator.java
View File

@ -63,18 +63,13 @@ public class LabelValidator implements Validator {
title,
Constants.MAX_LABEL_NAME_LENGTH);
ValidatorUtils.rejectIfEmptyOrWhitespace(
errors,
"title",
"Label title can not be empty",
title);
final User user = com.wisemapping.security.Utils.getUser();
assert user != null;
final Label foundLabel = service.getLabelByTitle(title, user);
if (foundLabel != null) {
errors.rejectValue("title", Messages.LABEL_TITLE_ALREADY_EXISTS);
if (user != null && title != null) {
final Label foundLabel = service.getLabelByTitle(title, user);
if (foundLabel != null) {
errors.rejectValue("title", Messages.LABEL_TITLE_ALREADY_EXISTS);
}
}
}
}

4
wise-webapp/src/test/java/com/wisemapping/test/rest/RestLabelControllerTest.java
View File

@ -94,14 +94,14 @@ public class RestLabelControllerTest {
addNewLabel(requestHeaders, restTemplate, null, COLOR);
fail("Wrong response");
} catch (IllegalStateException e) {
assertTrue(e.getMessage().contains("Required field cannot be left blank"));
assertTrue(e.getMessage().contains("Required field cannot be left blank"), e.getMessage());
}
try {
addNewLabel(requestHeaders, restTemplate, "title12345", null);
fail("Wrong response");
} catch (IllegalStateException e) {
assertTrue(e.getMessage().contains("Required field cannot be left blank"));
assertTrue(e.getMessage().contains("Required field cannot be left blank"), e.getMessage());
}
}