Skip to content

Commit 32970be

Browse files
committed
[ci] Follow up sort imports
1 parent ddf529e commit 32970be

13 files changed

+75
-70
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
*/
1616
package org.apache.ibatis.scripting.xmltags;
1717

18+
import static org.junit.jupiter.api.Assertions.assertTrue;
19+
import static org.mockito.Mockito.verify;
20+
import static org.mockito.Mockito.when;
21+
1822
import java.util.Arrays;
1923
import java.util.HashMap;
2024
import java.util.List;
@@ -23,10 +27,6 @@
2327
import org.junit.jupiter.api.BeforeEach;
2428
import org.junit.jupiter.api.Test;
2529

26-
import static org.junit.jupiter.api.Assertions.assertTrue;
27-
import static org.mockito.Mockito.verify;
28-
import static org.mockito.Mockito.when;
29-
3030
/**
3131
* <pre>{@code
3232
* SELECT *

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
*/
1616
package org.apache.ibatis.scripting.xmltags;
1717

18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertTrue;
20+
import static org.mockito.Mockito.doNothing;
21+
import static org.mockito.Mockito.verify;
22+
import static org.mockito.Mockito.when;
23+
1824
import java.util.Arrays;
1925
import java.util.HashMap;
2026
import java.util.List;
@@ -23,12 +29,6 @@
2329
import org.junit.jupiter.api.Test;
2430
import org.mockito.ArgumentCaptor;
2531

26-
import static org.junit.jupiter.api.Assertions.assertEquals;
27-
import static org.junit.jupiter.api.Assertions.assertTrue;
28-
import static org.mockito.Mockito.doNothing;
29-
import static org.mockito.Mockito.when;
30-
import static org.mockito.Mockito.verify;
31-
3232
/**
3333
* <pre>{@code
3434
* SELECT *

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
import static org.junit.jupiter.api.Assertions.assertFalse;
1919
import static org.junit.jupiter.api.Assertions.assertTrue;
20+
import static org.mockito.Mockito.never;
2021
import static org.mockito.Mockito.verify;
2122
import static org.mockito.Mockito.when;
22-
import static org.mockito.Mockito.never;
2323

2424
import java.util.HashMap;
2525

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package org.apache.ibatis.scripting.xmltags;
1717

18+
import static org.mockito.Mockito.verify;
19+
1820
import java.util.Arrays;
1921

2022
import org.junit.jupiter.api.BeforeEach;
2123
import org.junit.jupiter.api.Test;
2224

23-
import static org.mockito.Mockito.verify;
24-
2525
/**
2626
* @author <a href="[email protected]">mawen12</a>
2727
*/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616
package org.apache.ibatis.transaction;
1717

18-
import org.junit.jupiter.api.extension.ExtendWith;
19-
import org.mockito.junit.jupiter.MockitoExtension;
20-
2118
import java.lang.reflect.Field;
2219
import java.sql.SQLException;
2320

21+
import org.junit.jupiter.api.extension.ExtendWith;
22+
import org.mockito.junit.jupiter.MockitoExtension;
23+
2424
/**
2525
* @author <a href="[email protected]">mawen12</a>
2626
*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package org.apache.ibatis.transaction.jdbc;
1717

18+
import java.sql.SQLException;
19+
1820
import org.junit.jupiter.api.extension.ExtendWith;
1921
import org.mockito.junit.jupiter.MockitoExtension;
2022

21-
import java.sql.SQLException;
22-
2323
/**
2424
* @author <a href="[email protected]">mawen12</a>
2525
*

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@
1515
*/
1616
package org.apache.ibatis.transaction.jdbc;
1717

18+
import static org.junit.jupiter.api.Assertions.*;
19+
import static org.mockito.Mockito.verify;
20+
import static org.mockito.Mockito.when;
21+
22+
import java.sql.Connection;
23+
import java.sql.SQLException;
24+
import java.util.Properties;
25+
26+
import javax.sql.DataSource;
27+
1828
import org.apache.ibatis.session.TransactionIsolationLevel;
1929
import org.apache.ibatis.transaction.Transaction;
2030
import org.apache.ibatis.transaction.TransactionFactory;
@@ -23,15 +33,6 @@
2333
import org.junit.jupiter.api.Test;
2434
import org.mockito.Mock;
2535

26-
import javax.sql.DataSource;
27-
import java.sql.Connection;
28-
import java.sql.SQLException;
29-
import java.util.Properties;
30-
31-
import static org.junit.jupiter.api.Assertions.*;
32-
import static org.mockito.Mockito.verify;
33-
import static org.mockito.Mockito.when;
34-
3536
/**
3637
* @author <a href="[email protected]">mawen12</a>
3738
*

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
*/
1616
package org.apache.ibatis.transaction.jdbc;
1717

18-
import org.apache.ibatis.transaction.Transaction;
19-
import org.junit.jupiter.api.BeforeEach;
20-
import org.junit.jupiter.api.Test;
21-
import org.mockito.Mock;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
20+
import static org.mockito.Mockito.*;
2221

2322
import java.sql.Connection;
2423
import java.sql.SQLException;
2524

26-
import static org.junit.jupiter.api.Assertions.assertEquals;
27-
import static org.junit.jupiter.api.Assertions.assertNull;
28-
import static org.mockito.Mockito.*;
25+
import org.apache.ibatis.transaction.Transaction;
26+
import org.junit.jupiter.api.BeforeEach;
27+
import org.junit.jupiter.api.Test;
28+
import org.mockito.Mock;
2929

3030
/**
3131
* @author <a href="[email protected]">mawen12</a>

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515
*/
1616
package org.apache.ibatis.transaction.jdbc;
1717

18-
import org.apache.ibatis.session.TransactionIsolationLevel;
19-
import org.apache.ibatis.transaction.Transaction;
20-
import org.junit.jupiter.api.Test;
21-
import org.mockito.Mock;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
20+
import static org.mockito.Mockito.*;
2221

23-
import javax.sql.DataSource;
2422
import java.sql.Connection;
2523
import java.sql.SQLException;
2624
import java.util.function.BooleanSupplier;
2725

28-
import static org.junit.jupiter.api.Assertions.assertEquals;
29-
import static org.junit.jupiter.api.Assertions.assertNull;
30-
import static org.mockito.Mockito.*;
26+
import javax.sql.DataSource;
27+
28+
import org.apache.ibatis.session.TransactionIsolationLevel;
29+
import org.apache.ibatis.transaction.Transaction;
30+
import org.junit.jupiter.api.Test;
31+
import org.mockito.Mock;
3132

3233
/**
3334
* @author <a href="[email protected]">mawen12</a>

src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package org.apache.ibatis.transaction.managed;
1717

18+
import java.sql.SQLException;
19+
1820
import org.junit.jupiter.api.extension.ExtendWith;
1921
import org.mockito.junit.jupiter.MockitoExtension;
2022

21-
import java.sql.SQLException;
22-
2323
/**
2424
* @author <a href="[email protected]">mawen12</a>
2525
*
@@ -39,4 +39,4 @@ abstract class ManagedTransactionBase {
3939
abstract void shouldNotCloseWhenSetCloseConnectionIsFalse() throws SQLException;
4040

4141
abstract void shouldReturnNullWhenGetTimeout() throws SQLException;
42-
}
42+
}

src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryUnitTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@
1515
*/
1616
package org.apache.ibatis.transaction.managed;
1717

18+
import static org.junit.jupiter.api.Assertions.*;
19+
import static org.mockito.Mockito.verify;
20+
import static org.mockito.Mockito.when;
21+
22+
import java.sql.Connection;
23+
import java.sql.SQLException;
24+
import java.util.Properties;
25+
26+
import javax.sql.DataSource;
27+
1828
import org.apache.ibatis.session.TransactionIsolationLevel;
1929
import org.apache.ibatis.transaction.Transaction;
2030
import org.apache.ibatis.transaction.TransactionFactory;
@@ -23,15 +33,6 @@
2333
import org.junit.jupiter.api.Test;
2434
import org.mockito.Mock;
2535

26-
import javax.sql.DataSource;
27-
import java.sql.Connection;
28-
import java.sql.SQLException;
29-
import java.util.Properties;
30-
31-
import static org.junit.jupiter.api.Assertions.*;
32-
import static org.mockito.Mockito.verify;
33-
import static org.mockito.Mockito.when;
34-
3536
/**
3637
* @author <a href="[email protected]">mawen12</a>
3738
*

src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionWithConnectionTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@
1515
*/
1616
package org.apache.ibatis.transaction.managed;
1717

18-
import org.apache.ibatis.transaction.Transaction;
19-
import org.junit.jupiter.api.BeforeEach;
20-
import org.junit.jupiter.api.Test;
21-
import org.mockito.Mock;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
20+
import static org.mockito.Mockito.never;
21+
import static org.mockito.Mockito.verify;
2222

2323
import java.sql.Connection;
2424
import java.sql.SQLException;
2525

26-
import static org.junit.jupiter.api.Assertions.assertEquals;
27-
import static org.junit.jupiter.api.Assertions.assertNull;
28-
import static org.mockito.Mockito.*;
26+
import org.apache.ibatis.transaction.Transaction;
27+
import org.junit.jupiter.api.BeforeEach;
28+
import org.junit.jupiter.api.Test;
29+
import org.mockito.Mock;
2930

3031
/**
3132
* @author <a href="[email protected]">mawen12</a>

src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionWithDataSourceTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
*/
1616
package org.apache.ibatis.transaction.managed;
1717

18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
20+
import static org.mockito.Mockito.*;
21+
22+
import java.sql.Connection;
23+
import java.sql.SQLException;
24+
25+
import javax.sql.DataSource;
26+
1827
import org.apache.ibatis.session.TransactionIsolationLevel;
1928
import org.apache.ibatis.transaction.Transaction;
2029
import org.junit.jupiter.api.BeforeEach;
2130
import org.junit.jupiter.api.Test;
2231
import org.mockito.Mock;
2332

24-
import javax.sql.DataSource;
25-
import java.sql.Connection;
26-
import java.sql.SQLException;
27-
28-
import static org.junit.jupiter.api.Assertions.assertEquals;
29-
import static org.junit.jupiter.api.Assertions.assertNull;
30-
import static org.mockito.Mockito.*;
31-
3233
/**
3334
* @author <a href="[email protected]">mawen12</a>
3435
*
@@ -111,4 +112,4 @@ void shouldNotCloseWhenSetCloseConnectionIsFalse() throws SQLException {
111112
void shouldReturnNullWhenGetTimeout() throws SQLException {
112113
assertNull(transaction.getTimeout());
113114
}
114-
}
115+
}

0 commit comments

Comments
 (0)