# HG changeset patch # User Raimund Renkert # Date 1453905871 -3600 # Node ID 00eae82dea5f8c968a1cae68aa10ba7967407e4e # Parent 2b9fd00bca562be4b6f5b814e3b201bceb3db1ae Updated tests. * Use new query ids for probe and messprogramm * Test stammdaten query service. diff -r 2b9fd00bca56 -r 00eae82dea5f src/test/java/de/intevation/lada/test/ServiceTest.java --- a/src/test/java/de/intevation/lada/test/ServiceTest.java Wed Jan 27 15:33:57 2016 +0100 +++ b/src/test/java/de/intevation/lada/test/ServiceTest.java Wed Jan 27 15:44:31 2016 +0100 @@ -243,7 +243,6 @@ .header("X-SHIB-roles", BaseTest.TEST_ROLES) .post(Entity.entity(create.toString(), MediaType.APPLICATION_JSON)); String entity = response.readEntity(String.class); - System.out.println(entity); /* Try to parse the response*/ JsonReader fromServiceReader = Json.createReader(new StringReader(entity)); diff -r 2b9fd00bca56 -r 00eae82dea5f src/test/java/de/intevation/lada/test/land/MessprogrammTest.java --- a/src/test/java/de/intevation/lada/test/land/MessprogrammTest.java Wed Jan 27 15:33:57 2016 +0100 +++ b/src/test/java/de/intevation/lada/test/land/MessprogrammTest.java Wed Jan 27 15:44:31 2016 +0100 @@ -65,7 +65,7 @@ public final void execute() { getAll("messprogramm", "rest/messprogramm"); getById("messprogramm", "rest/messprogramm/1000", expectedById); - filter("messprogramm", "rest/messprogramm?qid=1"); + filter("messprogramm", "rest/messprogramm?qid=9"); update("messprogramm", "rest/messprogramm/1000", "mediaDesk", "D: 50 90 01 06 02 05 00 00 00 00 00 00", "D: 50 90 01 06 02 05 00 00 00 00 00 01"); JsonObject created = create("messprogramm", "rest/messprogramm", create); delete("messprogramm", "rest/messprogramm/" + created.getJsonObject("data").get("id")); diff -r 2b9fd00bca56 -r 00eae82dea5f src/test/java/de/intevation/lada/test/land/ProbeTest.java --- a/src/test/java/de/intevation/lada/test/land/ProbeTest.java Wed Jan 27 15:33:57 2016 +0100 +++ b/src/test/java/de/intevation/lada/test/land/ProbeTest.java Wed Jan 27 15:44:31 2016 +0100 @@ -71,7 +71,7 @@ public final void execute() { getAll("probe", "rest/probe"); getById("probe", "rest/probe/1000", expectedById); - filter("probe", "rest/probe?qid=2&mst_id=11010&umw_id=N24"); + filter("probe", "rest/probe?qid=4&mst_id=11010&umw_id=N24"); JsonObject created = create("probe", "rest/probe", create); update("probe", "rest/probe/1000", "hauptprobenNr", "120510002", "130510002"); delete("probe", "rest/probe/" + created.getJsonObject("data").get("id")); diff -r 2b9fd00bca56 -r 00eae82dea5f src/test/java/de/intevation/lada/test/land/QueryTest.java --- a/src/test/java/de/intevation/lada/test/land/QueryTest.java Wed Jan 27 15:33:57 2016 +0100 +++ b/src/test/java/de/intevation/lada/test/land/QueryTest.java Wed Jan 27 15:44:31 2016 +0100 @@ -33,5 +33,6 @@ public final void execute() { getAll("query", "rest/query/probe"); getAll("query", "rest/query/messprogramm"); + getAll("query", "rest/query/stammdaten"); } }