Fix loading Spring XML config for DNB & ICC tests.
Fix incorrect required access for system-vc in the test-suite.
Change-Id: Iac7977a30f52520e594268f3820364a5c38da760
diff --git a/Changes b/Changes
index 10dc286..0ec90cc 100644
--- a/Changes
+++ b/Changes
@@ -21,6 +21,7 @@
- Fix landingPage in the free resource web-service (#799)
- Add pid for resource and use it as resourceId when available #798
- Changed institution to IDS Mannheim.
+- Fix loading Spring XML config for DNB & ICC tests.
# version 0.76
diff --git a/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java b/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
index f816da7..12a0969 100644
--- a/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
+++ b/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
@@ -42,7 +42,7 @@
@Test
public void testSystemVC () throws KustvaktException {
// insert vc
- int id = dao.createQuery("system-vc", ResourceType.SYSTEM,
+ int id = dao.createQuery("system-vc-2", ResourceType.SYSTEM,
QueryType.VIRTUAL_CORPUS, User.CorpusAccess.FREE,
"corpusSigle=GOE", "definition", "description", "experimental",
false, "test class", null, null);
diff --git a/src/test/java/de/ids_mannheim/korap/scenario/DNBTest.java b/src/test/java/de/ids_mannheim/korap/scenario/DNBTest.java
index beefb14..03bcb5c 100644
--- a/src/test/java/de/ids_mannheim/korap/scenario/DNBTest.java
+++ b/src/test/java/de/ids_mannheim/korap/scenario/DNBTest.java
@@ -15,7 +15,10 @@
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;
-@ContextConfiguration("classpath:test-config-dnb.xml")
+@ContextConfiguration(
+ locations = "classpath:test-config-dnb.xml",
+ inheritLocations = false
+)
public class DNBTest extends SpringJerseyTest {
public final static String API_VERSION = "v1.0";
diff --git a/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java b/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java
index fcc655f..13f5833 100644
--- a/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java
+++ b/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java
@@ -127,7 +127,10 @@
* @author elma
* @see /src/main/resources/properties/jdbc.properties
*/
-@ContextConfiguration("classpath:test-config-icc.xml")
+@ContextConfiguration(
+ locations = "classpath:test-config-icc.xml",
+ inheritLocations = false
+)
public class ICCTest extends SpringJerseyTest {
public final static String API_VERSION = "v1.0";
diff --git a/src/test/resources/test-config-dnb.xml b/src/test/resources/test-config-dnb.xml
index 20ce71c..63d4baf 100644
--- a/src/test/resources/test-config-dnb.xml
+++ b/src/test/resources/test-config-dnb.xml
@@ -158,11 +158,12 @@
<bean id="scopeService"
class="de.ids_mannheim.korap.oauth2.service.OAuth2ScopeServiceImpl" />
- <bean id="initializator"
+ <!-- <bean id="initializator"
class="de.ids_mannheim.korap.init.Initializator"
- init-method="initTest">
+ init-method="initTestWithoutAvailability">
</bean>
-
+ -->
+
<!-- Krill -->
<bean id="search_krill"
class="de.ids_mannheim.korap.web.SearchKrill">
diff --git a/src/test/resources/test-config-icc.xml b/src/test/resources/test-config-icc.xml
index 3c9c9ae..545c7a4 100644
--- a/src/test/resources/test-config-icc.xml
+++ b/src/test/resources/test-config-icc.xml
@@ -159,11 +159,11 @@
<bean id="scopeService"
class="de.ids_mannheim.korap.oauth2.service.OAuth2ScopeServiceImpl" />
- <bean id="initializator"
+ <!-- <bean id="initializator"
class="de.ids_mannheim.korap.init.Initializator"
- init-method="initTest">
+ init-method="initTestWithoutAvailability">
</bean>
-
+ -->
<!-- Krill -->
<bean id="search_krill"
class="de.ids_mannheim.korap.web.SearchKrill">