Skip to content

Commit ddf529e

Browse files
committed
[ci] Follow up run formatter
1 parent a943a1b commit ddf529e

13 files changed

+459
-444
lines changed

src/test/java/org/apache/ibatis/scripting/xmltags/ChooseSqlNodeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import static org.mockito.Mockito.verify;
2828
import static org.mockito.Mockito.when;
2929

30-
3130
/**
3231
* <pre>{@code
3332
* SELECT *
@@ -47,6 +46,7 @@
4746
* }</pre>
4847
*
4948
* @author <a href="[email protected]">mawen12</a>
49+
*
5050
* @see <a href="https://mybatis.org/mybatis-3/dynamic-sql.html#choose-when-otherwise">choose</a>
5151
*/
5252
class ChooseSqlNodeTest extends SqlNodeBase {

src/test/java/org/apache/ibatis/scripting/xmltags/ForEachSqlNodeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import static org.mockito.Mockito.when;
3030
import static org.mockito.Mockito.verify;
3131

32-
3332
/**
3433
* <pre>{@code
3534
* SELECT *
@@ -42,6 +41,7 @@
4241
* }</pre>
4342
*
4443
* @author <a href="[email protected]">mawen12</a>
44+
*
4545
* @see <a href="https://mybatis.org/mybatis-3/dynamic-sql.html#foreach">foreach</a>
4646
*/
4747
class ForEachSqlNodeTest extends SqlNodeBase {

src/test/java/org/apache/ibatis/scripting/xmltags/MixedSqlNodeTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import static org.mockito.Mockito.verify;
2424

25-
2625
/**
2726
* @author <a href="[email protected]">mawen12</a>
2827
*/

src/test/java/org/apache/ibatis/scripting/xmltags/SqlNodeBase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
/**
2424
* @author <a href="[email protected]">mawen12</a>
25+
*
2526
* @see SqlNode
2627
*/
2728
@ExtendWith(MockitoExtension.class)

src/test/java/org/apache/ibatis/transaction/TransactionFactoryBase.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,21 @@
2323

2424
/**
2525
* @author <a href="[email protected]">mawen12</a>
26+
*
2627
* @see TransactionFactory
2728
*/
2829
@ExtendWith(MockitoExtension.class)
2930
public abstract class TransactionFactoryBase {
3031

31-
public abstract void shouldSetProperties() throws Exception;
32+
public abstract void shouldSetProperties() throws Exception;
3233

33-
public abstract void shouldNewTransactionWithConnection() throws SQLException;
34+
public abstract void shouldNewTransactionWithConnection() throws SQLException;
3435

35-
public abstract void shouldNewTransactionWithDataSource() throws Exception;
36+
public abstract void shouldNewTransactionWithDataSource() throws Exception;
3637

37-
public static Object getValue(Field field, Object object) throws Exception {
38-
field.setAccessible(true);
39-
return field.get(object);
40-
}
38+
public static Object getValue(Field field, Object object) throws Exception {
39+
field.setAccessible(true);
40+
return field.get(object);
41+
}
4142

4243
}

src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionBase.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,25 @@
2222

2323
/**
2424
* @author <a href="[email protected]">mawen12</a>
25+
*
2526
* @see JdbcTransaction
2627
*/
2728
@ExtendWith(MockitoExtension.class)
2829
abstract class JdbcTransactionBase {
2930

30-
abstract void shouldGetConnection() throws SQLException;
31+
abstract void shouldGetConnection() throws SQLException;
3132

32-
abstract void shouldCommitWhenConnectionIsNotAutoCommit() throws SQLException;
33+
abstract void shouldCommitWhenConnectionIsNotAutoCommit() throws SQLException;
3334

34-
abstract void shouldAutoCommitWhenConnectionIsAutoCommit() throws SQLException;
35+
abstract void shouldAutoCommitWhenConnectionIsAutoCommit() throws SQLException;
3536

36-
abstract void shouldRollbackWhenConnectionIsNotAutoCommit() throws SQLException;
37+
abstract void shouldRollbackWhenConnectionIsNotAutoCommit() throws SQLException;
3738

38-
abstract void shouldAutoRollbackWhenConnectionIsAutoCommit() throws SQLException;
39+
abstract void shouldAutoRollbackWhenConnectionIsAutoCommit() throws SQLException;
3940

40-
abstract void shouldCloseAndSetAutoCommitWhenConnectionIsNotAutoCommit() throws SQLException;
41+
abstract void shouldCloseAndSetAutoCommitWhenConnectionIsNotAutoCommit() throws SQLException;
4142

42-
abstract void shouldCloseAndNotSetAutoCommitWhenConnectionIsAutoCommit() throws SQLException;
43+
abstract void shouldCloseAndNotSetAutoCommitWhenConnectionIsAutoCommit() throws SQLException;
4344

44-
abstract void shouldReturnNullWhenGetTimeout() throws SQLException;
45+
abstract void shouldReturnNullWhenGetTimeout() throws SQLException;
4546
}

src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactoryUnitTest.java

Lines changed: 76 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -34,81 +34,85 @@
3434

3535
/**
3636
* @author <a href="[email protected]">mawen12</a>
37+
*
3738
* @see JdbcTransactionFactory
3839
*/
3940
class JdbcTransactionFactoryUnitTest extends TransactionFactoryBase {
4041

41-
@Mock
42-
private Properties properties;
43-
44-
@Mock
45-
private Connection connection;
46-
47-
@Mock
48-
private DataSource dataSource;
49-
50-
private TransactionFactory transactionFactory;
51-
52-
@BeforeEach
53-
void setup() {
54-
this.transactionFactory = new JdbcTransactionFactory();
55-
}
56-
57-
@Test
58-
@Override
59-
public void shouldSetProperties() throws Exception {
60-
when(properties.getProperty("skipSetAutoCommitOnClose")).thenReturn("true");
61-
62-
transactionFactory.setProperties(properties);
63-
64-
assertTrue((Boolean) getValue(transactionFactory.getClass().getDeclaredField("skipSetAutoCommitOnClose"), transactionFactory));
65-
}
66-
67-
@Test
68-
@Override
69-
public void shouldNewTransactionWithConnection() throws SQLException {
70-
Transaction result = transactionFactory.newTransaction(connection);
71-
72-
assertNotNull(result);
73-
assertInstanceOf(JdbcTransaction.class, result);
74-
assertEquals(connection, result.getConnection());
75-
}
76-
77-
@Test
78-
@Override
79-
public void shouldNewTransactionWithDataSource() throws Exception {
80-
when(dataSource.getConnection()).thenReturn(connection);
81-
82-
Transaction result = transactionFactory.newTransaction(dataSource, TransactionIsolationLevel.READ_COMMITTED, false);
83-
84-
assertNotNull(result);
85-
assertInstanceOf(JdbcTransaction.class, result);
86-
assertEquals(connection, result.getConnection());
87-
verify(connection).setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
88-
89-
assertEquals(dataSource, getValue(result.getClass().getDeclaredField("dataSource"), result));
90-
assertEquals(TransactionIsolationLevel.READ_COMMITTED, getValue(result.getClass().getDeclaredField("level"), result));
91-
assertEquals(false, getValue(result.getClass().getDeclaredField("autoCommit"), result));
92-
assertEquals(false, getValue(result.getClass().getDeclaredField("skipSetAutoCommitOnClose"), result));
93-
}
94-
95-
@Test
96-
void shouldNewTransactionWithDataSourceAndCustomProperties() throws Exception {
97-
when(dataSource.getConnection()).thenReturn(connection);
98-
when(properties.getProperty("skipSetAutoCommitOnClose")).thenReturn("true");
99-
100-
transactionFactory.setProperties(properties);
101-
Transaction result = transactionFactory.newTransaction(dataSource, TransactionIsolationLevel.READ_COMMITTED, true);
102-
103-
assertNotNull(result);
104-
assertInstanceOf(JdbcTransaction.class, result);
105-
assertEquals(connection, result.getConnection());
106-
verify(connection).setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
107-
108-
assertEquals(dataSource, getValue(result.getClass().getDeclaredField("dataSource"), result));
109-
assertEquals(TransactionIsolationLevel.READ_COMMITTED, getValue(result.getClass().getDeclaredField("level"), result));
110-
assertEquals(true, getValue(result.getClass().getDeclaredField("autoCommit"), result));
111-
assertEquals(true, getValue(result.getClass().getDeclaredField("skipSetAutoCommitOnClose"), result));
112-
}
42+
@Mock
43+
private Properties properties;
44+
45+
@Mock
46+
private Connection connection;
47+
48+
@Mock
49+
private DataSource dataSource;
50+
51+
private TransactionFactory transactionFactory;
52+
53+
@BeforeEach
54+
void setup() {
55+
this.transactionFactory = new JdbcTransactionFactory();
56+
}
57+
58+
@Test
59+
@Override
60+
public void shouldSetProperties() throws Exception {
61+
when(properties.getProperty("skipSetAutoCommitOnClose")).thenReturn("true");
62+
63+
transactionFactory.setProperties(properties);
64+
65+
assertTrue((Boolean) getValue(transactionFactory.getClass().getDeclaredField("skipSetAutoCommitOnClose"),
66+
transactionFactory));
67+
}
68+
69+
@Test
70+
@Override
71+
public void shouldNewTransactionWithConnection() throws SQLException {
72+
Transaction result = transactionFactory.newTransaction(connection);
73+
74+
assertNotNull(result);
75+
assertInstanceOf(JdbcTransaction.class, result);
76+
assertEquals(connection, result.getConnection());
77+
}
78+
79+
@Test
80+
@Override
81+
public void shouldNewTransactionWithDataSource() throws Exception {
82+
when(dataSource.getConnection()).thenReturn(connection);
83+
84+
Transaction result = transactionFactory.newTransaction(dataSource, TransactionIsolationLevel.READ_COMMITTED, false);
85+
86+
assertNotNull(result);
87+
assertInstanceOf(JdbcTransaction.class, result);
88+
assertEquals(connection, result.getConnection());
89+
verify(connection).setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
90+
91+
assertEquals(dataSource, getValue(result.getClass().getDeclaredField("dataSource"), result));
92+
assertEquals(TransactionIsolationLevel.READ_COMMITTED,
93+
getValue(result.getClass().getDeclaredField("level"), result));
94+
assertEquals(false, getValue(result.getClass().getDeclaredField("autoCommit"), result));
95+
assertEquals(false, getValue(result.getClass().getDeclaredField("skipSetAutoCommitOnClose"), result));
96+
}
97+
98+
@Test
99+
void shouldNewTransactionWithDataSourceAndCustomProperties() throws Exception {
100+
when(dataSource.getConnection()).thenReturn(connection);
101+
when(properties.getProperty("skipSetAutoCommitOnClose")).thenReturn("true");
102+
103+
transactionFactory.setProperties(properties);
104+
Transaction result = transactionFactory.newTransaction(dataSource, TransactionIsolationLevel.READ_COMMITTED, true);
105+
106+
assertNotNull(result);
107+
assertInstanceOf(JdbcTransaction.class, result);
108+
assertEquals(connection, result.getConnection());
109+
verify(connection).setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
110+
111+
assertEquals(dataSource, getValue(result.getClass().getDeclaredField("dataSource"), result));
112+
assertEquals(TransactionIsolationLevel.READ_COMMITTED,
113+
getValue(result.getClass().getDeclaredField("level"), result));
114+
assertEquals(true, getValue(result.getClass().getDeclaredField("autoCommit"), result));
115+
assertEquals(true, getValue(result.getClass().getDeclaredField("skipSetAutoCommitOnClose"), result));
116+
}
113117

114118
}

0 commit comments

Comments
 (0)