# HG changeset patch # User Raimund Renkert # Date 1423221863 -3600 # Node ID 7d527bff842a0ed9fdab171ab997f2920c917346 # Parent 8751d213536405f27488c6b5f988106a971088cc Added test environment. diff -r 8751d2135364 -r 7d527bff842a src/test/java/de/intevation/lada/LadaTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/de/intevation/lada/LadaTest.java Fri Feb 06 12:24:23 2015 +0100 @@ -0,0 +1,45 @@ +package de.intevation.lada; + +import java.net.URL; + +import javax.inject.Inject; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; + +import de.intevation.lada.rest.QueryService; +import de.intevation.lada.test.ProbeServiceTest; +import de.intevation.lada.test.QueryServiceTest; + +@RunWith(Arquillian.class) +public class LadaTest { + + @Inject + private QueryService queryService; + + @Deployment + public static WebArchive createDeployment() throws Exception { + return ShrinkWrap.create(WebArchive.class, "lada-basis-test.war") + .addPackages(true, Package.getPackage("de.intevation.lada")) + .addClass(QueryServiceTest.class) + .addAsResource("queryconf.json", "queryconf.json") + .addAsResource("META-INF/test-persistence.xml", + "META-INF/persistence.xml"); + } + + /** + * Testing the QueryService. + */ + @Test + public final void testQueryService() throws Exception { + QueryServiceTest queryServiceTest = new QueryServiceTest(); + queryServiceTest.test(queryService); + } +} diff -r 8751d2135364 -r 7d527bff842a src/test/java/de/intevation/lada/test/QueryServiceTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/de/intevation/lada/test/QueryServiceTest.java Fri Feb 06 12:24:23 2015 +0100 @@ -0,0 +1,23 @@ +package de.intevation.lada.test; + +import org.junit.Assert; + +import de.intevation.lada.rest.QueryService; +import de.intevation.lada.util.rest.Response; + + +public class QueryServiceTest { + + public final void test(QueryService queryService) throws Exception { + queryService(queryService); + } + + private final void queryService(QueryService queryService) + throws Exception { + Response response = queryService.get(); + Assert.assertEquals("200", response.getMessage()); + Assert.assertTrue(response.getSuccess()); + Assert.assertNotNull(response.getData()); + } + +} diff -r 8751d2135364 -r 7d527bff842a src/test/resources/META-INF/test-persistence.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/resources/META-INF/test-persistence.xml Fri Feb 06 12:24:23 2015 +0100 @@ -0,0 +1,39 @@ + + + + + java:/jboss/lada-bund + false + + + + + + + + + + + org.hibernate.ejb.HibernatePersistence + java:/jboss/lada-land + false + + + + + + + + + org.hibernate.ejb.HibernatePersistence + java:/jboss/lada-stamm + + + + + + + + diff -r 8751d2135364 -r 7d527bff842a src/test/resources/arquillian.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/resources/arquillian.xml Fri Feb 06 12:24:23 2015 +0100 @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + diff -r 8751d2135364 -r 7d527bff842a src/test/resources/queryconf.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/resources/queryconf.json Fri Feb 06 12:24:23 2015 +0100 @@ -0,0 +1,80 @@ +[ +{ "id": 1, + "name": "Kein Filter", + "description": "Abfrage der Proben ohne Filter", + "sql": "select probe_id, mst_id, umw_id from l_probe", + "result": [ + {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, + {"dataIndex": "mstId", "header": "MST", "width": 100}, + {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100} + ], + "filters": [ + ] +}, +{ "id": 2, + "name": "MST und UMW", + "description": "Abfrage der Proben gefiltert nach Messtellen ID und ID des Umweltbereichs", + "sql": "select probe_id, mst_id, umw_id from l_probe where (mst_id = :mst_id OR '' = :mst_id) and (umw_id = :umw_id OR '' = :umw_id)", + "result": [ + {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, + {"dataIndex": "mstId", "header": "MST", "width": 100}, + {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100} + ], + "filters": [ + {"dataIndex": "mst_id", "type": "listmst", "label": "Messstelle"}, + {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich"} + ] +}, +{ "id": 3, + "name": "Proben pro Land", + "description": "Detailiertere Beschreibung der Abfrage", + "sql": "select probe_id, netzbetreiber_id, mst_id, umw_id, hauptproben_nr from l_probe where (netzbetreiber_id = :netz OR '' = :netz)", + "result": [ + {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, + {"dataIndex": "netzbetreiberId", "header": "Land", "width": 100}, + {"dataIndex": "mstId", "header": "MST", "width": 100}, + {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, + {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100} + ], + "filters": [ + {"dataIndex": "netz", "type": "listnetz", "label": "Land"} + ] +}, +{ "id": 4, + "name": "alle Proben mit Ort", + "description": "alle Proben mit Entnahmeort", + "sql": "select lp.probe_id, lp.netzbetreiber_id, lp.mst_id, lp.umw_id, lp.hauptproben_nr, ort.gem_id, s_verwaltungseinheit.bezeichnung from l_probe left outer join l_ort on (lp.probe_id = l_ort.probe_id) left outer join ort on (l_ort.ort_id = ort.ort_id) left outer join s_verwaltungseinheit on (ort.gem_id = s_verwaltungseinheit.gem_id) where l_ort.orts_typ = 'E' or l_ort.orts_typ is null", + "result": [ + {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, + {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, + {"dataIndex": "mstId", "header": "MST", "width": 60}, + {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, + {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100}, + {"dataIndex": "gemId", "header": "Gem-ID", "width": 100}, + {"dataIndex": "bezeichnung", "header": "Gemeinde", "flex": 1} + ], + "filters": [ + ] +}, +{ "id": 5, + "name": "Proben pro Land und UMW (Multiselect)", + "description": "Abfrage aller Proben gefiltert pro Land und Umweltbereich (mit Mehrfachauswahl)", + "sql": "select lp.probe_id, lp.netzbetreiber_id, lp.mst_id, to_char(lp.probeentnahme_beginn,'YYYY-mm-dd HH24:MI') entnahme_von, to_char(lp.probeentnahme_ende,'YYYY-mm-dd HH24:MI') entnahme_bis, lp.umw_id, lp.hauptproben_nr, l_ort.orts_typ, ort.gem_id, s_verwaltungseinheit.bezeichnung from l_probe left outer join l_ort on (lp.probe_id = l_ort.probe_id) left outer join ort on (l_ort.ort_id = ort.ort_id) left outer join s_verwaltungseinheit on (ort.gem_id = s_verwaltungseinheit.gem_id) where (l_ort.orts_typ = 'E' or l_ort.orts_typ is null) and lp.netzbetreiber_id = :netz and (umw_id similar to (:umw_id) OR '' = :umw_id)", + "result": [ + {"dataIndex": "probeId", "header": "ProbeId", "width": 100}, + {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50}, + {"dataIndex": "mstId", "header": "MST", "width": 50}, + {"dataIndex": "entnahmeVon", "header": "Entnahme von", "width": 120}, + {"dataIndex": "entnahmeBis", "header": "Entnahme bis", "width": 120}, + {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}, + {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100}, + {"dataIndex": "ortsTyp", "header": "Ortstyp", "width": 50}, + {"dataIndex": "genId", "header": "Gemeinde-ID", "width": 100}, + {"dataIndex": "bezeichnung", "header": "Gemeinde", "flex": 1} + ], + "filters": [ + {"dataIndex": "netz", "type": "listnetz", "label": "Land"}, + {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich", "multiselect":true} + ] +} +]