Skip to content

Commit ace22fd

Browse files
committed
Fix unit test. Add DELETE and PUT method with response
1 parent 615bce8 commit ace22fd

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

  • AndroidAnnotations
    • androidannotations/src/test/java/org/androidannotations/rest
    • functional-test-1-5/src/main/java/org/androidannotations/test15/rest

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/rest/RestTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,18 @@ public void client_no_internet_permission_does_not_compile() throws IOException
4646
@Test
4747
public void client_with_return_type() throws IOException {
4848
CompileResult result = compileFiles(ClientWithResponseEntity.class);
49-
assertCompilationErrorOn(ClientWithResponseEntity.class, "@Put", result);
50-
assertCompilationErrorOn(ClientWithResponseEntity.class, "@Delete", result);
5149
assertCompilationErrorOn(ClientWithResponseEntity.class, "@Options", result);
5250
assertCompilationErrorOn(ClientWithResponseEntity.class, "@Head", result);
53-
assertCompilationErrorCount(4, result);
51+
assertCompilationErrorCount(2, result);
5452
}
5553

5654
@Test
5755
public void client_with_request_entity() throws IOException {
5856
CompileResult result = compileFiles(ClientWithRequestEntity.class);
59-
assertCompilationErrorOn(ClientWithRequestEntity.class, "@Delete", result);
6057
assertCompilationErrorOn(ClientWithRequestEntity.class, "@Get", result);
6158
assertCompilationErrorOn(ClientWithRequestEntity.class, "@Head", result);
6259
assertCompilationErrorOn(ClientWithRequestEntity.class, "@Options", result);
63-
assertCompilationErrorCount(4, result);
60+
assertCompilationErrorCount(3, result);
6461
}
6562

6663
@Test

‎AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyService.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,16 +191,22 @@ ResponseEntity<Event[][]> getEventsArrayOfArrays2(String location, int year)
191191

192192
@Put("/events/{id}")
193193
void updateEvent(Event event, int id);
194-
194+
195195
@Put("/events/{date}")
196196
void updateEvent(long date);
197197

198+
@Put("/events/{date}")
199+
Event updateEventWithResponse(long date);
200+
198201
// *** DELETE ***
199202

200203
// url variables are mapped to method parameter names.
201204
@Delete("/events/{id}")
202205
void removeEvent(long id);
203206

207+
@Put("/events/{id}")
208+
Event removeEventWithRespons(long id);
209+
204210
// *** HEAD ***
205211

206212
@Head("/events/{year}/{location}")

0 commit comments

Comments
 (0)