Skip to content

Commit d308c57

Browse files
hazendazhazendaz
authored
Merge pull request #982 from hazendaz/tests
Cleanup tests
2 parents dd4cb0b + 8639ceb commit d308c57

File tree

68 files changed

+494
-520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+494
-520
lines changed

‎src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 the original author or authors.
2+
* Copyright 2010-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ public abstract class AbstractMyBatisSpringTest {
5050
@BeforeAll
5151
public static void setupBase() throws Exception {
5252
// create an SqlSessionFactory that will use SpringManagedTransactions
53-
SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean();
53+
var factoryBean = new SqlSessionFactoryBean();
5454
factoryBean.setMapperLocations(new ClassPathResource("org/mybatis/spring/TestMapper.xml"));
5555
// note running without SqlSessionFactoryBean.configLocation set => default configuration
5656
factoryBean.setDataSource(dataSource);
@@ -111,7 +111,7 @@ protected void assertExecuteCount(int count) {
111111

112112
protected void assertConnectionClosed(MockConnection connection) {
113113
try {
114-
if ((connection != null) && !connection.isClosed()) {
114+
if (connection != null && !connection.isClosed()) {
115115
fail("Connection is not closed");
116116
}
117117
} catch (SQLException sqle) {
@@ -121,10 +121,10 @@ protected void assertConnectionClosed(MockConnection connection) {
121121

122122
protected MockConnection createMockConnection() {
123123
// this query must be the same as the query in TestMapper.xml
124-
MockResultSet rs = new MockResultSet("SELECT 1");
124+
var rs = new MockResultSet("SELECT 1");
125125
rs.addRow(new Object[] { 1 });
126126

127-
MockConnection con = new MockConnection();
127+
var con = new MockConnection();
128128
con.getPreparedStatementResultSetHandler().prepareResultSet("SELECT 1", rs);
129129

130130
return con;

‎src/test/java/org/mybatis/spring/ExecutorInterceptor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 the original author or authors.
2+
* Copyright 2010-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/test/java/org/mybatis/spring/MyBatisExceptionTranslatorTest.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 the original author or authors.
2+
* Copyright 2010-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,8 +15,10 @@
1515
*/
1616
package org.mybatis.spring;
1717

18-
import static org.junit.jupiter.api.Assertions.*;
19-
import static org.mockito.Mockito.*;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
20+
import static org.junit.jupiter.api.Assertions.assertTrue;
21+
import static org.mockito.Mockito.times;
2022

2123
import com.mockrunner.mock.jdbc.MockDataSource;
2224

@@ -25,60 +27,58 @@
2527
import org.apache.ibatis.exceptions.PersistenceException;
2628
import org.junit.jupiter.api.Test;
2729
import org.mockito.Mockito;
28-
import org.springframework.dao.DataAccessException;
2930
import org.springframework.jdbc.UncategorizedSQLException;
3031
import org.springframework.jdbc.support.SQLExceptionTranslator;
3132

3233
class MyBatisExceptionTranslatorTest {
3334

3435
@Test
3536
void shouldNonPersistenceExceptionBeTranslatedToNull() {
36-
MockDataSource mockDataSource = new MockDataSource();
37-
MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(mockDataSource, false);
38-
DataAccessException e = translator.translateExceptionIfPossible(new RuntimeException());
37+
var mockDataSource = new MockDataSource();
38+
var translator = new MyBatisExceptionTranslator(mockDataSource, false);
39+
var e = translator.translateExceptionIfPossible(new RuntimeException());
3940
assertNull(e);
4041
}
4142

4243
@Test
4344
void shouldSqlExceptionBeTranslatedToUncategorizedSqlException() {
44-
String msg = "Error!";
45-
SQLException sqlException = new SQLException(msg);
46-
SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class);
47-
MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false);
48-
DataAccessException e = translator.translateExceptionIfPossible(new PersistenceException(sqlException));
45+
var msg = "Error!";
46+
var sqlException = new SQLException(msg);
47+
var sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class);
48+
var translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false);
49+
var e = translator.translateExceptionIfPossible(new PersistenceException(sqlException));
4950
assertTrue(e instanceof UncategorizedSQLException);
5051
Mockito.verify(sqlExceptionTranslator, times(1)).translate(SQLException.class.getName() + ": " + msg + "\n", null,
5152
sqlException);
5253
}
5354

5455
@Test
5556
void shouldPersistenceExceptionBeTranslatedToMyBatisSystemException() {
56-
String msg = "Error!";
57-
SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class);
58-
MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false);
59-
DataAccessException e = translator.translateExceptionIfPossible(new PersistenceException(msg));
57+
var msg = "Error!";
58+
var sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class);
59+
var translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false);
60+
var e = translator.translateExceptionIfPossible(new PersistenceException(msg));
6061
assertTrue(e instanceof MyBatisSystemException);
6162
assertEquals(msg, e.getMessage());
6263
}
6364

6465
@Test
6566
void shouldNestedPersistenceExceptionReportsMsgOfParentException() {
66-
String msg = "Error!";
67-
SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class);
68-
MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false);
69-
DataAccessException e = translator
67+
var msg = "Error!";
68+
var sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class);
69+
var translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false);
70+
var e = translator
7071
.translateExceptionIfPossible(new PersistenceException(msg, new PersistenceException("Inner error!")));
7172
assertTrue(e instanceof MyBatisSystemException);
7273
assertEquals(msg, e.getMessage());
7374
}
7475

7576
@Test
7677
void shouldNestedPersistenceExceptionReportsMsgOfChildExceptionIfParentsMsgIsNull() {
77-
String msg = "Error!";
78-
SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class);
79-
MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false);
80-
DataAccessException e = translator
81-
.translateExceptionIfPossible(new PersistenceException(null, new PersistenceException(msg)));
78+
var msg = "Error!";
79+
var sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class);
80+
var translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false);
81+
var e = translator.translateExceptionIfPossible(new PersistenceException(null, new PersistenceException(msg)));
8282
assertTrue(e instanceof MyBatisSystemException);
8383
assertEquals(msg, e.getMessage());
8484
}

‎src/test/java/org/mybatis/spring/MyBatisSpringTest.java‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 the original author or authors.
2+
* Copyright 2010-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ class MyBatisSpringTest extends AbstractMyBatisSpringTest {
4747
@AfterEach
4848
void validateSessionClose() {
4949
// assume if the Executor is closed, the Session is too
50-
if ((session != null) && !executorInterceptor.isExecutorClosed()) {
50+
if (session != null && !executorInterceptor.isExecutorClosed()) {
5151
session = null;
5252
fail("SqlSession is not closed");
5353
} else {
@@ -140,8 +140,8 @@ void testSpringAPIWithMyBatisClose() {
140140
// Spring API should work with a MyBatis TransactionFactories
141141
@Test
142142
void testWithNonSpringTransactionFactory() {
143-
Environment original = sqlSessionFactory.getConfiguration().getEnvironment();
144-
Environment nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource);
143+
var original = sqlSessionFactory.getConfiguration().getEnvironment();
144+
var nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource);
145145
sqlSessionFactory.getConfiguration().setEnvironment(nonSpring);
146146

147147
try {
@@ -162,8 +162,8 @@ void testWithNonSpringTransactionFactory() {
162162
// this should not work since the DS will be out of sync with MyBatis
163163
@Test
164164
void testNonSpringTxFactoryWithTx() throws Exception {
165-
Environment original = sqlSessionFactory.getConfiguration().getEnvironment();
166-
Environment nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource);
165+
var original = sqlSessionFactory.getConfiguration().getEnvironment();
166+
var nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource);
167167
sqlSessionFactory.getConfiguration().setEnvironment(nonSpring);
168168

169169
TransactionStatus status = null;
@@ -186,12 +186,12 @@ void testNonSpringTxFactoryWithTx() throws Exception {
186186
// this should work since the DS is managed MyBatis
187187
@Test
188188
void testNonSpringTxFactoryNonSpringDSWithTx() throws java.sql.SQLException {
189-
Environment original = sqlSessionFactory.getConfiguration().getEnvironment();
189+
var original = sqlSessionFactory.getConfiguration().getEnvironment();
190190

191-
MockDataSource mockDataSource = new MockDataSource();
191+
var mockDataSource = new MockDataSource();
192192
mockDataSource.setupConnection(createMockConnection());
193193

194-
Environment nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), mockDataSource);
194+
var nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), mockDataSource);
195195
sqlSessionFactory.getConfiguration().setEnvironment(nonSpring);
196196

197197
TransactionStatus status;
@@ -211,7 +211,7 @@ void testNonSpringTxFactoryNonSpringDSWithTx() throws java.sql.SQLException {
211211

212212
// SqlSession uses its own connection
213213
// that connection will not have committed since no SQL was executed by the session
214-
MockConnection mockConnection = (MockConnection) mockDataSource.getConnection();
214+
var mockConnection = (MockConnection) mockDataSource.getConnection();
215215
assertThat(mockConnection.getNumberCommits()).as("should call commit on Connection").isEqualTo(0);
216216
assertThat(mockConnection.getNumberRollbacks()).as("should not call rollback on Connection").isEqualTo(0);
217217
assertCommitSession();
@@ -248,16 +248,16 @@ void testChangeExecutorTypeInTxRequiresNew() throws Exception {
248248

249249
try {
250250
txManager.setDataSource(dataSource);
251-
TransactionStatus status = txManager.getTransaction(new DefaultTransactionDefinition());
251+
var status = txManager.getTransaction(new DefaultTransactionDefinition());
252252

253253
session = SqlSessionUtils.getSqlSession(sqlSessionFactory);
254254

255255
// start a new tx while the other is in progress
256-
DefaultTransactionDefinition txRequiresNew = new DefaultTransactionDefinition();
256+
var txRequiresNew = new DefaultTransactionDefinition();
257257
txRequiresNew.setPropagationBehaviorName("PROPAGATION_REQUIRES_NEW");
258-
TransactionStatus status2 = txManager.getTransaction(txRequiresNew);
258+
var status2 = txManager.getTransaction(txRequiresNew);
259259

260-
SqlSession session2 = SqlSessionUtils.getSqlSession(sqlSessionFactory, ExecutorType.BATCH, exceptionTranslator);
260+
var session2 = SqlSessionUtils.getSqlSession(sqlSessionFactory, ExecutorType.BATCH, exceptionTranslator);
261261

262262
SqlSessionUtils.closeSqlSession(session2, sqlSessionFactory);
263263
txManager.rollback(status2);
@@ -277,12 +277,12 @@ void testChangeExecutorTypeInTxRequiresNew() throws Exception {
277277

278278
@Test
279279
void testWithJtaTxManager() {
280-
JtaTransactionManager jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class));
280+
var jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class));
281281

282-
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
282+
var txDef = new DefaultTransactionDefinition();
283283
txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");
284284

285-
TransactionStatus status = jtaManager.getTransaction(txDef);
285+
var status = jtaManager.getTransaction(txDef);
286286

287287
session = SqlSessionUtils.getSqlSession(sqlSessionFactory);
288288
session.getMapper(TestMapper.class).findTest();
@@ -298,20 +298,20 @@ void testWithJtaTxManager() {
298298

299299
@Test
300300
void testWithJtaTxManagerAndNonSpringTxManager() throws java.sql.SQLException {
301-
Environment original = sqlSessionFactory.getConfiguration().getEnvironment();
301+
var original = sqlSessionFactory.getConfiguration().getEnvironment();
302302

303-
MockDataSource mockDataSource = new MockDataSource();
303+
var mockDataSource = new MockDataSource();
304304
mockDataSource.setupConnection(createMockConnection());
305305

306-
Environment nonSpring = new Environment("non-spring", new ManagedTransactionFactory(), mockDataSource);
306+
var nonSpring = new Environment("non-spring", new ManagedTransactionFactory(), mockDataSource);
307307
sqlSessionFactory.getConfiguration().setEnvironment(nonSpring);
308308

309-
JtaTransactionManager jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class));
309+
var jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class));
310310

311-
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
311+
var txDef = new DefaultTransactionDefinition();
312312
txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");
313313

314-
TransactionStatus status = jtaManager.getTransaction(txDef);
314+
var status = jtaManager.getTransaction(txDef);
315315

316316
try {
317317
session = SqlSessionUtils.getSqlSession(sqlSessionFactory);
@@ -326,7 +326,7 @@ void testWithJtaTxManagerAndNonSpringTxManager() throws java.sql.SQLException {
326326
assertNoCommitJdbc();
327327
assertCommitSession();
328328

329-
MockConnection mockConnection = (MockConnection) mockDataSource.getConnection();
329+
var mockConnection = (MockConnection) mockDataSource.getConnection();
330330
assertThat(mockConnection.getNumberCommits()).as("should call commit on Connection").isEqualTo(0);
331331
assertThat(mockConnection.getNumberRollbacks()).as("should not call rollback on Connection").isEqualTo(0);
332332

@@ -345,10 +345,10 @@ void testWithJtaTxManagerAndNonSpringTxManager() throws java.sql.SQLException {
345345

346346
@Test
347347
void testWithTxSupports() {
348-
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
348+
var txDef = new DefaultTransactionDefinition();
349349
txDef.setPropagationBehaviorName("PROPAGATION_SUPPORTS");
350350

351-
TransactionStatus status = txManager.getTransaction(txDef);
351+
var status = txManager.getTransaction(txDef);
352352

353353
session = SqlSessionUtils.getSqlSession(sqlSessionFactory);
354354
session.getMapper(TestMapper.class).findTest();
@@ -363,10 +363,10 @@ void testWithTxSupports() {
363363

364364
@Test
365365
void testRollbackWithTxSupports() {
366-
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
366+
var txDef = new DefaultTransactionDefinition();
367367
txDef.setPropagationBehaviorName("PROPAGATION_SUPPORTS");
368368

369-
TransactionStatus status = txManager.getTransaction(txDef);
369+
var status = txManager.getTransaction(txDef);
370370

371371
session = SqlSessionUtils.getSqlSession(sqlSessionFactory);
372372
session.getMapper(TestMapper.class).findTest();
@@ -381,10 +381,10 @@ void testRollbackWithTxSupports() {
381381

382382
@Test
383383
void testWithTxRequired() {
384-
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
384+
var txDef = new DefaultTransactionDefinition();
385385
txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");
386386

387-
TransactionStatus status = txManager.getTransaction(txDef);
387+
var status = txManager.getTransaction(txDef);
388388

389389
session = SqlSessionUtils.getSqlSession(sqlSessionFactory);
390390
session.getMapper(TestMapper.class).findTest();
@@ -399,10 +399,10 @@ void testWithTxRequired() {
399399

400400
@Test
401401
void testSqlSessionCommitWithTx() {
402-
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
402+
var txDef = new DefaultTransactionDefinition();
403403
txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");
404404

405-
TransactionStatus status = txManager.getTransaction(txDef);
405+
var status = txManager.getTransaction(txDef);
406406

407407
session = SqlSessionUtils.getSqlSession(sqlSessionFactory);
408408
session.getMapper(TestMapper.class).findTest();
@@ -429,7 +429,7 @@ void testWithInterleavedTx() {
429429
session.getMapper(TestMapper.class).findTest();
430430

431431
// this transaction should use another Connection
432-
TransactionStatus status = txManager.getTransaction(new DefaultTransactionDefinition());
432+
var status = txManager.getTransaction(new DefaultTransactionDefinition());
433433

434434
// session continues using original connection
435435
session.getMapper(TestMapper.class).insertTest("test2");
@@ -463,16 +463,16 @@ void testSuspendAndResume() {
463463

464464
try {
465465
txManager.setDataSource(dataSource);
466-
TransactionStatus status = txManager.getTransaction(new DefaultTransactionDefinition());
466+
var status = txManager.getTransaction(new DefaultTransactionDefinition());
467467

468468
session = SqlSessionUtils.getSqlSession(sqlSessionFactory);
469469

470470
// start a new tx while the other is in progress
471-
DefaultTransactionDefinition txRequiresNew = new DefaultTransactionDefinition();
471+
var txRequiresNew = new DefaultTransactionDefinition();
472472
txRequiresNew.setPropagationBehaviorName("PROPAGATION_REQUIRES_NEW");
473-
TransactionStatus status2 = txManager.getTransaction(txRequiresNew);
473+
var status2 = txManager.getTransaction(txRequiresNew);
474474

475-
SqlSession session2 = SqlSessionUtils.getSqlSession(sqlSessionFactory);
475+
var session2 = SqlSessionUtils.getSqlSession(sqlSessionFactory);
476476

477477
assertThat(session).as("getSqlSession() should not return suspended SqlSession").isNotSameAs(session2);
478478

@@ -535,10 +535,10 @@ void testBatch() {
535535
void testBatchInTx() {
536536
setupBatchStatements();
537537

538-
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
538+
var txDef = new DefaultTransactionDefinition();
539539
txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");
540540

541-
TransactionStatus status = txManager.getTransaction(txDef);
541+
var status = txManager.getTransaction(txDef);
542542

543543
session = SqlSessionUtils.getSqlSession(sqlSessionFactory, ExecutorType.BATCH, exceptionTranslator);
544544

@@ -577,10 +577,10 @@ void testBatchWithError() {
577577
void testBatchInTxWithError() {
578578
setupBatchStatements();
579579

580-
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
580+
var txDef = new DefaultTransactionDefinition();
581581
txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");
582582

583-
TransactionStatus status = txManager.getTransaction(txDef);
583+
var status = txManager.getTransaction(txDef);
584584

585585
session = SqlSessionUtils.getSqlSession(sqlSessionFactory, ExecutorType.BATCH, exceptionTranslator);
586586

‎src/test/java/org/mybatis/spring/PooledMockDataSource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 the original author or authors.
2+
* Copyright 2010-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)