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

Merge pull request #8118 from atmire/w2p-85525_pr-use-lenient-stubbing-in-MockSolrLoggerServiceImpl

Browse Source 
Use lenient stubbing in MockSolrLoggerServiceImpl
This commit is contained in:
Tim Donohue
2022-01-18 11:36:51 -06:00
committed by GitHub
parent 964b132dd1 7974ea1bfa
commit bdd521a9b0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,6 @@ package org.dspace.statistics;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;
@@ -29,6 +28,7 @@ import com.maxmind.geoip2.record.Postal;
import com.maxmind.geoip2.record.RepresentedCountry; import com.maxmind.geoip2.record.RepresentedCountry;
import com.maxmind.geoip2.record.Traits; import com.maxmind.geoip2.record.Traits;
import org.dspace.solr.MockSolrServer; import org.dspace.solr.MockSolrServer;
import org.mockito.Mockito;
import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -55,7 +55,7 @@ public class MockSolrLoggerServiceImpl
// Mock GeoIP's DatabaseReader // Mock GeoIP's DatabaseReader
DatabaseReader reader = mock(DatabaseReader.class); DatabaseReader reader = mock(DatabaseReader.class);
// Ensure that any tests requesting a city() get a mock/fake CityResponse // Ensure that any tests requesting a city() get a mock/fake CityResponse
when(reader.city(any(InetAddress.class))).thenReturn(mockCityResponse()); Mockito.lenient().when(reader.city(any(InetAddress.class))).thenReturn(mockCityResponse());
// Save this mock DatabaseReader to be used by SolrLoggerService // Save this mock DatabaseReader to be used by SolrLoggerService
locationService = reader; locationService = reader;
} }