jwt token expiration test
diff --git a/src/test/java/de/ids_mannheim/korap/config/ConfigTest.java b/src/test/java/de/ids_mannheim/korap/config/ConfigTest.java
index 4a2ca67..b86699c 100644
--- a/src/test/java/de/ids_mannheim/korap/config/ConfigTest.java
+++ b/src/test/java/de/ids_mannheim/korap/config/ConfigTest.java
@@ -44,7 +44,7 @@
BeanConfiguration.getBeans().getConfiguration().setPropertiesAsStream(
ConfigTest.class.getClassLoader()
- .getResourceAsStream("kustvakt_test.conf"));
+ .getResourceAsStream("kustvakt.conf"));
Assert.assertEquals("token layer does not match", "tt",
BeanConfiguration.getBeans().getConfiguration()
@@ -61,7 +61,7 @@
BeanConfiguration.getBeans().getConfiguration().setPropertiesAsStream(
ConfigTest.class.getClassLoader()
- .getResourceAsStream("kustvakt_test.conf"));
+ .getResourceAsStream("kustvakt.conf"));
String v = "testmail@ids-mannheim.de";
BeanConfiguration.getBeans().getEncryption().validateEmail(v);
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/KustvaktResourceServiceTest.java b/src/test/java/de/ids_mannheim/korap/web/service/KustvaktResourceServiceTest.java
index 6829064..d44f696 100644
--- a/src/test/java/de/ids_mannheim/korap/web/service/KustvaktResourceServiceTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/service/KustvaktResourceServiceTest.java
@@ -77,12 +77,14 @@
.get(ClientResponse.class);
assert ClientResponse.Status.OK.getStatusCode() == response.getStatus();
node = JsonUtils.readTree(response.getEntity(String.class));
- System.out.println("STATS RESULT: ");
- System.out.println(node);
+ assert node != null;
+ int docs = node.path("documents").asInt();
+ assert docs > 0 && docs < 15;
}
@Test
public void testResourceStore() {
}
+
}
diff --git a/src/test/resources/test-config.xml b/src/test/resources/default-config.xml
similarity index 97%
rename from src/test/resources/test-config.xml
rename to src/test/resources/default-config.xml
index 082d616..a756340 100644
--- a/src/test/resources/test-config.xml
+++ b/src/test/resources/default-config.xml
@@ -69,9 +69,13 @@
<property name="url" value="${jdbc.url}"/>
<property name="username" value="${jdbc.username}"/>
<property name="password" value="${jdbc.password}"/>
+ <!-- relevant for single connection datasource and sqlite -->
<property name="suppressClose">
<value>true</value>
</property>
+ <!--<property name="initialSize" value="2"/>-->
+ <!--<property name="maxIdle" value="2"/>-->
+ <!--<property name="poolPreparedStatements" value="true"/>-->
</bean>
<!-- to configure database for sqlite, mysql, etc. migrations -->
@@ -99,7 +103,6 @@
<constructor-arg ref="kustvakt_db"/>
</bean>
- <!-- deprecated : load via constructor -->
<!--fixme: change name according to convention -->
<bean id="collectionProvider"
class="de.ids_mannheim.korap.handlers.CollectionDao">
diff --git a/src/test/resources/kustvakt_test.conf b/src/test/resources/kustvakt_test.conf
deleted file mode 100644
index 75e549a..0000000
--- a/src/test/resources/kustvakt_test.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-## index dir
-lucene.indexDir = /Users/hanl/Projects/prep_corpus
-
-kustvakt.default.pos = tt
-kustvakt.default.lemma = tt
-kustvakt.default.token = tt
-kustvakt.default.dep = mate
-kustvakt.default.const = mate
-
-
-## options referring to the security module!
-
-## token expiration time in minutes!
-## decpricated, no function uses this anymore
-security.absoluteTimeoutDuration = 45M
-
-security.longTokenTTL = 230D
-security.tokenTTL = 72H
-security.shortTokenTTL = 5S
-
-## specifies the user data field that is used to salt user passwords
-security.passcode.salt=accountCreation
-
-security.idleTimeoutDuration = 25M
-security.multipleLogIn = true
-security.loginAttemptNum = 3
-security.authAttemptTTL = 45M
-
-security.encryption.loadFactor = 8
-security.validation.stringLength = 150
-security.validation.emailLength = 5
-security.encryption.algo=BCRYPT
-security.sharedSecret=nHim5JB-YqkX7sS55jayGBnga8WmqgpkzieGe8UhojE
-security.adminToken=f61d02c04a0f18d60172f7b990955824
-
-## applicable: rewrite, foundry, filter, deny
-security.rewrite.strategies=filter, foundry, rewrite
\ No newline at end of file