Skip to content

Commit 113f37c

Browse files
committed
simplify test code by extracting methods
1 parent b511080 commit 113f37c

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

openapi-validation-core/src/test/java/com/getyourguide/openapi/validation/core/OpenApiRequestValidatorTest.java

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,15 @@ public void testWhenEncodedQueryParamIsPassedThenValidationShouldHappenWithQuery
8484
@Test
8585
@DisplayName("When violation is excluded then it should not be returned")
8686
public void testWhenViolationIsExcludedThenItShouldNotBeReturned() {
87-
var uri = URI.create("https://api.example.com/path");
88-
var request = new RequestMetaData("GET", uri, new HashMap<>());
87+
;
8988
var validationReport = mock(ValidationReport.class);
9089
when(validator.validateRequest(any())).thenReturn(validationReport);
9190
var violationExcluded = mock(OpenApiViolation.class);
9291
var violations = List.of(violationExcluded, mock(OpenApiViolation.class));
9392
when(mapper.map(any(), any(), any(), any(), any())).thenReturn(violations);
9493
when(internalViolationExclusions.isExcluded(violationExcluded)).thenReturn(true);
9594

96-
var result = openApiRequestValidator.validateRequestObject(request, null);
95+
var result = openApiRequestValidator.validateRequestObject(createRequest(), null);
9796

9897
assertEquals(1, result.size());
9998
assertEquals(violations.get(1), result.getFirst());
@@ -102,40 +101,37 @@ public void testWhenViolationIsExcludedThenItShouldNotBeReturned() {
102101
@Test
103102
@DisplayName("When violation has log level IGNORE then it should not be returned")
104103
public void testWhenRequestViolationHasLogLevelIgnoreThenItShouldNotBeReturned() {
105-
var request = createRequest("/path");
106104
var violationIgnored = createViolation(LogLevel.IGNORE);
107105
var violationError = createViolation(LogLevel.ERROR);
108106
mockRequestValidation(List.of(violationIgnored, violationError));
109107

110-
var result = openApiRequestValidator.validateRequestObject(request, null);
108+
var result = openApiRequestValidator.validateRequestObject(createRequest(), null);
111109

112110
assertSingleViolationReturned(result, violationError);
113111
}
114112

115113
@Test
116114
@DisplayName("When violation has log level IGNORE and another is excluded then both should not be returned")
117115
public void testWhenRequestViolationHasLogLevelIgnoreAndIsExcludedThenItShouldNotBeReturned() {
118-
var request = createRequest("/path");
119116
var violationIgnored = createViolation(LogLevel.IGNORE);
120117
var violationExcluded = createViolation(LogLevel.WARN);
121118
when(internalViolationExclusions.isExcluded(violationExcluded)).thenReturn(true);
122119
var violationError = createViolation(LogLevel.ERROR);
123120
mockRequestValidation(List.of(violationIgnored, violationExcluded, violationError));
124121

125-
var result = openApiRequestValidator.validateRequestObject(request, null);
122+
var result = openApiRequestValidator.validateRequestObject(createRequest(), null);
126123

127124
assertSingleViolationReturned(result, violationError);
128125
}
129126

130127
@Test
131128
@DisplayName("When all violations are ignored then empty list is returned")
132129
public void testWhenAllRequestViolationsAreIgnoredThenEmptyListIsReturned() {
133-
var request = createRequest("/path");
134130
var violation1 = createViolation(LogLevel.IGNORE);
135131
var violation2 = createViolation(LogLevel.IGNORE);
136132
mockRequestValidation(List.of(violation1, violation2));
137133

138-
var result = openApiRequestValidator.validateRequestObject(request, null);
134+
var result = openApiRequestValidator.validateRequestObject(createRequest(), null);
139135

140136
assertNoViolationsReturned(result);
141137
}
@@ -148,46 +144,46 @@ class ValidateResponseObjectTests {
148144
@Test
149145
@DisplayName("When violation has log level IGNORE then it should not be returned")
150146
public void testWhenResponseViolationHasLogLevelIgnoreThenItShouldNotBeReturned() {
151-
var request = createRequest("/path");
152-
var response = createResponse();
153147
var violationIgnored = createViolation(LogLevel.IGNORE);
154148
var violationWarn = createViolation(LogLevel.WARN);
155149
mockResponseValidation(List.of(violationIgnored, violationWarn));
156150

157-
var result = openApiRequestValidator.validateResponseObject(request, response, null);
151+
var result = executeValidateResponseObject();
158152

159153
assertSingleViolationReturned(result, violationWarn);
160154
}
161155

162156
@Test
163157
@DisplayName("When violation has log level IGNORE and another is excluded then both should not be returned")
164158
public void testWhenResponseViolationHasLogLevelIgnoreAndIsExcludedThenItShouldNotBeReturned() {
165-
var request = createRequest("/path");
166-
var response = createResponse();
167159
var violationIgnored = createViolation(LogLevel.IGNORE);
168160
var violationExcluded = createViolation(LogLevel.INFO);
169161
when(internalViolationExclusions.isExcluded(violationExcluded)).thenReturn(true);
170162
var violationError = createViolation(LogLevel.ERROR);
171163
mockResponseValidation(List.of(violationIgnored, violationExcluded, violationError));
172164

173-
var result = openApiRequestValidator.validateResponseObject(request, response, null);
165+
var result = executeValidateResponseObject();
174166

175167
assertSingleViolationReturned(result, violationError);
176168
}
177169

178170
@Test
179171
@DisplayName("When all violations are ignored then empty list is returned")
180172
public void testWhenAllResponseViolationsAreIgnoredThenEmptyListIsReturned() {
181-
var request = createRequest("/path");
182-
var response = createResponse();
183173
var violation1 = createViolation(LogLevel.IGNORE);
184174
var violation2 = createViolation(LogLevel.IGNORE);
185175
mockResponseValidation(List.of(violation1, violation2));
186176

187-
var result = openApiRequestValidator.validateResponseObject(request, response, null);
177+
var result = executeValidateResponseObject();
188178

189179
assertNoViolationsReturned(result);
190180
}
181+
182+
private List<OpenApiViolation> executeValidateResponseObject() {
183+
var request = createRequest();
184+
var response = createResponse();
185+
return openApiRequestValidator.validateResponseObject(request, response, null);
186+
}
191187
}
192188

193189
private void verifyQueryParamValueEquals(
@@ -205,8 +201,8 @@ private OpenApiViolation createViolation(LogLevel level) {
205201
return violation;
206202
}
207203

208-
private RequestMetaData createRequest(String path) {
209-
var uri = URI.create("https://api.example.com" + path);
204+
private RequestMetaData createRequest() {
205+
var uri = URI.create("https://api.example.com/path");
210206
return new RequestMetaData("GET", uri, new HashMap<>());
211207
}
212208

0 commit comments

Comments
 (0)