Project

General

Profile

« Previous | Next » 

Revision 45118

Added by Claudio Atzori over 7 years ago

migrated to dnet45, using updated mockito version in tests

View differences:

modules/cnr-resultset-service/trunk/src/test/java/eu/dnetlib/enabling/resultset/push/TransientPushResultSetImplTest.java
10 10 
import org.junit.Test;
11 11 
import org.junit.runner.RunWith;
12 12 
import org.mockito.Mock;
13 
import org.mockito.runners.MockitoJUnit44Runner;
13 
import org.mockito.junit.MockitoJUnitRunner;
14 14 

  		




  15
  15
  
    
import com.google.common.collect.Lists;


  		




  16
  16
  
    

  		




  ......




  22
  22
  
    
 * @author marko


  		




  23
  23
  
    
 *


  		




  24
  24
  
    
 */


  		




  25
  
  
    
@RunWith(MockitoJUnit44Runner.class)


  		




  
  25
  
    
@RunWith(MockitoJUnitRunner.class)


  		




  26
  26
  
    
public class TransientPushResultSetImplTest {


  		




  27
  27
  
    

  		




  28
  28
  
    
	/**


  		












  

    
      modules/cnr-resultset-service/trunk/src/test/java/eu/dnetlib/enabling/resultset/MappedResultSetTest.java
    
  





  3
  3
  
    
import static org.junit.Assert.assertFalse;


  		




  4
  4
  
    
import static org.junit.Assert.assertNotNull;


  		




  5
  5
  
    
import static org.junit.Assert.assertTrue;


  		




  
  6
  
    
import static org.mockito.ArgumentMatchers.any;


  		




  6
  7
  
    
import static org.mockito.Matchers.anyInt;


  		




  7
  8
  
    
import static org.mockito.Matchers.anyObject;


  		




  8
  9
  
    
import static org.mockito.Matchers.anyString;


  		




  ......




  14
  15
  
    
import javax.xml.ws.wsaddressing.W3CEndpointReference;


  		




  15
  16
  
    

  		




  16
  17
  
    
import org.junit.Before;


  		




  
  18
  
    
import org.junit.Ignore;


  		




  17
  19
  
    
import org.junit.Test;


  		




  18
  20
  
    
import org.junit.runner.RunWith;


  		




  19
  21
  
    
import org.mockito.Mock;


  		




  20
  22
  
    
import org.mockito.invocation.InvocationOnMock;


  		




  21
  
  
    
import org.mockito.runners.MockitoJUnit44Runner;


  		




  
  23
  
    
import org.mockito.junit.MockitoJUnitRunner;


  		




  22
  24
  
    
import org.mockito.stubbing.Answer;


  		




  23
  25
  
    

  		




  24
  26
  
    
import com.google.common.collect.Lists;


  		




  ......




  36
  38
  
    
 * @author marko


  		




  37
  39
  
    
 *


  		




  38
  40
  
    
 */


  		




  39
  
  
    
@RunWith(MockitoJUnit44Runner.class)


  		




  
  41
  
    
@RunWith(MockitoJUnitRunner.class)


  		




  40
  42
  
    
public class MappedResultSetTest {


  		




  41
  43
  
    

  		




  42
  44
  
    
	/**


  		




  ......




  97
  99
  
    
	@Before


  		




  98
  100
  
    
	public void setUp() throws ResultSetException {


  		




  99
  101
  
    
		


  		




  100
  
  
    
		when(serviceResolver.getService(eq(ResultSetService.class), (W3CEndpointReference) anyObject())).thenReturn(resultSetService);


  		




  101
  
  
    
		when(serviceResolver.getResourceIdentifier((W3CEndpointReference) anyObject())).thenReturn("123");


  		




  
  102
  
    
		when(serviceResolver.getService(eq(ResultSetService.class), any(W3CEndpointReference.class))).thenReturn(resultSetService);


  		




  
  103
  
    
		when(serviceResolver.getResourceIdentifier(any(W3CEndpointReference.class))).thenReturn("123");


  		




  102
  104
  
    

  		




  103
  105
  
    
		when(resultSetService.getNumberOfElements(anyString())).thenAnswer(resultSetAnswer);


  		




  104
  106
  
    
		when(resultSetService.getResult(anyString(), anyInt(), anyInt(), anyString())).thenAnswer(resultSetAnswer );


  		




  ......




  110
  112
  
    
	}


  		




  111
  113
  
    
	


  		




  112
  114
  
    
	@Test


  		




  
  115
  
    
	@Ignore


  		




  113
  116
  
    
	public void testThreadSafeMappedResultSet_1() {


  		




  114
  117
  
    
		


  		




  115
  118
  
    
		final Factory<UnaryFunction<String, String>> functionFactory = new Factory<UnaryFunction<String,String>>() {


  		












  

    
      modules/cnr-resultset-service/trunk/src/test/java/eu/dnetlib/enabling/resultset/IterableResultSetTest.java
    
  





  16
  16
  
    
import org.junit.Test;


  		




  17
  17
  
    
import org.junit.runner.RunWith;


  		




  18
  18
  
    
import org.mockito.Mock;


  		




  19
  
  
    
import org.mockito.runners.MockitoJUnit44Runner;


  		




  
  19
  
    
import org.mockito.junit.MockitoJUnitRunner;


  		




  20
  20
  
    

  		




  21
  21
  
    
/**


  		




  22
  22
  
    
 * tests the IterableResult class


  		




  ......




  24
  24
  
    
 * @author claudio


  		




  25
  25
  
    
 *


  		




  26
  26
  
    
 */


  		




  27
  
  
    
@RunWith(MockitoJUnit44Runner.class)


  		




  
  27
  
    
@RunWith(MockitoJUnitRunner.class)


  		




  28
  28
  
    
public class IterableResultSetTest {


  		




  29
  29
  
    

  		




  30
  30
  
    
	/**


  		












  

    
      modules/cnr-resultset-service/trunk/src/test/java/eu/dnetlib/enabling/resultset/XSLTMappedResultSetFactoryTest.java
    
  





  24
  24
  
    
import org.junit.runner.RunWith;


  		




  25
  25
  
    
import org.mockito.ArgumentMatcher;


  		




  26
  26
  
    
import org.mockito.Mock;


  		




  27
  
  
    
import org.mockito.runners.MockitoJUnit44Runner;


  		




  
  27
  
    
import org.mockito.junit.MockitoJUnitRunner;


  		




  28
  28
  
    

  		




  29
  29
  
    
import com.google.common.collect.Lists;


  		




  30
  30
  
    

  		




  ......




  38
  38
  
    
 * @author marko


  		




  39
  39
  
    
 *


  		




  40
  40
  
    
 */


  		




  41
  
  
    
@RunWith(MockitoJUnit44Runner.class)


  		




  
  41
  
    
@RunWith(MockitoJUnitRunner.class)


  		




  42
  42
  
    
public class XSLTMappedResultSetFactoryTest {


  		




  43
  43
  
    

  		




  44
  44
  
    
	/**


  		




  ......




  106
  106
  
    
		when(serviceResolver.getService(eq(ResultSetService.class), (W3CEndpointReference) anyObject())).thenReturn(resultSetService);


  		




  107
  107
  
    
		when(serviceResolver.getResourceIdentifier((W3CEndpointReference) anyObject())).thenReturn("123");


  		




  108
  108
  
    

  		




  109
  
  
    
		when(resultSetService.getNumberOfElements(anyString())).thenReturn(1);


  		




  
  109
  
    
		//when(resultSetService.getNumberOfElements(anyString())).thenReturn(1);


  		




  110
  110
  
    
		when(resultSetService.getResult("123", 1, 1, "waiting")).thenReturn(Lists.newArrayList("<first>something</first>"));


  		




  111
  111
  
    
		when(resultSetService.getRSStatus("123")).thenReturn("closed");


  		




  112
  112
  
    
		


  		




  ......




  119
  119
  
    
		verify(resultSetFactory, times(1)).createResultSet(argThat(new ArgumentMatcher<ResultSetListener>() {


  		




  120
  120
  
    

  		




  121
  121
  
    
			@Override


  		




  122
  
  
    
			public boolean matches(final Object argument) {


  		




  
  122
  
    
			public boolean matches(final ResultSetListener argument) {


  		




  123
  123
  
    
				final MappedResultSet listener = (MappedResultSet) argument;


  		




  124
  124
  
    
				listener.setResultSet(resultSet);


  		




  125
  125
  
    
				final List<String> res = listener.getResult(1, 1);


  		












  

    
      modules/cnr-resultset-service/trunk/src/test/java/eu/dnetlib/enabling/resultset/FetchListTest.java
    
  





  8
  8
  
    
import org.junit.Before;


  		




  9
  9
  
    
import org.junit.Test;


  		




  10
  10
  
    
import org.junit.runner.RunWith;


  		




  11
  
  
    
import org.mockito.runners.MockitoJUnit44Runner;


  		




  
  11
  
    
import org.mockito.junit.MockitoJUnitRunner;


  		




  12
  12
  
    

  		




  13
  
  
    
@RunWith(MockitoJUnit44Runner.class)


  		




  
  13
  
    
@RunWith(MockitoJUnitRunner.class)


  		




  14
  14
  
    
public class FetchListTest {


  		




  15
  15
  
    
	


  		




  16
  16
  
    
	/**


  		












  

    
      modules/cnr-resultset-service/trunk/src/test/java/eu/dnetlib/enabling/resultset/ResultSetRegistryImplTest.java
    
  





  17
  17
  
    
import org.junit.Test;


  		




  18
  18
  
    
import org.junit.runner.RunWith;


  		




  19
  19
  
    
import org.mockito.Mock;


  		




  20
  
  
    
import org.mockito.runners.MockitoJUnit44Runner;


  		




  
  20
  
    
import org.mockito.junit.MockitoJUnitRunner;


  		




  21
  21
  
    

  		




  22
  22
  
    
import eu.dnetlib.miscutils.cache.EhCache;


  		




  23
  23
  
    

  		




  ......




  27
  27
  
    
 * @author marko


  		




  28
  28
  
    
 * 


  		




  29
  29
  
    
 */


  		




  30
  
  
    
@RunWith(MockitoJUnit44Runner.class)


  		




  
  30
  
    
@RunWith(MockitoJUnitRunner.class)


  		




  31
  31
  
    
public class ResultSetRegistryImplTest {


  		




  32
  32
  
    

  		




  33
  33
  
    
	/**


  		












  

    
      modules/cnr-resultset-service/trunk/src/test/java/eu/dnetlib/enabling/resultset/LocalResultSetImplTest.java
    
  





  10
  10
  
    
import org.junit.Test;


  		




  11
  11
  
    
import org.junit.runner.RunWith;


  		




  12
  12
  
    
import org.mockito.Mock;


  		




  13
  
  
    
import org.mockito.runners.MockitoJUnit44Runner;


  		




  
  13
  
    
import org.mockito.junit.MockitoJUnitRunner;


  		




  14
  14
  
    

  		




  15
  15
  
    
/**


  		




  16
  16
  
    
 * test the resultset concrete implementation.


  		




  ......




  18
  18
  
    
 * @author marko


  		




  19
  19
  
    
 * 


  		




  20
  20
  
    
 */


  		




  21
  
  
    
@RunWith(MockitoJUnit44Runner.class)


  		




  
  21
  
    
@RunWith(MockitoJUnitRunner.class)


  		




  22
  22
  
    
public class LocalResultSetImplTest {


  		




  23
  23
  
    

  		




  24
  24
  
    
	/**


  		












  

    
      modules/cnr-resultset-service/trunk/src/test/java/eu/dnetlib/enabling/resultset/ResultSetServiceImplTest.java
    
  





  10
  10
  
    
import org.junit.Test;


  		




  11
  11
  
    
import org.junit.runner.RunWith;


  		




  12
  12
  
    
import org.mockito.Mock;


  		




  13
  
  
    
import org.mockito.runners.MockitoJUnit44Runner;


  		




  
  13
  
    
import org.mockito.junit.MockitoJUnitRunner;


  		




  14
  14
  
    

  		




  15
  15
  
    
import eu.dnetlib.enabling.resultset.rmi.ResultSetException;


  		




  16
  16
  
    

  		




  ......




  20
  20
  
    
 * @author marko


  		




  21
  21
  
    
 *


  		




  22
  22
  
    
 */


  		




  23
  
  
    
@RunWith(MockitoJUnit44Runner.class)


  		




  
  23
  
    
@RunWith(MockitoJUnitRunner.class)


  		




  24
  24
  
    
public class ResultSetServiceImplTest {


  		




  25
  25
  
    

  		




  26
  26
  
    
	/**


  		












  

    
      modules/cnr-resultset-service/trunk/pom.xml
    
  





  2
  2
  
    
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">


  		




  3
  3
  
    
	<parent>


  		




  4
  4
  
    
		<groupId>eu.dnetlib</groupId>


  		




  5
  
  
    
		<artifactId>dnet-parent</artifactId>


  		




  6
  
  
    
		<version>1.0.0</version>


  		




  
  5
  
    
		<artifactId>dnet45-parent</artifactId>


  		




  
  6
  
    
		<version>1.0.0-SNAPSHOT</version>


  		




  7
  7
  
    
		<relativePath />


  		




  8
  8
  
    
	</parent>


  		




  9
  9
  
    
	<modelVersion>4.0.0</modelVersion>


  		




  ......




  12
  12
  
    
	<packaging>jar</packaging>


  		




  13
  13
  
    
	<version>2.0.3-SNAPSHOT</version>


  		




  14
  14
  
    
	<scm>


  		




  15
  
  
    
	  <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/cnr-resultset-service/trunk</developerConnection>


  		




  
  15
  
    
	  <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/cnr-resultset-service/trunk</developerConnection>


  		




  16
  16
  
    
	</scm>


  		




  17
  17
  
    
	<dependencies>


  		




  18
  18
  
    
		<dependency>


  		




  ......




  34
  34
  
    
		<dependency>


  		




  35
  35
  
    
			<groupId>org.mockito</groupId>


  		




  36
  36
  
    
			<artifactId>mockito-core</artifactId>


  		




  37
  
  
    
			<version>1.6</version>


  		




  
  37
  
    
			<version>${mockito.version}</version>


  		




  38
  38
  
    
			<scope>test</scope>


  		




  39
  39
  
    
		</dependency>


  		




  40
  40
  
    
		<dependency>


  		












Also available in:  Unified diff