Project

General

Profile

« Previous | Next » 

Revision 45120

migrated to dnet45, using updated mockito version in tests

View differences:

modules/cnr-resultset-client/trunk/src/test/java/eu/dnetlib/enabling/resultset/ResultSetPageProviderTest.java
14 14
import org.junit.runner.RunWith;
15 15
import org.mockito.Mock;
16 16
import org.mockito.invocation.InvocationOnMock;
17
import org.mockito.runners.MockitoJUnit44Runner;
17
import org.mockito.junit.MockitoJUnitRunner;
18

  
18 19
import org.mockito.stubbing.Answer;
19 20

  
20 21
import com.google.common.collect.Lists;
......
22 23
import eu.dnetlib.enabling.resultset.client.ResultSetPageProvider;
23 24
import eu.dnetlib.enabling.resultset.rmi.ResultSetService;
24 25

  
25
@RunWith(MockitoJUnit44Runner.class)
26
@RunWith(MockitoJUnitRunner.class)
26 27
public class ResultSetPageProviderTest {
27 28

  
28 29
	private static final String RSID = "RS_123";
modules/cnr-resultset-client/trunk/src/main/java/eu/dnetlib/enabling/resultset/client/ResultSetClientFactory.java
5 5
import eu.dnetlib.enabling.resultset.client.utils.EPRUtils;
6 6
import eu.dnetlib.enabling.resultset.rmi.ResultSetService;
7 7
import eu.dnetlib.enabling.tools.ServiceResolver;
8

  
8 9
import org.apache.commons.logging.Log;
9 10
import org.apache.commons.logging.LogFactory;
11

  
10 12
import org.apache.cxf.endpoint.Client;
11 13
import org.apache.cxf.frontend.ClientProxy;
14

  
12 15
import org.apache.cxf.transport.http.HTTPConduit;
13 16
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
14 17
import org.springframework.beans.factory.annotation.Required;
15 18

  
19

  
16 20
/**
17 21
 * 
18 22
 * @author claudio
......
137 141

  
138 142
			http.setClient(httpClientPolicy);
139 143
		}
144

  
140 145
		return service;
141 146
	}
142 147

  
modules/cnr-resultset-client/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
	</parent>
8 8
	<modelVersion>4.0.0</modelVersion>
9 9
	<groupId>eu.dnetlib</groupId>
......
11 11
	<packaging>jar</packaging>
12 12
	<version>2.1.2-SNAPSHOT</version>
13 13
	<scm>
14
		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/cnr-resultset-client/trunk</developerConnection>
14
		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/cnr-resultset-client/trunk</developerConnection>
15 15
	</scm>
16 16
	<dependencies>
17 17
		<dependency>
......
26 26
			<version>[2.0.0,3.0.0)</version>
27 27
		</dependency>
28 28
		<dependency>
29
			<groupId>org.apache.cxf</groupId>
30
			<artifactId>cxf-rt-transports-http</artifactId>
31
			<version>${cxf.version}</version>
32
		</dependency>
33
		<dependency>
29 34
			<groupId>org.mockito</groupId>
30 35
			<artifactId>mockito-core</artifactId>
31
			<version>1.6</version>
36
			<version>${mockito.version}</version>
32 37
			<scope>test</scope>
33 38
		</dependency>
34 39
	</dependencies>

Also available in: Unified diff