Project

General

Profile

« Previous | Next » 

Revision 45114

migrated to dnet45, using updated mockito version in tests

View differences:

DefaultUniqueServiceLocatorTest.java
18 18
import org.junit.Test;
19 19
import org.junit.runner.RunWith;
20 20
import org.mockito.Mock;
21
import org.mockito.runners.MockitoJUnit44Runner;
21
import org.mockito.junit.MockitoJUnitRunner;
22 22
import org.springframework.context.ApplicationContext;
23 23

  
24 24
import com.google.common.collect.Lists;
......
32 32
import eu.dnetlib.enabling.tools.registration.ServiceNameResolver;
33 33
import eu.dnetlib.enabling.tools.registration.ServiceRegistrationManager;
34 34

  
35
@RunWith(MockitoJUnit44Runner.class)
35
@RunWith(MockitoJUnitRunner.class)
36 36
public class DefaultUniqueServiceLocatorTest {
37 37

  
38 38
	/**
......
83 83
		when(serviceNameResolver.getName(ResultSetService.class)).thenReturn(SERVICE_NAME);
84 84
		when(lookupService.quickSearchProfile(XQUERY)).thenReturn(Lists.newArrayList(st1.toString(), st2.toString(), st3.toString()));
85 85
		when(lookupService.getResourceProfileByQuery(anyString())).thenReturn(st2.toString());
86
		when(appContext.getBeansOfType(ServiceRegistrationManager.class)).thenReturn(registratorBeans);
87
		when(appContext.getBeansOfType(ResultSetService.class)).thenReturn(serviceBeans);
86
		//when(appContext.getBeansOfType(ServiceRegistrationManager.class)).thenReturn(registratorBeans);
87
		//when(appContext.getBeansOfType(ResultSetService.class)).thenReturn(serviceBeans);
88 88

  
89
		when(resultSetRegistrator.getServiceProfile()).thenReturn(opaqueResource);
90
		when(resultSetRegistrator.getService()).thenReturn(resultsetService);
91
		when(opaqueResource.getResourceId()).thenReturn("2222");
89
		//when(resultSetRegistrator.getServiceProfile()).thenReturn(opaqueResource);
90
		//when(resultSetRegistrator.getService()).thenReturn(resultsetService);
91
		//when(opaqueResource.getResourceId()).thenReturn("2222");
92 92

  
93 93
	}
94 94

  

Also available in: Unified diff