# HG changeset patch # User Ludwig Reiter # Date 1374835756 -7200 # Node ID 758a12cd0dd55b2bf083253bfdfd3c529ec284f7 # Parent 2a8d816610c4abb8387774a69ba326c2520d62eb Add tests for findById cases. Check mostly for 404 because only proben has a findById interface. diff -r 2a8d816610c4 -r 758a12cd0dd5 src/main/java/de/intevation/lada/test/RestEasyClient.java --- a/src/main/java/de/intevation/lada/test/RestEasyClient.java Fri Jul 26 12:23:18 2013 +0200 +++ b/src/main/java/de/intevation/lada/test/RestEasyClient.java Fri Jul 26 12:49:16 2013 +0200 @@ -8,7 +8,7 @@ public class RestEasyClient { - public static String baseURL = "https://bfs-lada.intevation.de/lada/server/rest/"; +public static String baseURL = "https://bfs-lada.intevation.de/lada/server/rest/"; public ClientResponse getResponse(String url, boolean header){ ClientRequest request = new ClientRequest(url); @@ -45,48 +45,65 @@ public void testLOrtService(){ testHttpOK(baseURL + "ort?probeId=000007587685X"); testHttpForbidden(baseURL + "ort"); + ClientResponse response = getResponse(baseURL + "ort/000007587685X", true); + Assert.assertNotNull(response); + Assert.assertEquals(404, response.getStatus()); } @Test public void testLMessKommentarService() { testHttpOK(baseURL + "messkommentare?probeId=000007587685X&messungsId=1"); testHttpForbidden(baseURL + "messkommentare"); + ClientResponse response = getResponse(baseURL + "messkommentare/000007587685X", true); + Assert.assertNotNull(response); + Assert.assertEquals(404, response.getStatus()); } @Test public void testLKommentarService() { testHttpOK(baseURL + "kommentare?probeId=000007587685X"); testHttpForbidden(baseURL + "kommentare"); + ClientResponse response = getResponse(baseURL + "kommentare/000007587685X", true); + Assert.assertNotNull(response); + Assert.assertEquals(404, response.getStatus()); } @Test public void testMessungService() { testHttpOK(baseURL + "messung?probeId=000007587685X"); testHttpForbidden(baseURL + "messung"); + ClientResponse response = getResponse(baseURL + "messung/000007587685X", true); + Assert.assertNotNull(response); + Assert.assertEquals(404, response.getStatus()); } @Test public void testLMesswertService() { testHttpOK(baseURL + "messwert?probeId=000007587685X&messungsId=1"); testHttpForbidden(baseURL + "messwert"); + ClientResponse response = getResponse(baseURL + "messungwert/000007587685X", true); + Assert.assertNotNull(response); + Assert.assertEquals(404, response.getStatus()); } @Test public void testLProbenService() { testHttpOK(baseURL + "proben?mstId=06010&umwId=N24"); testHttpForbidden(baseURL + "proben?mstId=06010&umwId=N24"); + ClientResponse response = getResponse(baseURL + "proben/000007587685X", true); + Assert.assertNotNull(response); + Assert.assertEquals(200, response.getStatus()); + checkResponse(response); } @Test public void testLStatusService() { testHttpOK(baseURL + "status?probeId=000007587685X&messungsId=1"); testHttpForbidden(baseURL + "status"); + ClientResponse response = getResponse(baseURL + "status/000007587685X", true); + Assert.assertNotNull(response); + Assert.assertEquals(404, response.getStatus()); } @Test public void testLZusatzwertService() { testHttpOK(baseURL + "zusatzwert?probeId=000007587685X"); testHttpForbidden(baseURL + "zusatzwert"); -} -@Test -public void testLProbenSfindByID() { - ClientResponse response = getResponse(baseURL + "proben/000007587685X", true); + ClientResponse response = getResponse(baseURL + "zusatzwert/000007587685X", true); Assert.assertNotNull(response); - Assert.assertEquals(200, response.getStatus()); - checkResponse(response); + Assert.assertEquals(404, response.getStatus()); } - -} +} \ No newline at end of file