changing mock usage externalservice

This commit is contained in:
Paulo Graça
2021-09-22 20:16:11 +01:00
parent 26068b0f20
commit ecd6510e21
2 changed files with 10 additions and 11 deletions

View File

@@ -3,7 +3,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
default-lazy-init="true">
<bean id="openAIRERestConnector" class="org.dspace.external.OpenAIRERestConnector">
<bean id="mockOpenAIRERestConnector" class="org.dspace.external.MockOpenAIRERestConnector">
<constructor-arg value="${openaire.api.url:https://api.openaire.eu}"/>
<property name="tokenEnabled" value="${openaire.token.enabled:false}"/>
<property name="tokenServiceUrl" value="${openaire.token.url:https://aai.openaire.eu/oidc/token}"/>
@@ -12,7 +12,7 @@
</bean>
<bean class="org.dspace.external.provider.impl.OpenAIREFundingDataProvider" init-method="init">
<property name="sourceIdentifier" value="openAIREFunding"/>
<property name="connector" ref="openAIRERestConnector"/>
<property name="connector" ref="mockOpenAIRERestConnector"/>
</bean>
</beans>

View File

@@ -15,13 +15,12 @@ import java.util.List;
import java.util.Optional;
import org.dspace.AbstractDSpaceTest;
import org.dspace.external.MockOpenAIRERestConnector;
import org.dspace.external.factory.ExternalServiceFactory;
import org.dspace.external.model.ExternalDataObject;
import org.dspace.external.provider.ExternalDataProvider;
import org.dspace.external.service.ExternalDataService;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for OpenAIREFundingDataProvider
@@ -29,11 +28,10 @@ import org.mockito.junit.MockitoJUnitRunner;
* @author pgraca
*
*/
@RunWith(MockitoJUnitRunner.class)
public class OpenAIREFundingDataProviderTest extends AbstractDSpaceTest {
@InjectMocks
OpenAIREFundingDataProvider openAIREFundingDataProvider;
ExternalDataService externalDataService;
ExternalDataProvider openAIREFundingDataProvider;
/**
* This method will be run before every test as per @Before. It will initialize
@@ -44,8 +42,9 @@ public class OpenAIREFundingDataProviderTest extends AbstractDSpaceTest {
*/
@Before
public void init() {
openAIREFundingDataProvider.setSourceIdentifier("openAIREFunding");
openAIREFundingDataProvider.setConnector(new MockOpenAIRERestConnector("https://api.openaire.eu"));
// Set up External Service Factory and set data providers
externalDataService = ExternalServiceFactory.getInstance().getExternalDataService();
openAIREFundingDataProvider = externalDataService.getExternalDataProvider("openAIREFunding");
}
@Test