|
2 | 2 |
|
3 | 3 | import org.junit.jupiter.api.BeforeEach; |
4 | 4 | import org.junit.jupiter.api.Test; |
| 5 | +import org.junit.jupiter.params.ParameterizedTest; |
| 6 | +import org.junit.jupiter.params.provider.CsvSource; |
5 | 7 | import org.opendevstack.apiservice.project.exception.ErrorKey; |
6 | 8 | import org.opendevstack.apiservice.project.exception.ProjectValidationException; |
7 | 9 | import org.opendevstack.apiservice.project.model.CreateProjectRequest; |
@@ -49,32 +51,17 @@ void validate_throws_exception_when_project_flavor_and_config_item_both_empty() |
49 | 51 | assertEquals(ErrorKey.BAD_REQUEST_FLAVOR_CONFIG_ITEM, exception.getErrorKey()); |
50 | 52 | } |
51 | 53 |
|
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) { |
64 | 61 | CreateProjectRequest request = new CreateProjectRequest(); |
65 | 62 | 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); |
78 | 65 |
|
79 | 66 | assertDoesNotThrow(() -> sut.validate(request)); |
80 | 67 | } |
|
0 commit comments