Added and improved tests, added collectionQuery to CollectionLoader.
Change-Id: I6a10f8b7d0397493417e2e9914895317b46fae78
diff --git a/src/test/resources/policy-test.conf b/src/test/resources/policy-test.conf
new file mode 100644
index 0000000..4156a76
--- /dev/null
+++ b/src/test/resources/policy-test.conf
@@ -0,0 +1,57 @@
+# type id name description condition permissions collectionQuery
+
+virtualcollection WPD15-VC Wikipedia Virtual Collection German Wikipedia 2015 public read corpusSigle=WPD15 & creationDate since 2014-04-01
+virtualcollection BRZ10-PC Braunschweiger Collection Selected Braunschweiger Zeitung ids read corpusSigle=BRZ10 & foundries ~ Connexor
+corpus WPD15 Wikipedia German Wikipedia 2015 public read
+corpus GOE Goethe Goethe corpus public read
+corpus BRZ10 Braunschweiger Braunschweiger Zeitung 2010 ids read
+type id name description condition permissions
+foundry base base Base foundry public read
+foundry dereko dereko DeReKo foundry public read
+foundry corenlp corenlp CoreNLP parser public read
+foundry opennlp opennlp OpenNLP parser public read
+foundry malt malt MALT parser public read
+foundry mdp mdp MD parser public read
+foundry tt tt Tree Tagger parser public read
+foundry sgbr sgbr Schreibgebrauch ids read
+foundry cnx cnx Connexor parser ids read
+foundry drukola drukola DruKoLa parser drukola read
+foundry glemm glemm Glemm public read
+foundry marmot marmot MarMoT parser public read
+foundry mate mate Mate parser public read
+foundry xip xip Xerox Incremental Parser ids read
+layer cnx/c cnx/c Connexor constituency layer ids read
+layer cnx/syn cnx/syn Connexor syntax ids read
+layer cnx/p cnx/p Connexor part of speech ids read
+layer cnx/l cnx/l Connexor lemma ids read
+layer cnx/m cnx/m Connexor morphology ids read
+layer corenlp/c corenlp/c CoreNLP constituency public read
+layer corenlp/p corenlp/p CoreNLP part of speech public read
+layer corenlp/s corenlp/s CoreNLP structure public read
+layer corenlp/ne corenlp/ne CoreNLP named entities public read
+layer dereko/s dereko/s DeReKo structure public read
+layer drukola/l drukola/l Drukola lemma drukola read
+layer drukola/p drukola/p Drukola part of speech drukola read
+layer drukola/m drukola/m Drukola morphology drukola read
+layer glemm/l glemm/l GLEMM lemma public read
+layer malt/d malt/d MALT dependency public read
+layer marmot/p marmot/p Marmot part of speech public read
+layer marmot/m marmot/m Marmot morphology public read
+layer mate/d mate/d MATE dependency public read
+layer mate/l mate/l MATE lemma public read
+layer mate/p mate/p MATE part of speech public read
+layer mate/m mate/m MATE morphology public read
+layer mdp/d mdp/d MDP dependency public read
+layer opennlp/p opennlp/p OpenNLP part of speech public read
+layer opennlp/s opennlp/s OpenNLP part of speech public read
+layer sgbr/p sgbr/p Schreibgebrauchp part of peech ids read
+layer sgbr/l sgbr/l Schreibgebrauch lemma ids read
+layer sgbr/lv sgbr/lv Schreibgebrauch lemmav ariant ids read
+layer tt/p tt/p Tree Tagger part of speech public read
+layer tt/l tt/l Tree Tagger lemma public read
+layer tt/s tt/s Tree Tagger structure public read
+layer xip/c xip/c XIP constituency ids read
+layer xip/d xip/d XIP dependency ids read
+layer xip/l xip/l XIP lemma ids read
+layer xip/p xip/p XIP part of speech ids read
+layer xip/s xip/s XIP structure ids read
diff --git a/src/test/resources/test-default-config.xml b/src/test/resources/test-default-config.xml
index 48e97a8..19f7e89 100644
--- a/src/test/resources/test-default-config.xml
+++ b/src/test/resources/test-default-config.xml
@@ -23,8 +23,8 @@
<property name="ignoreResourceNotFound" value="true" />
<property name="locations">
<array>
- <value>classpath:kustvakt.conf</value>
- <value>file:./kustvakt.conf</value>
+ <value>classpath:kustvakt-test.conf</value>
+ <value>file:./kustvakt-test.conf</value>
</array>
</property>
</bean>