Project

General

Profile

« Previous | Next » 

Revision 45164

Added by Claudio Atzori over 7 years ago

migrated to dnet45, using updated mockito version

View differences:

modules/cnr-enabling-database-service/trunk/src/test/java/eu/dnetlib/enabling/database/utils/DatabaseUtilsTest.java
111 111 

  		




  112
  112
  
    
		when(jdbcTemplate.queryForList("SELECT * FROM information_schema.columns WHERE table_name = ?", new Object[] { TABLE })).thenReturn(


  		




  113
  113
  
    
				Arrays.asList(MAP, MAP, MAP));


  		




  114
  
  
    
		when(jdbcTemplate.queryForList("SELECT profileid FROM dnet_tables WHERE table_name='THE_TABLE' AND database_db_name='THE_DB'", String.class))


  		




  115
  
  
    
				.thenReturn(Arrays.asList("1234"));


  		




  
  114
  
    
		//when(jdbcTemplate.queryForList("SELECT profileid FROM dnet_tables WHERE table_name='THE_TABLE' AND database_db_name='THE_DB'", String.class))


  		




  
  115
  
    
		//		.thenReturn(Arrays.asList("1234"));


  		




  116
  116
  
    

  		




  117
  117
  
    
		when(dataSourceFactory.createDataSource(anyString())).thenReturn(dataSource);


  		




  118
  
  
    
		when(jdbcTemplate.getDataSource()).thenReturn(dataSource);


  		




  
  118
  
    
		//when(jdbcTemplate.getDataSource()).thenReturn(dataSource);


  		




  119
  119
  
    

  		




  120
  120
  
    
		when(transactionTemplateFactory.createTransactionTemplate(dataSource)).thenReturn(transactionTemplate);


  		




  121
  121
  
    

  		












  

    
      modules/cnr-enabling-database-service/trunk/src/test/java/eu/dnetlib/enabling/database/DatabaseServiceCoreTest.java
    
  





  74
  74
  
    
		when(resultSetListenerFactory.createLoggedTableListener(DB_NAME, TABLE_NAME, TABLE_FROM, TABLE_UNTIL)).thenReturn(listener_from_until);


  		




  75
  75
  
    
		when(resultSetListenerFactory.createSQLListener(DB_NAME, SQL)).thenReturn(listener_sql);


  		




  76
  76
  
    

  		




  77
  
  
    
		when(ROW.getTable()).thenReturn(TABLE_NAME);


  		




  78
  
  
    
		when(ROW.getFields()).thenReturn(ROW_FIELDS);


  		




  
  77
  
    
		//when(ROW.getTable()).thenReturn(TABLE_NAME);


  		




  
  78
  
    
		//when(ROW.getFields()).thenReturn(ROW_FIELDS);


  		




  79
  79
  
    
	}


  		




  80
  80
  
    

  		




  81
  81
  
    
	@Ignore


  		












  

    
      modules/cnr-enabling-database-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
  
    
	</parent>


  		




  8
  8
  
    
	<modelVersion>4.0.0</modelVersion>


  		




  9
  9
  
    
	<groupId>eu.dnetlib</groupId>


  		




  ......




  11
  11
  
    
	<packaging>jar</packaging>


  		




  12
  12
  
    
	<version>3.0.1-SNAPSHOT</version>


  		




  13
  13
  
    
	<scm>


  		




  14
  
  
    
	  <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/cnr-enabling-database-service/trunk</developerConnection>


  		




  
  14
  
    
	  <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/cnr-enabling-database-service/trunk</developerConnection>


  		




  15
  15
  
    
	</scm>


  		




  16
  16
  
    
	<dependencies>


  		




  17
  17
  
    
		<dependency>


  		




  ......




  73
  73
  
    
		<dependency>


  		




  74
  74
  
    
			<groupId>org.mockito</groupId>


  		




  75
  75
  
    
			<artifactId>mockito-core</artifactId>


  		




  76
  
  
    
			<version>1.9.5</version>


  		




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


  		




  77
  77
  
    
			<scope>test</scope>


  		




  78
  78
  
    
		</dependency>


  		




  79
  79
  
    
		<dependency>


  		












Also available in:  Unified diff