Merge pull request #42 from cj848/feature/improve-test

Hyunsik Kang · web-flow · commit 1be5fac7ba9f · 2022-02-14T08:56:00.000+09:00
Abstract Test Classes does not directly access EntityManager methods
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/criteriaquery/EclipselinkCriteriaDeleteIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/criteriaquery/EclipselinkCriteriaDeleteIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.criteriaquery
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.criteriaquery.AbstractCriteriaDeleteIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-class EclipselinkCriteriaDeleteIntegrationTest : AbstractCriteriaDeleteIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+class EclipselinkCriteriaDeleteIntegrationTest : AbstractCriteriaDeleteIntegrationTest()
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/expression/EclipselinkCriteriaQueryDslExpressionIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/expression/EclipselinkCriteriaQueryDslExpressionIntegrationTest.kt
@@ -1,11 +1,6 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.expression
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.expression.AbstractCriteriaQueryDslExpressionIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class EclipselinkCriteriaQueryDslExpressionIntegrationTest : AbstractCriteriaQueryDslExpressionIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class EclipselinkCriteriaQueryDslExpressionIntegrationTest :
+    AbstractCriteriaQueryDslExpressionIntegrationTest()
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/from/EclipselinkCriteriaQueryDslFromIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/from/EclipselinkCriteriaQueryDslFromIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.from
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.from.AbstractCriteriaQueryDslFromIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class EclipselinkCriteriaQueryDslFromIntegrationTest : AbstractCriteriaQueryDslFromIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class EclipselinkCriteriaQueryDslFromIntegrationTest : AbstractCriteriaQueryDslFromIntegrationTest()
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/groupby/EclipselinkCriteriaQueryDslGroupByIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/groupby/EclipselinkCriteriaQueryDslGroupByIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.groupby
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.groupby.AbstractCriteriaQueryDslGroupByIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class EclipselinkCriteriaQueryDslGroupByIntegrationTest : AbstractCriteriaQueryDslGroupByIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class EclipselinkCriteriaQueryDslGroupByIntegrationTest : AbstractCriteriaQueryDslGroupByIntegrationTest()
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/having/EclipselinkCriteriaQueryDslHavingIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/having/EclipselinkCriteriaQueryDslHavingIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.having
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.having.AbstractCriteriaQueryDslHavingIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class EclipselinkCriteriaQueryDslHavingIntegrationTest : AbstractCriteriaQueryDslHavingIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class EclipselinkCriteriaQueryDslHavingIntegrationTest : AbstractCriteriaQueryDslHavingIntegrationTest()
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/hint/EclipselinkCriteriaQueryDslHintIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/hint/EclipselinkCriteriaQueryDslHintIntegrationTest.kt
@@ -5,17 +5,12 @@ import com.linecorp.kotlinjdsl.querydsl.expression.col
 import com.linecorp.kotlinjdsl.querydsl.expression.min
 import com.linecorp.kotlinjdsl.test.entity.order.Order
 import com.linecorp.kotlinjdsl.test.integration.AbstractCriteriaQueryDslIntegrationTest
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import org.eclipse.persistence.config.PessimisticLock
 import org.eclipse.persistence.config.QueryHints
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
 internal class EclipselinkCriteriaQueryDslHintIntegrationTest : AbstractCriteriaQueryDslIntegrationTest() {
-    override lateinit var entityManager: EntityManager
 
     private val order1 = order { purchaserId = 1000 }
     private val order2 = order { purchaserId = 1000 }
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/limit/EclipselinkCriteriaQueryDslLimitIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/limit/EclipselinkCriteriaQueryDslLimitIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.limit
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.limit.AbstractCriteriaQueryDslLimitIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class EclipselinkCriteriaQueryDslLimitIntegrationTest : AbstractCriteriaQueryDslLimitIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class EclipselinkCriteriaQueryDslLimitIntegrationTest : AbstractCriteriaQueryDslLimitIntegrationTest()
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/orderby/EclipselinkCriteriaQueryDslOrderByIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/orderby/EclipselinkCriteriaQueryDslOrderByIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.orderby
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.orderby.AbstractCriteriaQueryDslOrderByIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class EclipselinkCriteriaQueryDslOrderByIntegrationTest : AbstractCriteriaQueryDslOrderByIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class EclipselinkCriteriaQueryDslOrderByIntegrationTest : AbstractCriteriaQueryDslOrderByIntegrationTest()
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/predicate/EclipselinkCriteriaQueryDslPredicateIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/predicate/EclipselinkCriteriaQueryDslPredicateIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.predicate
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.predicate.AbstractCriteriaQueryDslPredicateIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class EclipselinkCriteriaQueryDslPredicateIntegrationTest : AbstractCriteriaQueryDslPredicateIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class EclipselinkCriteriaQueryDslPredicateIntegrationTest : AbstractCriteriaQueryDslPredicateIntegrationTest()
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/select/EclipselinkCriteriaQueryDslSelectIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/select/EclipselinkCriteriaQueryDslSelectIntegrationTest.kt
@@ -1,16 +1,11 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.select
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.select.AbstractCriteriaQueryDslSelectIntegrationTest
 import org.eclipse.persistence.internal.jpa.querydef.SelectionImpl
 import org.eclipse.persistence.internal.jpa.querydef.SubQueryImpl
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
 class EclipselinkCriteriaQueryDslSelectIntegrationTest : AbstractCriteriaQueryDslSelectIntegrationTest() {
-    override lateinit var entityManager: EntityManager
 
     /**
      * https://wiki.eclipse.org/EclipseLink/UserGuide/JPA/Basic_JPA_Development/Querying/JPQL#Sub-selects_in_FROM_clause
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/set/EclipselinkCriteriaQueryUpdateDslTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/set/EclipselinkCriteriaQueryUpdateDslTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.set
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.set.AbstractCriteriaQueryDslUpdateByIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-class EclipselinkCriteriaQueryUpdateDslTest : AbstractCriteriaQueryDslUpdateByIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+class EclipselinkCriteriaQueryUpdateDslTest : AbstractCriteriaQueryDslUpdateByIntegrationTest()
diff --git a/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/where/EclipselinkCriteriaQueryDslWhereIntegrationTest.kt b/eclipselink/src/test/kotlin/com/linecorp/kotlinjdsl/eclipselink/integration/querydsl/where/EclipselinkCriteriaQueryDslWhereIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.eclipselink.integration.querydsl.where
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.where.AbstractCriteriaQueryDslWhereIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class EclipselinkCriteriaQueryDslWhereIntegrationTest : AbstractCriteriaQueryDslWhereIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class EclipselinkCriteriaQueryDslWhereIntegrationTest : AbstractCriteriaQueryDslWhereIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/criteriaquery/HibernateCriteriaDeleteIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/criteriaquery/HibernateCriteriaDeleteIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.criteriaquery
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.criteriaquery.AbstractCriteriaDeleteIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-class HibernateCriteriaDeleteIntegrationTest : AbstractCriteriaDeleteIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+class HibernateCriteriaDeleteIntegrationTest : AbstractCriteriaDeleteIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/expression/HibernateCriteriaQueryDslExpressionIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/expression/HibernateCriteriaQueryDslExpressionIntegrationTest.kt
@@ -1,11 +1,6 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.expression
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.expression.AbstractCriteriaQueryDslExpressionIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class HibernateCriteriaQueryDslExpressionIntegrationTest : AbstractCriteriaQueryDslExpressionIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class HibernateCriteriaQueryDslExpressionIntegrationTest :
+    AbstractCriteriaQueryDslExpressionIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/from/HibernateCriteriaQueryDslFromIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/from/HibernateCriteriaQueryDslFromIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.from
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.from.AbstractCriteriaQueryDslFromIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class HibernateCriteriaQueryDslFromIntegrationTest : AbstractCriteriaQueryDslFromIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class HibernateCriteriaQueryDslFromIntegrationTest : AbstractCriteriaQueryDslFromIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/groupby/HibernateCriteriaQueryDslGroupByIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/groupby/HibernateCriteriaQueryDslGroupByIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.groupby
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.groupby.AbstractCriteriaQueryDslGroupByIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class HibernateCriteriaQueryDslGroupByIntegrationTest : AbstractCriteriaQueryDslGroupByIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class HibernateCriteriaQueryDslGroupByIntegrationTest : AbstractCriteriaQueryDslGroupByIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/having/HibernateCriteriaQueryDslHavingIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/having/HibernateCriteriaQueryDslHavingIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.having
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.having.AbstractCriteriaQueryDslHavingIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class HibernateCriteriaQueryDslHavingIntegrationTest : AbstractCriteriaQueryDslHavingIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class HibernateCriteriaQueryDslHavingIntegrationTest : AbstractCriteriaQueryDslHavingIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/hint/HibernateCriteriaQueryDslHintIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/hint/HibernateCriteriaQueryDslHintIntegrationTest.kt
@@ -5,15 +5,10 @@ import com.linecorp.kotlinjdsl.querydsl.expression.col
 import com.linecorp.kotlinjdsl.querydsl.expression.min
 import com.linecorp.kotlinjdsl.test.entity.order.Order
 import com.linecorp.kotlinjdsl.test.integration.AbstractCriteriaQueryDslIntegrationTest
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
 internal class HibernateCriteriaQueryDslHintIntegrationTest : AbstractCriteriaQueryDslIntegrationTest() {
-    override lateinit var entityManager: EntityManager
 
     private val order1 = order { purchaserId = 1000 }
     private val order2 = order { purchaserId = 1000 }
@@ -53,4 +48,4 @@ internal class HibernateCriteriaQueryDslHintIntegrationTest : AbstractCriteriaQu
         // then
         assertThat(purchaserIds).containsOnly(1000, 2000)
     }
-}
+}
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/limit/HibernateCriteriaQueryDslLimitIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/limit/HibernateCriteriaQueryDslLimitIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.limit
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.limit.AbstractCriteriaQueryDslLimitIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class HibernateCriteriaQueryDslLimitIntegrationTest : AbstractCriteriaQueryDslLimitIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class HibernateCriteriaQueryDslLimitIntegrationTest : AbstractCriteriaQueryDslLimitIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/orderby/HibernateCriteriaQueryDslOrderByIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/orderby/HibernateCriteriaQueryDslOrderByIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.orderby
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.orderby.AbstractCriteriaQueryDslOrderByIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class HibernateCriteriaQueryDslOrderByIntegrationTest : AbstractCriteriaQueryDslOrderByIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class HibernateCriteriaQueryDslOrderByIntegrationTest : AbstractCriteriaQueryDslOrderByIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/predicate/HibernateCriteriaQueryDslPredicateIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/predicate/HibernateCriteriaQueryDslPredicateIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.predicate
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.predicate.AbstractCriteriaQueryDslPredicateIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class HibernateCriteriaQueryDslPredicateIntegrationTest : AbstractCriteriaQueryDslPredicateIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class HibernateCriteriaQueryDslPredicateIntegrationTest : AbstractCriteriaQueryDslPredicateIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/select/HibernateCriteriaQueryDslSelectIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/select/HibernateCriteriaQueryDslSelectIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.select
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.select.AbstractCriteriaQueryDslSelectIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-class HibernateCriteriaQueryDslSelectIntegrationTest : AbstractCriteriaQueryDslSelectIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+class HibernateCriteriaQueryDslSelectIntegrationTest : AbstractCriteriaQueryDslSelectIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/set/HibernateCriteriaQueryUpdateDslTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/set/HibernateCriteriaQueryUpdateDslTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.set
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.set.AbstractCriteriaQueryDslUpdateByIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-class HibernateCriteriaQueryUpdateDslTest : AbstractCriteriaQueryDslUpdateByIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+class HibernateCriteriaQueryUpdateDslTest : AbstractCriteriaQueryDslUpdateByIntegrationTest()
diff --git a/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/where/HibernateCriteriaQueryDslWhereIntegrationTest.kt b/hibernate/src/test/kotlin/com/linecorp/kotlinjdsl/hibernate/integration/querydsl/where/HibernateCriteriaQueryDslWhereIntegrationTest.kt
@@ -1,11 +1,5 @@
 package com.linecorp.kotlinjdsl.hibernate.integration.querydsl.where
 
-import com.linecorp.kotlinjdsl.test.integration.EntityManagerExtension
 import com.linecorp.kotlinjdsl.test.integration.querydsl.where.AbstractCriteriaQueryDslWhereIntegrationTest
-import org.junit.jupiter.api.extension.ExtendWith
-import javax.persistence.EntityManager
 
-@ExtendWith(EntityManagerExtension::class)
-internal class HibernateCriteriaQueryDslWhereIntegrationTest : AbstractCriteriaQueryDslWhereIntegrationTest() {
-    override lateinit var entityManager: EntityManager
-}
+internal class HibernateCriteriaQueryDslWhereIntegrationTest : AbstractCriteriaQueryDslWhereIntegrationTest()
diff --git a/spring/batch-infrastructure/src/test/kotlin/com/linecorp/kotlinjdsl/spring/batch/item/database/orm/KotlinJdslQueryProviderIntegrationTest.kt b/spring/batch-infrastructure/src/test/kotlin/com/linecorp/kotlinjdsl/spring/batch/item/database/orm/KotlinJdslQueryProviderIntegrationTest.kt
@@ -4,7 +4,6 @@ import com.linecorp.kotlinjdsl.querydsl.expression.col
 import com.linecorp.kotlinjdsl.test.WithKotlinJdslAssertions
 import com.linecorp.kotlinjdsl.test.entity.EntityDsl
 import com.linecorp.kotlinjdsl.test.entity.order.Order
-import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.springframework.batch.item.ExecutionContext
@@ -31,20 +30,10 @@ internal open class KotlinJdslQueryProviderIntegrationTest : EntityDsl(), WithKo
 
         entityManager.transaction.run {
             begin()
-            entityManager.persistAll(order1, order2, order3, order4)
-            commit()
-        }
-
-        entityManager.close()
-    }
-
-    @AfterEach
-    fun tearDown() {
-        val entityManager = entityManagerFactory.createEntityManager()
-
-        entityManager.transaction.run {
-            begin()
-            entityManager.removeAll(order1, order2, order3, order4)
+            sequenceOf(order1, order2, order3, order4).forEach {
+                entityManager.persist(it)
+                entityManager.flush()
+            }
             commit()
         }
 
@@ -74,4 +63,4 @@ internal open class KotlinJdslQueryProviderIntegrationTest : EntityDsl(), WithKo
         assertThat(reader.read()).isEqualTo(order3.id)
         assertThat(reader.read()).isEqualTo(order4.id)
     }
-}
+}
diff --git a/spring/data-core/src/test/kotlin/com/linecorp/kotlinjdsl/spring/data/SpringDataQueryFactoryIntegrationTest.kt b/spring/data-core/src/test/kotlin/com/linecorp/kotlinjdsl/spring/data/SpringDataQueryFactoryIntegrationTest.kt
@@ -39,8 +39,11 @@ internal open class SpringDataQueryFactoryIntegrationTest : EntityDsl(), WithKot
             criteriaQueryCreator = CriteriaQueryCreatorImpl(entityManager),
             subqueryCreator = SubqueryCreatorImpl()
         )
-        entityManager.persistAll(order1, order2, order3, order4)
-        entityManager.flushAndClear()
+        sequenceOf(order1, order2, order3, order4).forEach {
+            entityManager.persist(it)
+            entityManager.flush()
+            entityManager.clear()
+        }
     }
 
     @Test
diff --git a/test-fixture/entity/src/main/kotlin/com/linecorp/kotlinjdsl/test/entity/EntityDsl.kt b/test-fixture/entity/src/main/kotlin/com/linecorp/kotlinjdsl/test/entity/EntityDsl.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/AbstractCriteriaQueryDslIntegrationTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/AbstractCriteriaQueryDslIntegrationTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractCriteriaDeleteIntegrationTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractCriteriaDeleteIntegrationTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractFetchDslTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractFetchDslTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractGroupByDslTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractGroupByDslTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractJoinDslTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractJoinDslTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractLimitDslTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractLimitDslTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractOrderByDslTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/criteriaquery/AbstractOrderByDslTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/querydsl/groupby/AbstractCriteriaQueryDslGroupByIntegrationTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/querydsl/groupby/AbstractCriteriaQueryDslGroupByIntegrationTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/querydsl/having/AbstractCriteriaQueryDslHavingIntegrationTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/querydsl/having/AbstractCriteriaQueryDslHavingIntegrationTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/querydsl/predicate/AbstractCriteriaQueryDslPredicateIntegrationTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/querydsl/predicate/AbstractCriteriaQueryDslPredicateIntegrationTest.kt
diff --git a/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/querydsl/set/AbstractCriteriaQueryDslUpdateByIntegrationTest.kt b/test-fixture/integration/src/main/kotlin/com/linecorp/kotlinjdsl/test/integration/querydsl/set/AbstractCriteriaQueryDslUpdateByIntegrationTest.kt
