Skip to content

Commit 0027df0

Browse files
committed
Fixed Sonaq warning
1 parent 3058df6 commit 0027df0

1 file changed

Lines changed: 11 additions & 24 deletions

File tree

api-project/src/test/java/org/opendevstack/apiservice/project/validation/ProjectRequestValidatorTest.java

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import org.junit.jupiter.api.BeforeEach;
44
import org.junit.jupiter.api.Test;
5+
import org.junit.jupiter.params.ParameterizedTest;
6+
import org.junit.jupiter.params.provider.CsvSource;
57
import org.opendevstack.apiservice.project.exception.ErrorKey;
68
import org.opendevstack.apiservice.project.exception.ProjectValidationException;
79
import org.opendevstack.apiservice.project.model.CreateProjectRequest;
@@ -49,32 +51,17 @@ void validate_throws_exception_when_project_flavor_and_config_item_both_empty()
4951
assertEquals(ErrorKey.BAD_REQUEST_FLAVOR_CONFIG_ITEM, exception.getErrorKey());
5052
}
5153

52-
@Test
53-
void validate_succeeds_when_project_flavor_provided() {
54-
CreateProjectRequest request = new CreateProjectRequest();
55-
request.setProjectName("Valid Name");
56-
request.setProjectFlavor("STANDARD");
57-
request.setConfigurationItem(null);
58-
59-
assertDoesNotThrow(() -> sut.validate(request));
60-
}
61-
62-
@Test
63-
void validate_succeeds_when_config_item_provided() {
54+
@ParameterizedTest
55+
@CsvSource({
56+
"STANDARD, null",
57+
"null, JIRA",
58+
"STANDARD, JIRA"
59+
})
60+
void validate_succeeds_when_flavor_or_config_item_provided(String projectFlavor, String configurationItem) {
6461
CreateProjectRequest request = new CreateProjectRequest();
6562
request.setProjectName("Valid Name");
66-
request.setProjectFlavor(null);
67-
request.setConfigurationItem("JIRA");
68-
69-
assertDoesNotThrow(() -> sut.validate(request));
70-
}
71-
72-
@Test
73-
void validate_succeeds_when_both_flavor_and_config_item_provided() {
74-
CreateProjectRequest request = new CreateProjectRequest();
75-
request.setProjectName("Valid Name");
76-
request.setProjectFlavor("STANDARD");
77-
request.setConfigurationItem("JIRA");
63+
request.setProjectFlavor("null".equals(projectFlavor) ? null : projectFlavor);
64+
request.setConfigurationItem("null".equals(configurationItem) ? null : configurationItem);
7865

7966
assertDoesNotThrow(() -> sut.validate(request));
8067
}

0 commit comments

Comments
 (0)