Briq
/
jaydebeapi
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #148 from baztian/fix-mockito-incompat 

Upgrade mockito to work around JPype incompatibilities
master
baztian 2020-06-05 00:28:00 +02:00 committed by GitHub
parent dc8dc67a45 5449ca8dab
commit 53012d5433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mockdriver/pom.xml
View File

@ -15,8 +15,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-core</artifactId>
<version>1.10.19</version> <version>3.3.3</version>
<!-- non-test scope on purpose --> <!-- non-test scope on purpose -->
</dependency> </dependency>
<dependency> <dependency>

10
mockdriver/src/main/java/org/jaydebeapi/mockdriver/MockConnection.java
View File

@ -57,7 +57,7 @@ public abstract class MockConnection implements Connection {
PreparedStatement mockPreparedStatement = Mockito.mock(PreparedStatement.class); PreparedStatement mockPreparedStatement = Mockito.mock(PreparedStatement.class);
Throwable exception = createException(className, exceptionMessage); Throwable exception = createException(className, exceptionMessage);
Mockito.when(mockPreparedStatement.execute()).thenThrow(exception); Mockito.when(mockPreparedStatement.execute()).thenThrow(exception);
Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement); Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
} }
public final void mockBigDecimalResult(long value, int scale) throws SQLException { public final void mockBigDecimalResult(long value, int scale) throws SQLException {
@ -73,7 +73,7 @@ public abstract class MockConnection implements Connection {
BigDecimal columnValue = BigDecimal.valueOf(value, scale); BigDecimal columnValue = BigDecimal.valueOf(value, scale);
Mockito.when(mockResultSet.getObject(1)).thenReturn(columnValue); Mockito.when(mockResultSet.getObject(1)).thenReturn(columnValue);
Mockito.when(mockMetaData.getColumnType(1)).thenReturn(Types.DECIMAL); Mockito.when(mockMetaData.getColumnType(1)).thenReturn(Types.DECIMAL);
Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement); Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
} }
public final void mockDoubleDecimalResult(double value) throws SQLException { public final void mockDoubleDecimalResult(double value) throws SQLException {
@ -89,7 +89,7 @@ public abstract class MockConnection implements Connection {
Double columnValue = Double.valueOf(value); Double columnValue = Double.valueOf(value);
Mockito.when(mockResultSet.getObject(1)).thenReturn(value); Mockito.when(mockResultSet.getObject(1)).thenReturn(value);
Mockito.when(mockMetaData.getColumnType(1)).thenReturn(Types.DECIMAL); Mockito.when(mockMetaData.getColumnType(1)).thenReturn(Types.DECIMAL);
Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement); Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
} }
public final void mockDateResult(int year, int month, int day) throws SQLException { public final void mockDateResult(int year, int month, int day) throws SQLException {
@ -109,7 +109,7 @@ public abstract class MockConnection implements Connection {
Date ancientDate = new Date(cal.getTime().getTime()); Date ancientDate = new Date(cal.getTime().getTime());
Mockito.when(mockResultSet.getDate(1)).thenReturn(ancientDate); Mockito.when(mockResultSet.getDate(1)).thenReturn(ancientDate);
Mockito.when(mockMetaData.getColumnType(1)).thenReturn(Types.DATE); Mockito.when(mockMetaData.getColumnType(1)).thenReturn(Types.DATE);
Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement); Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
} }
public final void mockType(String sqlTypesName) throws SQLException { public final void mockType(String sqlTypesName) throws SQLException {
@ -123,7 +123,7 @@ public abstract class MockConnection implements Connection {
Mockito.when(mockMetaData.getColumnCount()).thenReturn(1); Mockito.when(mockMetaData.getColumnCount()).thenReturn(1);
int sqlTypeCode = extractTypeCodeForName(sqlTypesName); int sqlTypeCode = extractTypeCodeForName(sqlTypesName);
Mockito.when(mockMetaData.getColumnType(1)).thenReturn(sqlTypeCode); Mockito.when(mockMetaData.getColumnType(1)).thenReturn(sqlTypeCode);
Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement); Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
} }
public final ResultSet verifyResultSet() { public final ResultSet verifyResultSet() {

2
tox.ini
View File

@ -22,7 +22,7 @@ deps =
py35-newjpype: JPype1==0.7.5 py35-newjpype: JPype1==0.7.5
py36-newjpype: JPype1==0.7.5 py36-newjpype: JPype1==0.7.5
py27-newjpype: JPype1==0.7.0 py27-newjpype: JPype1==0.7.0
jip==0.9.14 jip==0.9.15
coverage==4.5.4 coverage==4.5.4
commands = commands =
python --version python --version