From 8fafca6044e436690db0e1739c0b37d08c900074 Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter.kurfer@fh-rosenheim.de>
Date: Mon, 25 Dec 2017 16:34:19 +0100
Subject: [PATCH] Updated unit tests and fixed method naming
---
.../fhro/inf/prg3/a11/openmensa/OpenMensaAPI.java | 2 +-
.../inf/prg3/a11/tests/OpenMensaApiTests.java | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/de/fhro/inf/prg3/a11/openmensa/OpenMensaAPI.java b/src/main/java/de/fhro/inf/prg3/a11/openmensa/OpenMensaAPI.java
index bcd2040..ba15e54 100644
--- a/src/main/java/de/fhro/inf/prg3/a11/openmensa/OpenMensaAPI.java
+++ b/src/main/java/de/fhro/inf/prg3/a11/openmensa/OpenMensaAPI.java
@@ -40,7 +40,7 @@ public interface OpenMensaAPI {
* @return state of the mensa - may be closed or !closed
*/
@GET("canteens/{canteenId}/days/{date}")
- CompletableFuture<State> getMensaState(@Path("canteenId") int canteenId, @Path("date") String date);
+ CompletableFuture<State> getCanteenState(@Path("canteenId") int canteenId, @Path("date") String date);
/**
* Retrieve the meals for specified date served at canteen specified by its id
diff --git a/src/test/java/de/fhro/inf/prg3/a11/tests/OpenMensaApiTests.java b/src/test/java/de/fhro/inf/prg3/a11/tests/OpenMensaApiTests.java
index 4ad44f2..e17b6c9 100644
--- a/src/test/java/de/fhro/inf/prg3/a11/tests/OpenMensaApiTests.java
+++ b/src/test/java/de/fhro/inf/prg3/a11/tests/OpenMensaApiTests.java
@@ -6,6 +6,7 @@ import de.fhro.inf.prg3.a11.openmensa.model.Canteen;
import de.fhro.inf.prg3.a11.openmensa.model.PageInfo;
import de.fhro.inf.prg3.a11.openmensa.model.State;
import org.junit.jupiter.api.Test;
+import retrofit2.HttpException;
import retrofit2.Response;
import java.text.SimpleDateFormat;
@@ -61,12 +62,18 @@ class OpenMensaApiTests {
}
@Test
- void testGetMensaState() throws ExecutionException, InterruptedException {
- State mensaState = openMensaAPI.getMensaState(FHRO_MENSA_ID, dateFormat.format(calendar.getTime())).get();
-
- assertNotNull(mensaState);
+ void testGetCanteenState() throws InterruptedException {
+ try {
+ State mensaState = openMensaAPI.getCanteenState(FHRO_MENSA_ID, dateFormat.format(calendar.getTime())).get();
+ assertNotNull(mensaState);
+ }catch (ExecutionException e) {
+ if(e.getCause() instanceof HttpException) {
+ System.out.println(String.format("HTTP error: %s", e.getCause().getMessage()));
+ }
+ }
}
+
@Test
void testGetMultiplePages() throws ExecutionException, InterruptedException {
Response<List<Canteen>> firstPage = openMensaAPI.getCanteens().get();
--
GitLab