Project

General

Profile

« Previous | Next » 

Revision 46774

added openaire specific behaviour: do not update the datasource related information when the datasource is managed

View differences:

modules/cnr-enabling-database-service/trunk/src/test/java/eu/dnetlib/enabling/database/utils/DatabaseUtilsTest.java
1 1
package eu.dnetlib.enabling.database.utils;
2 2

  
3
import static org.junit.Assert.assertEquals;
4
import static org.junit.Assert.assertNotNull;
5
import static org.junit.Assert.assertTrue;
6
import static org.mockito.Matchers.any;
7
import static org.mockito.Matchers.anyObject;
8
import static org.mockito.Matchers.anyString;
9
import static org.mockito.Mockito.atLeastOnce;
10
import static org.mockito.Mockito.never;
11
import static org.mockito.Mockito.times;
12
import static org.mockito.Mockito.verify;
13
import static org.mockito.Mockito.when;
14

  
15 3
import java.io.StringReader;
16 4
import java.sql.Date;
17 5
import java.util.Arrays;
18 6
import java.util.HashMap;
19 7
import java.util.List;
20 8
import java.util.Map;
21

  
22 9
import javax.sql.DataSource;
23 10

  
11
import com.google.common.collect.Lists;
12
import com.google.common.collect.Maps;
13
import eu.dnetlib.enabling.database.DataSourceFactory;
14
import eu.dnetlib.enabling.database.TransactionTemplateFactory;
15
import eu.dnetlib.enabling.database.objects.DnetDatabase;
24 16
import org.apache.velocity.app.VelocityEngine;
25 17
import org.dom4j.Document;
26 18
import org.dom4j.DocumentHelper;
......
36 28
import org.springframework.transaction.support.TransactionCallback;
37 29
import org.springframework.transaction.support.TransactionTemplate;
38 30

  
39
import com.google.common.collect.Lists;
40
import com.google.common.collect.Maps;
31
import static org.junit.Assert.*;
32
import static org.mockito.Matchers.any;
33
import static org.mockito.Matchers.anyObject;
34
import static org.mockito.Matchers.anyString;
35
import static org.mockito.Mockito.*;
41 36

  
42
import eu.dnetlib.enabling.database.DataSourceFactory;
43
import eu.dnetlib.enabling.database.TransactionTemplateFactory;
44
import eu.dnetlib.enabling.database.objects.DnetDatabase;
45

  
46 37
@RunWith(MockitoJUnitRunner.class)
47 38
public class DatabaseUtilsTest {
48 39

  
......
212 203
	public void testImportFromIterable() throws Exception {
213 204
		List<String> iterable = Lists.newArrayList("<ROWS><ROW table='t1' /></ROWS>", "<ROWS><ROW table='t2' /></ROWS>");
214 205

  
215
		GenericRow row1 = new GenericRow(TABLE, MAP, true);
216
		GenericRow row2 = new GenericRow(TABLE, MAP, false);;
206
		GenericRow row1 = new GenericRow("1", TABLE, MAP, true);
207
		GenericRow row2 = new GenericRow("2", TABLE, MAP, false);;
217 208

  
218 209
		when(transactionTemplate.execute((TransactionCallback) anyObject())).thenReturn(Lists.newArrayList(row1, row2, row1, row2));
219 210

  

Also available in: Unified diff