Merge pull request #3277 from mawen12/feature-transaction-test

Add TransactionFactory, Transaction test cases

Author: hazendaz

src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperUnitTest.java

@@ -36,7 +36,7 @@
  *
  * @see BeanWrapper
  */
-class BeanWrapperUnitTest extends ObjectWrapperBaseTest {
+class BeanWrapperUnitTest extends ObjectWrapperBase {
 
   private RichType richType;
 

src/test/java/org/apache/ibatis/reflection/wrapper/CollectionWrapperUnitTest.java

@@ -38,7 +38,7 @@
  * @see CollectionWrapper
  */
 @ExtendWith(MockitoExtension.class)
-class CollectionWrapperUnitTest extends ObjectWrapperBaseTest {
+class CollectionWrapperUnitTest extends ObjectWrapperBase {
 
   @Mock
   private Collection<Object> collection;

src/test/java/org/apache/ibatis/reflection/wrapper/MapWrapperUnitTest.java

@@ -41,7 +41,7 @@
  *
  * @see MapWrapper
  */
-class MapWrapperUnitTest extends ObjectWrapperBaseTest {
+class MapWrapperUnitTest extends ObjectWrapperBase {
 
   @Mock
   private Map<String, Object> map;

src/test/java/org/apache/ibatis/reflection/wrapper/ObjectWrapperBaseTest.java renamed to src/test/java/org/apache/ibatis/reflection/wrapper/ObjectWrapperBase.java

@@ -24,7 +24,7 @@
  * @see ObjectWrapper
  */
 @ExtendWith(MockitoExtension.class)
-abstract class ObjectWrapperBaseTest {
+abstract class ObjectWrapperBase {
 
   abstract void shouldGet();
 

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

@@ -15,10 +15,6 @@
  */
 package org.apache.ibatis.scripting.xmltags;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -27,6 +23,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
 /**
  * <pre>{@code
  *  SELECT *
@@ -46,10 +47,9 @@
  * }</pre>
  *
  * @author <a href="[email protected]">mawen12</a>
- *
  * @see <a href="https://mybatis.org/mybatis-3/dynamic-sql.html#choose-when-otherwise">choose</a>
  */
-class ChooseSqlNodeTest extends SqlNodeTest {
+class ChooseSqlNodeTest extends SqlNodeBase {
 
   private static final String FIRST_TEXT = " AND title like #{title}";
   private static final String SECOND_TEXT = " AND author_name like #{author.username}";

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

@@ -15,10 +15,6 @@
  */
 package org.apache.ibatis.scripting.xmltags;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -27,6 +23,13 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
+
+
 /**
  * <pre>{@code
  * 	SELECT *
@@ -39,10 +42,9 @@
  * }</pre>
  *
  * @author <a href="[email protected]">mawen12</a>
- *
  * @see <a href="https://mybatis.org/mybatis-3/dynamic-sql.html#foreach">foreach</a>
  */
-class ForEachSqlNodeTest extends SqlNodeTest {
+class ForEachSqlNodeTest extends SqlNodeBase {
 
   private SqlNode sqlNode;
 

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

@@ -17,7 +17,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.never;
 
 import java.util.HashMap;
 
@@ -35,7 +37,7 @@
  *
  * @see <a href="https://mybatis.org/mybatis-3/dynamic-sql.html#if">if</a>
  */
-class IfSqlNodeTest extends SqlNodeTest {
+class IfSqlNodeTest extends SqlNodeBase {
 
   private static final String CONDITION = "title != null";
   private static final String TEXT = "AND title like #{title}";

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

@@ -15,17 +15,18 @@
  */
 package org.apache.ibatis.scripting.xmltags;
 
-import static org.mockito.Mockito.verify;
-
 import java.util.Arrays;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.mockito.Mockito.verify;
+
+
 /**
  * @author <a href="[email protected]">mawen12</a>
  */
-class MixedSqlNodeTest extends SqlNodeTest {
+class MixedSqlNodeTest extends SqlNodeBase {
 
   private static final String FIRST_TEXT = "abc";
   private static final String SECOND_TEXT = "bcd";

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

@@ -43,7 +43,7 @@
  *
  * @see <a href="https://mybatis.org/mybatis-3/dynamic-sql.html#trim-where-set">trim-where-set</a>
  */
-class SetSqlNodeTest extends SqlNodeTest {
+class SetSqlNodeTest extends SqlNodeBase {
 
   private static final String FIRST_TEXT = " username = #{username},";
   private static final String SECOND_TEXT = " password = #{password}";

src/test/java/org/apache/ibatis/scripting/xmltags/SqlNodeTest.java renamed to src/test/java/org/apache/ibatis/scripting/xmltags/SqlNodeBase.java

@@ -22,9 +22,10 @@
 
 /**
  * @author <a href="[email protected]">mawen12</a>
+ * @see SqlNode
  */
 @ExtendWith(MockitoExtension.class)
-abstract class SqlNodeTest {
+abstract class SqlNodeBase {
 
   @Mock
   protected Configuration configuration;