Setup system-vc in Initializator instead of using SQL for testing
Change-Id: Id9ec7c74530a90706bfbab39b7d46cd794d0dcd6
diff --git a/src/main/java/de/ids_mannheim/korap/entity/QueryDO.java b/src/main/java/de/ids_mannheim/korap/entity/QueryDO.java
index 6b39bd4..3a5ebde 100644
--- a/src/main/java/de/ids_mannheim/korap/entity/QueryDO.java
+++ b/src/main/java/de/ids_mannheim/korap/entity/QueryDO.java
@@ -73,7 +73,8 @@
return "id=" + id + ", name= " + name + ", type= " + type + ", status= "
+ status + ", description=" + description + ", requiredAccess="
+ requiredAccess + ", koralQuery= " + koralQuery
- + ", definition= " + definition + ", createdBy= " + createdBy;
+ + ", definition= " + definition + ", createdBy= " + createdBy
+ + ", isCached ="+isCached;
}
@Override
diff --git a/src/main/java/de/ids_mannheim/korap/init/Initializator.java b/src/main/java/de/ids_mannheim/korap/init/Initializator.java
index fbcca0e..b633e8e 100644
--- a/src/main/java/de/ids_mannheim/korap/init/Initializator.java
+++ b/src/main/java/de/ids_mannheim/korap/init/Initializator.java
@@ -52,14 +52,16 @@
t.start();
}
- public void initTest () throws IOException, KustvaktException {
- VirtualCorpusCache.CACHE_LOCATION = KustvaktConfiguration.DATA_FOLDER
- + "/vc-cache";
- setInitialAccessScope();
- if (config.createInitialSuperClient()) {
- clientService.createInitialTestSuperClient();
- }
- }
+ public void initTest ()
+ throws IOException, KustvaktException, QueryException {
+ VirtualCorpusCache.CACHE_LOCATION = KustvaktConfiguration.DATA_FOLDER
+ + "/vc-cache";
+ setInitialAccessScope();
+ if (config.createInitialSuperClient()) {
+ clientService.createInitialTestSuperClient();
+ }
+ vcLoader.loadVCToCache("system-vc", "/vc/system-vc.jsonld");
+ }
public void initResourceTest () throws IOException, KustvaktException {
setInitialAccessScope();
diff --git a/src/main/resources/db/test/V3.1__insert_virtual_corpus.sql b/src/main/resources/db/test/V3.1__insert_virtual_corpus.sql
index 26a7243..57b6797 100644
--- a/src/main/resources/db/test/V3.1__insert_virtual_corpus.sql
+++ b/src/main/resources/db/test/V3.1__insert_virtual_corpus.sql
@@ -69,9 +69,9 @@
VALUES ("group-vc", "PROJECT", "VIRTUAL_CORPUS", "PUB", "dory", "test vc", "experimental",
'{"collection": { "@type": "koral:docGroup", "operands": [ { "@type": "koral:doc", "key": "corpusSigle", "match": "match:eq", "value": "GOE" }, { "@type": "koral:doc", "key": "creationDate", "match": "match:leq", "type": "type:date", "value": "1810" } ], "operation": "operation:and" }}');
-INSERT INTO query(name, type, query_type, required_access, created_by, description, status, koral_query)
- VALUES ("system-vc", "SYSTEM", "VIRTUAL_CORPUS", "ALL", "system", "test vc", "experimental",
- '{"collection":{"@type":"koral:doc","value":"GOE","match":"match:eq","key":"corpusSigle"}}');
+--INSERT INTO query(name, type, query_type, required_access, created_by, description, status, koral_query)
+-- VALUES ("system-vc", "SYSTEM", "VIRTUAL_CORPUS", "ALL", "system", "test vc", "experimental",
+-- '{"collection":{"@type":"koral:doc","value":"GOE","match":"match:eq","key":"corpusSigle"}}');
INSERT INTO query(name, type, query_type, required_access, created_by, description, status, koral_query)
VALUES ("published-vc", "PUBLISHED", "VIRTUAL_CORPUS", "ALL", "marlin", "test vc", "experimental",