hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-08 02:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure dspace.dir system property also specified for Integration Tests

Browse Source
This commit is contained in:
Tim Donohue
2015-10-15 14:35:34 -05:00
parent a1d3d98be1
commit 9bbf81a1e2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/pom.xml
View File

@@ -305,8 +305,8 @@
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<configuration> <configuration>
<systemPropertyVariables> <systemPropertyVariables>
<!-- Specify the dspace.cfg file to use for test environment --> <!-- Specify the dspace.dir to use for test environment -->
<dspace.configuration>${agnostic.build.dir}/testing/dspace/config/dspace.cfg</dspace.configuration> <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
<!-- Turn off any DSpace logging --> <!-- Turn off any DSpace logging -->
<dspace.log.init.disable>true</dspace.log.init.disable> <dspace.log.init.disable>true</dspace.log.init.disable>
</systemPropertyVariables> </systemPropertyVariables>

1
dspace-api/src/test/java/org/dspace/AbstractDSpaceTest.java
View File

@@ -74,6 +74,7 @@ public class AbstractDSpaceTest
kernelImpl = DSpaceKernelInit.getKernel(null); kernelImpl = DSpaceKernelInit.getKernel(null);
if (!kernelImpl.isRunning()) if (!kernelImpl.isRunning())
{ {
// NOTE: the "dspace.dir" system property MUST be specified via Maven
kernelImpl.start(System.getProperty("dspace.dir")); // init the kernel kernelImpl.start(System.getProperty("dspace.dir")); // init the kernel
} }