Skip to content

Commit f091028

Browse files
test(pagination): sonarcube refactor(14)
1 parent f8d72bb commit f091028

2 files changed

Lines changed: 25 additions & 23 deletions

File tree

src/test/java/apimatic/core/RequestBuilderTest.java

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -131,43 +131,44 @@ public void setup() throws IOException {
131131

132132
@Test
133133
public void testUpdatePathParam() throws IOException {
134-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
134+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
135135
.templateParam(param -> param.key("temp").value(false));
136136

137-
updateAndVerify(requestBuilder, "$request.path#/temp", false, true);
137+
updateAndVerify(localRequestBuilder, "$request.path#/temp", false, true);
138138
}
139139

140+
140141
@Test
141142
public void testUpdatePathParamArray() throws IOException {
142-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
143+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
143144
.templateParam(param -> param.key("temp")
144145
.value(new String[] { "apple", "banana", "cherry" }));
145146

146-
updateAndVerify(requestBuilder, "$request.path#/temp/1", "banana", "mango");
147+
updateAndVerify(localRequestBuilder, "$request.path#/temp/1", "banana", "mango");
147148
}
148149

149150
@Test
150151
public void testUpdateSimpleFormParam() throws IOException {
151-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
152+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
152153
.formParam(param -> param.key("form").value(true));
153154

154-
updateAndVerify(requestBuilder, "$request.body#/form", true, false);
155+
updateAndVerify(localRequestBuilder, "$request.body#/form", true, false);
155156
}
156157

157158
@Test
158159
public void testUpdateComplexFormParam() throws IOException {
159-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
160+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
160161
.formParam(param -> param.key("form").value(new Atom(12, 12)));
161162

162-
updateAndVerify(requestBuilder, "$request.body#/form/NumberOfElectrons", 12, 14);
163+
updateAndVerify(localRequestBuilder, "$request.body#/form/NumberOfElectrons", 12, 14);
163164
}
164165

165166
@Test
166167
public void testUpdateSimpleQueryParam() throws IOException {
167-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
168+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
168169
.queryParam(param -> param.key("que").value(234L));
169170

170-
updateAndVerify(requestBuilder, "$request.query#/que", 234L, 254L);
171+
updateAndVerify(localRequestBuilder, "$request.query#/que", 234L, 254L);
171172
}
172173

173174
@Test
@@ -180,52 +181,52 @@ public void testUpdateComplexQueryParam() throws IOException {
180181

181182
@Test
182183
public void testUpdateSimpleHeaderParam() throws IOException {
183-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
184+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
184185
.headerParam(param -> param.key("head").value(2.14));
185186

186-
updateAndVerify(requestBuilder, "$request.headers#/head", 2.14, 19.95);
187+
updateAndVerify(localRequestBuilder, "$request.headers#/head", 2.14, 19.95);
187188
}
188189

189190
@Test
190191
public void testUpdateComplexHeaderParam() throws IOException {
191-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
192+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.GET)
192193
.headerParam(param -> param.key("head").value(new Atom(12, 12)));
193194

194-
updateAndVerify(requestBuilder, "$request.headers#/head/NumberOfElectrons", 12, 14);
195+
updateAndVerify(localRequestBuilder, "$request.headers#/head/NumberOfElectrons", 12, 14);
195196
}
196197

197198
@Test
198199
public void testUpdateMultipleBodyParams() throws IOException {
199-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.POST)
200+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.POST)
200201
.bodyParam(param -> param.key("bodyA").value("bodyValue"))
201202
.bodyParam(param -> param.key("bodyB").value("bodyValue"));
202203

203-
updateAndVerify(requestBuilder, "$request.body#/bodyB", "bodyValue", "ValueB");
204+
updateAndVerify(localRequestBuilder, "$request.body#/bodyB", "bodyValue", "ValueB");
204205
}
205206

206207
@Test
207208
public void testUpdateComplexBodyParam() throws IOException {
208-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.POST)
209+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.POST)
209210
.bodyParam(param -> param.value(new Atom(23, 24)));
210211

211-
updateAndVerify(requestBuilder, "$request.body#/NumberOfElectrons", 23, 24);
212+
updateAndVerify(localRequestBuilder, "$request.body#/NumberOfElectrons", 23, 24);
212213
}
213214

214215
@Test
215216
public void testUpdateMultipleComplexBodyParams() throws IOException {
216-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.POST)
217+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.POST)
217218
.bodyParam(param -> param.key("bodyA").value(new Atom(2, 4)))
218219
.bodyParam(param -> param.key("bodyB").value(new Atom(4, 2)));
219220

220-
updateAndVerify(requestBuilder, "$request.body#/bodyB/NumberOfElectrons", 4, 8);
221+
updateAndVerify(localRequestBuilder, "$request.body#/bodyB/NumberOfElectrons", 4, 8);
221222
}
222223

223224
@Test
224225
public void testUpdateSimpleBodyParam() throws IOException {
225-
HttpRequest.Builder requestBuilder = new HttpRequest.Builder().httpMethod(Method.POST)
226+
HttpRequest.Builder localRequestBuilder = new HttpRequest.Builder().httpMethod(Method.POST)
226227
.bodyParam(param -> param.value("BodyValue"));
227228

228-
updateAndVerify(requestBuilder, "$request.body", "BodyValue", "new Value");
229+
updateAndVerify(localRequestBuilder, "$request.body", "BodyValue", "new Value");
229230
}
230231

231232
private void updateAndVerify(HttpRequest.Builder requestBuilder, String pointer, Object oldValue, Object newValue) {

src/test/java/apimatic/core/type/pagination/PaginatedDataTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public PaginatedDataTest(String responseBody) {
9797
}
9898

9999
@Test
100-
public void testInvalidPagination() throws IOException, CoreApiException {
100+
public void testInvalidPagination() throws IOException {
101101
Runnable call1 = () -> when(response.getBody()).thenReturn(responseBody);
102102
PaginatedData<String, PageWrapper<String, RecordPage>,
103103
RecordPage, CoreApiException> paginatedData = getPaginatedData(call1, null, null,
@@ -451,6 +451,7 @@ else if (callNumber == 3) {
451451
}
452452
@Override
453453
public void onAfterResponse(Context context) {
454+
// Does nothing
454455
}
455456
};
456457
return new ApiCall.Builder<RecordPage, CoreApiException>()

0 commit comments

Comments
 (0)