Removed db/test folder (close #379)
Change-Id: I60491153856df7cc635c07e5b702857f3c1418b1
diff --git a/Changes b/Changes
index 0c35cdc..e5dd0b4 100644
--- a/Changes
+++ b/Changes
@@ -9,7 +9,7 @@
- Fix KoralQuery and remove required access from query reference.
- Remove query reference test data from the database migration (close #811)
- Remove OAuth2 clients and access tokens from the DB migration (close #809)
-
+- Removed db/test folder (close #379)
# version 0.78.2
diff --git a/pom.xml b/pom.xml
index 377c069..8899ff0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,6 @@
<exclude>db/mysql/**</exclude>
<exclude>db/predefined/**</exclude>
<exclude>db/sqlite/**</exclude>
- <exclude>db/test/**</exclude>
<exclude>com.novell.ldap</exclude>
<exclude>com.unboundid</exclude>
<exclude>org.glassfish.jersey.test-framework*</exclude>
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
deleted file mode 100644
index f7be688..0000000
--- a/src/main/resources/db/test/V3.1__insert_virtual_corpus.sql
+++ /dev/null
@@ -1,118 +0,0 @@
--- dummy data only for testing
-
--- user groups
---INSERT INTO user_group(name,status,created_by,created_date)
--- VALUES ("marlin-group","ACTIVE","marlin",CURRENT_TIMESTAMP);
-
---INSERT INTO user_group(name,status,created_by,created_date)
--- VALUES ("dory-group","ACTIVE","dory",CURRENT_TIMESTAMP);
-
---INSERT INTO user_group(name,status,created_by,created_date)
--- VALUES ("auto-group","HIDDEN","system",CURRENT_TIMESTAMP);
-
---INSERT INTO user_group(name,status,created_by)
--- VALUES ("all users","HIDDEN","system");
-
---INSERT INTO user_group(name,status,created_by,deleted_by,created_date)
--- VALUES ("deleted-group","DELETED","dory", "dory",CURRENT_TIMESTAMP);
-
-
-
--- user group members
---INSERT INTO user_group_member(user_id, group_id, status, created_by)
--- SELECT "marlin",
--- (SELECT id from user_group where name = "marlin-group"),
--- "ACTIVE","marlin";
---
---INSERT INTO user_group_member(user_id, group_id, status, created_by)
--- SELECT "dory",
--- (SELECT id from user_group where name = "marlin-group"),
--- "ACTIVE","marlin";
---
---INSERT INTO user_group_member(user_id, group_id, status, created_by)
--- SELECT "dory",
--- (SELECT id from user_group where name = "dory-group"),
--- "ACTIVE","dory";
---
---INSERT INTO user_group_member(user_id, group_id, status, created_by)
--- SELECT "nemo",
--- (SELECT id from user_group where name = "dory-group"),
--- "ACTIVE","dory";
---
---INSERT INTO user_group_member(user_id, group_id, status, created_by)
--- SELECT "marlin",
--- (SELECT id from user_group where name = "dory-group"),
--- "PENDING","dory";
---
---INSERT INTO user_group_member(user_id, group_id, status, created_by, deleted_by)
--- SELECT "pearl",
--- (SELECT id from user_group where name = "dory-group"),
--- "DELETED","dory", "pearl";
---
---INSERT INTO user_group_member(user_id, group_id, status, created_by)
--- SELECT "pearl",
--- (SELECT id from user_group where name = "auto-group"),
--- "ACTIVE","system";
---
---INSERT INTO user_group_member(user_id, group_id, status, created_by)
--- SELECT "dory",
--- (SELECT id from user_group where name = "deleted-group"),
--- "ACTIVE","dory";
-
-
--- virtual corpora
---INSERT INTO query(name, type, query_type, required_access, created_by, description, status, koral_query)
--- VALUES ("dory-vc", "PRIVATE", "VIRTUAL_CORPUS", "FREE", "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:geq", "type": "type:date", "value": "1820" } ], "operation": "operation:and" }}');
-
---INSERT INTO query(name, type, query_type, required_access, created_by, description, status, koral_query)
--- 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 ("published-vc", "PUBLISHED", "VIRTUAL_CORPUS", "ALL", "marlin", "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 ("marlin-vc", "PRIVATE", "VIRTUAL_CORPUS", "FREE", "marlin", "marlin test share vc", "experimental",
--- '{"collection": { "@type": "koral:docGroup", "operands": [ { "@type": "koral:doc", "key": "corpusSigle", "match": "match:eq", "value": "GOE" }, { "@type": "koral:doc", "key": "creationDate", "match": "match:geq", "type": "type:date", "value": "1820" } ], "operation": "operation:and" }}');
-
---INSERT INTO query(name, type, query_type, required_access, created_by, description, status, koral_query)
--- VALUES ("nemo-vc", "PRIVATE", "VIRTUAL_CORPUS", "ALL", "nemo", "nemo test vc", "experimental",
--- '{"collection":{"@type":"koral:doc","value":"GOE","match":"match:eq","key":"corpusSigle"}}');
-
--- virtual corpus access
---INSERT INTO query_access(query_id, user_group_id, status, created_by)
--- SELECT
--- (SELECT id from query where name = "group-vc"),
--- (SELECT id from user_group where name = "dory-group"),
--- "ACTIVE", "dory";
-
---INSERT INTO query_access(query_id, user_group_id, status, created_by)
--- SELECT
--- (SELECT id from query where name = "system-vc"),
--- (SELECT id from user_group where name = "all users"),
--- "ACTIVE", "system";
-
---INSERT INTO query_access(query_id, user_group_id, status, created_by)
--- SELECT
--- (SELECT id from query where name = "published-vc"),
--- (SELECT id from user_group where name = "marlin-group"),
--- "ACTIVE", "marlin";
-
---INSERT INTO query_access(query_id, user_group_id, status, created_by)
--- SELECT
--- (SELECT id from query where name = "published-vc"),
--- (SELECT id from user_group where name = "auto-group"),
--- "HIDDEN", "system";
-
-
--- Summary user VC Lists
--- dory: dory-vc, group-vc, system-vc
--- nemo: group-vc, system-vc
--- marlin: published-vc, system-vc
--- pearl: system-vc, published-vc
diff --git a/src/main/resources/db/test/V3.3__insert_member_roles.sql b/src/main/resources/db/test/V3.3__insert_member_roles.sql
deleted file mode 100644
index b1db4b6..0000000
--- a/src/main/resources/db/test/V3.3__insert_member_roles.sql
+++ /dev/null
@@ -1,52 +0,0 @@
--- member roles
-
--- marlin group
---INSERT INTO group_member_role(group_member_id,role_id)
---SELECT
--- (SELECT id FROM user_group_member WHERE user_id="marlin" AND group_id=1),
--- (SELECT id FROM role WHERE name = "USER_GROUP_ADMIN");
---
---INSERT INTO group_member_role(group_member_id,role_id)
---SELECT
--- (SELECT id FROM user_group_member WHERE user_id="marlin" AND group_id=1),
--- (SELECT id FROM role WHERE name = "VC_ACCESS_ADMIN");
---
---INSERT INTO group_member_role(group_member_id,role_id)
---SELECT
--- (SELECT id FROM user_group_member WHERE user_id="dory" AND group_id=1),
--- (SELECT id FROM role WHERE name = "USER_GROUP_ADMIN");
---
---INSERT INTO group_member_role(group_member_id,role_id)
---SELECT
--- (SELECT id FROM user_group_member WHERE user_id="dory" AND group_id=1),
--- (SELECT id FROM role WHERE name = "VC_ACCESS_ADMIN");
-
-
--- dory group
---INSERT INTO group_member_role(group_member_id,role_id)
---SELECT
--- (SELECT id FROM user_group_member WHERE user_id="dory" AND group_id=2),
--- (SELECT id FROM role WHERE name = "USER_GROUP_ADMIN");
---
---INSERT INTO group_member_role(group_member_id,role_id)
---SELECT
--- (SELECT id FROM user_group_member WHERE user_id="dory" AND group_id=2),
--- (SELECT id FROM role WHERE name = "VC_ACCESS_ADMIN");
---
---INSERT INTO group_member_role(group_member_id,role_id)
---SELECT
--- (SELECT id FROM user_group_member WHERE user_id="nemo" AND group_id=2),
--- (SELECT id FROM role WHERE name = "USER_GROUP_MEMBER");
---
---INSERT INTO group_member_role(group_member_id,role_id)
---SELECT
--- (SELECT id FROM user_group_member WHERE user_id="nemo" AND group_id=2),
--- (SELECT id FROM role WHERE name = "VC_ACCESS_MEMBER");
-
-
--- auto group
---INSERT INTO group_member_role(group_member_id,role_id)
---SELECT
--- (SELECT id FROM user_group_member WHERE user_id="pearl" AND group_id=3),
--- (SELECT id FROM role WHERE name = "VC_ACCESS_MEMBER");
-
diff --git a/src/main/resources/db/test/V3.4__insert_admins.sql b/src/main/resources/db/test/V3.4__insert_admins.sql
deleted file mode 100644
index 9974c4c..0000000
--- a/src/main/resources/db/test/V3.4__insert_admins.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- dummy admin
---INSERT INTO admin(user_id) VALUES ("admin");
\ No newline at end of file
diff --git a/src/main/resources/db/test/V3.5__insert_oauth2_clients.sql b/src/main/resources/db/test/V3.5__insert_oauth2_clients.sql
deleted file mode 100644
index 36433d9..0000000
--- a/src/main/resources/db/test/V3.5__insert_oauth2_clients.sql
+++ /dev/null
@@ -1,66 +0,0 @@
--- test clients
-
--- plain secret value is "secret"
---INSERT INTO oauth2_client(id,name,secret,type,super,
--- redirect_uri,registered_by, description, url, registration_date,
--- is_permitted)
---VALUES ("fCBbQkAyYzI4NzUxMg","super confidential client",
--- "$2a$08$vi1FbuN3p6GcI1tSxMAoeuIYL8Yw3j6A8wJthaN8ZboVnrQaTwLPq",
--- "CONFIDENTIAL", 1,
--- "https://korap.ids-mannheim.de/confidential/redirect", "system",
--- "Super confidential client.",
--- "http://korap.ids-mannheim.de/confidential", CURRENT_TIMESTAMP, 1);
-
-
--- plain secret value is "secret"
--- INSERT INTO oauth2_client(id,name,secret,type,super,
--- redirect_uri,registered_by, description,url,registration_date,
--- is_permitted)
---VALUES ("9aHsGW6QflV13ixNpez","non super confidential client",
--- "$2a$08$vi1FbuN3p6GcI1tSxMAoeuIYL8Yw3j6A8wJthaN8ZboVnrQaTwLPq",
--- "CONFIDENTIAL", 0,
--- "https://third.party.com/confidential/redirect", "system",
--- "Nonsuper confidential client.",
--- "http://third.party.com/confidential", CURRENT_TIMESTAMP,1);
-
---INSERT INTO oauth2_client(id,name,secret,type,super,
--- registered_by, description,url, registration_date,
--- is_permitted,source)
---VALUES ("52atrL0ajex_3_5imd9Mgw","confidential client 2",
--- "$2a$08$vi1FbuN3p6GcI1tSxMAoeuIYL8Yw3j6A8wJthaN8ZboVnrQaTwLPq",
--- "CONFIDENTIAL", 0,"system",
--- "Nonsuper confidential client plugin without redirect URI",
--- "http://example.client.de", CURRENT_TIMESTAMP, 1,'{"key":"value"}');
-
---INSERT INTO oauth2_client(id,name,secret,type,super,
--- redirect_uri, registered_by, description, url, registration_date,
--- is_permitted,source)
---VALUES ("8bIDtZnH6NvRkW2Fq","public client plugin with redirect uri",
--- null, "PUBLIC", 0,
--- "https://third.party.client.com/redirect","system",
--- "Public client plugin with a registered redirect URI",
--- "http://third.party.client.com", CURRENT_TIMESTAMP,1,'{"key":"value"}');
-
-
---INSERT INTO oauth2_client(id,name,secret,type,super,
--- registered_by, description, url, registration_date,
--- is_permitted)
---VALUES ("nW5qM63Rb2a7KdT9L","test public client",null,
--- "PUBLIC", 0, "Public client without redirect uri",
--- "system", "http://korap.ids-mannheim.de/public",
--- CURRENT_TIMESTAMP, 1);
-
-
---INSERT INTO oauth2_access_token(token,user_id,created_date,
---expiry_date, user_auth_time)
---VALUES("fia0123ikBWn931470H8s5gRqx7Moc4p","marlin",1527776750000,
---1527776750000, 1527690190000);
-
---INSERT INTO oauth2_refresh_token(token,user_id,user_auth_time,
---created_date, expiry_date, client)
---VALUES("js9iQ4lw1Ri7fz06l0dXl8fCVp3Yn7vmq8","pearl",1496154350000,
---1496240795000, 1527784020000, "nW5qM63Rb2a7KdT9L");
-
--- EM: expiry date must be in epoch milis format for testing with sqlite,
--- on the contrary, for testing using mysql use this format: "2018-05-31 16:27:00"
--- otherwise criteria query using greaterThan does not work.
diff --git a/src/main/resources/db/test/V3.6__insert_default_settings.sql b/src/main/resources/db/test/V3.6__insert_default_settings.sql
deleted file mode 100644
index 4208ac4..0000000
--- a/src/main/resources/db/test/V3.6__insert_default_settings.sql
+++ /dev/null
@@ -1,2 +0,0 @@
---INSERT INTO default_setting(username,settings)
--- VALUES ("bubbles",'{"pos-foundry":"corenlp", "lemma-foundry":"opennlp"}');
diff --git a/src/main/resources/db/test/V3.7__insert_query_references.sql b/src/main/resources/db/test/V3.7__insert_query_references.sql
deleted file mode 100644
index a4bcda9..0000000
--- a/src/main/resources/db/test/V3.7__insert_query_references.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- query references
--- INSERT INTO query(name, type, query_type, required_access, created_by, description, status,
--- koral_query, query, query_language)
--- VALUES ("dory-q", "PRIVATE", "QUERY", "FREE", "dory", "test query", "experimental",
--- '{ "@type": "koral:token" }', "[]", "poliqarp");
-
--- INSERT INTO query(name, type, query_type, required_access, created_by, description, status,
--- koral_query, query, query_language)
--- VALUES ("system-q", "SYSTEM", "QUERY", "FREE", "system", '"system" query', "experimental",
--- '{ "@type": "koral:token" }', "[]", "poliqarp");
diff --git a/src/main/resources/properties/basic-jdbc.properties b/src/main/resources/properties/basic-jdbc.properties
index df8c513..fc371d3 100644
--- a/src/main/resources/properties/basic-jdbc.properties
+++ b/src/main/resources/properties/basic-jdbc.properties
@@ -6,4 +6,4 @@
jdbc.url=jdbc:sqlite:basic.sqlite
jdbc.username=pc
jdbc.password=pc
-jdbc.schemaPath=db/sqlite, db/predefined,db/test
+jdbc.schemaPath=db/sqlite, db/predefined
diff --git a/src/test/resources/test-jdbc.properties b/src/test/resources/test-jdbc.properties
index 1be6a41..5e84ae0 100644
--- a/src/test/resources/test-jdbc.properties
+++ b/src/test/resources/test-jdbc.properties
@@ -8,4 +8,4 @@
#jdbc.url=jdbc:sqlite:testDB.sqlite
jdbc.username=pc
jdbc.password=pc
-jdbc.schemaPath=classpath:db/sqlite,db/predefined,db/test
\ No newline at end of file
+jdbc.schemaPath=classpath:db/sqlite,db/predefined
\ No newline at end of file