hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 06:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test fixes after rebase. Remove unnecessary new code.

Browse Source
This commit is contained in:
Tim Donohue
2020-01-24 15:09:24 -06:00
parent 576f699e08
commit 447b7722f0
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/test/java/org/dspace/statistics/MockSolrLoggerServiceImpl.java
View File

@@ -34,7 +34,7 @@ import org.springframework.beans.factory.InitializingBean;
* <p> * <p>
* <strong>NOTE:</strong> this class is overridden by one <em>of the same name</em> * <strong>NOTE:</strong> this class is overridden by one <em>of the same name</em>
* defined in dspace-server-webapp and declared as a bean there. * defined in dspace-server-webapp and declared as a bean there.
* See {@code config/spring/api/Z-mock-services.xml}. Some kind of classpath * See {@code test/data/dspaceFolder/config/spring/api/solr-services.xml}. Some kind of classpath
* magic makes this work. * magic makes this work.
*/ */
public class MockSolrLoggerServiceImpl public class MockSolrLoggerServiceImpl

8
dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
View File

@@ -72,7 +72,6 @@ import org.dspace.core.Constants;
import org.dspace.disseminate.CitationDocumentServiceImpl; import org.dspace.disseminate.CitationDocumentServiceImpl;
import org.dspace.eperson.Group; import org.dspace.eperson.Group;
import org.dspace.services.ConfigurationService; import org.dspace.services.ConfigurationService;
import org.dspace.statistics.FakeDatabaseReader;
import org.dspace.statistics.ObjectCount; import org.dspace.statistics.ObjectCount;
import org.dspace.statistics.SolrLoggerServiceImpl; import org.dspace.statistics.SolrLoggerServiceImpl;
import org.dspace.statistics.factory.StatisticsServiceFactory; import org.dspace.statistics.factory.StatisticsServiceFactory;
@@ -119,13 +118,6 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
StatisticsServiceFactory.getInstance().getSolrLoggerService().removeIndex("*:*"); StatisticsServiceFactory.getInstance().getSolrLoggerService().removeIndex("*:*");
} }
@BeforeClass
public static void mockGeoIP()
throws IOException {
// Set up a mock GeoIP implementation so we don't need to d/l a database.
new FakeDatabaseReader.Builder(); // Activate fake
}
@Before @Before
@Override @Override
public void setUp() throws Exception { public void setUp() throws Exception {