Skip to content

Commit ba6a44a

Browse files
committed
Modify to use Jakarta EE 9 APIs on Tests
See gh-634
1 parent 5f855f2 commit ba6a44a

File tree

3 files changed

+37
-9
lines changed

3 files changed

+37
-9
lines changed

pom.xml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,20 +291,18 @@
291291
</exclusion>
292292
</exclusions>
293293
</dependency>
294-
295294
<dependency>
296295
<groupId>jakarta.transaction</groupId>
297296
<artifactId>jakarta.transaction-api</artifactId>
298-
<version>1.3.3</version>
297+
<version>2.0.0</version>
299298
<scope>test</scope>
300299
</dependency>
301300
<dependency>
302301
<groupId>jakarta.servlet</groupId>
303302
<artifactId>jakarta.servlet-api</artifactId>
304-
<version>4.0.4</version>
303+
<version>5.0.0</version>
305304
<scope>test</scope>
306305
</dependency>
307-
308306
</dependencies>
309307

310308
<build>
@@ -371,6 +369,32 @@
371369
<name>Sonatype OSS Snapshots Repository</name>
372370
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
373371
</repository>
372+
<repository>
373+
<id>spring-snapshot</id>
374+
<name>Spring Snapshots</name>
375+
<url>https://repo.spring.io/snapshot</url>
376+
<releases>
377+
<enabled>false</enabled>
378+
</releases>
379+
</repository>
380+
<repository>
381+
<id>spring-milestone</id>
382+
<name>Spring Milestone</name>
383+
<url>https://repo.spring.io/milestone</url>
384+
<snapshots>
385+
<enabled>false</enabled>
386+
</snapshots>
387+
</repository>
374388
</repositories>
389+
<pluginRepositories>
390+
<pluginRepository>
391+
<id>spring-milestone</id>
392+
<name>Spring Milestone</name>
393+
<url>https://repo.spring.io/milestone</url>
394+
<snapshots>
395+
<enabled>false</enabled>
396+
</snapshots>
397+
</pluginRepository>
398+
</pluginRepositories>
375399

376400
</project>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static org.junit.jupiter.api.Assertions.assertThrows;
2020
import static org.junit.jupiter.api.Assertions.fail;
2121

22-
import com.mockrunner.mock.ejb.MockUserTransaction;
2322
import com.mockrunner.mock.jdbc.MockConnection;
2423
import com.mockrunner.mock.jdbc.MockDataSource;
2524
import com.mockrunner.mock.jdbc.MockPreparedStatement;
@@ -32,12 +31,15 @@
3231
import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
3332
import org.junit.jupiter.api.AfterEach;
3433
import org.junit.jupiter.api.Test;
34+
import org.mockito.Mockito;
3535
import org.springframework.dao.DataAccessException;
3636
import org.springframework.dao.TransientDataAccessResourceException;
3737
import org.springframework.transaction.TransactionStatus;
3838
import org.springframework.transaction.jta.JtaTransactionManager;
3939
import org.springframework.transaction.support.DefaultTransactionDefinition;
4040

41+
import jakarta.transaction.UserTransaction;
42+
4143
class MyBatisSpringTest extends AbstractMyBatisSpringTest {
4244

4345
private SqlSession session;
@@ -275,7 +277,7 @@ void testChangeExecutorTypeInTxRequiresNew() throws Exception {
275277

276278
@Test
277279
void testWithJtaTxManager() {
278-
JtaTransactionManager jtaManager = new JtaTransactionManager(new MockUserTransaction());
280+
JtaTransactionManager jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class));
279281

280282
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
281283
txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");
@@ -304,7 +306,7 @@ void testWithJtaTxManagerAndNonSpringTxManager() throws java.sql.SQLException {
304306
Environment nonSpring = new Environment("non-spring", new ManagedTransactionFactory(), mockDataSource);
305307
sqlSessionFactory.getConfiguration().setEnvironment(nonSpring);
306308

307-
JtaTransactionManager jtaManager = new JtaTransactionManager(new MockUserTransaction());
309+
JtaTransactionManager jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class));
308310

309311
DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
310312
txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");

src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
1919

20-
import javax.transaction.UserTransaction;
21-
20+
import org.junit.jupiter.api.Disabled;
2221
import org.junit.jupiter.api.Test;
2322
import org.junit.jupiter.api.extension.ExtendWith;
2423
import org.springframework.beans.factory.annotation.Autowired;
2524
import org.springframework.test.context.junit.jupiter.SpringExtension;
2625
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
2726

27+
import jakarta.transaction.UserTransaction;
28+
29+
@Disabled("Yet not found OSS implementation that supported Jakarta EE 9+ APIs")
2830
@ExtendWith(SpringExtension.class)
2931
@SpringJUnitConfig(locations = "classpath:org/mybatis/spring/submitted/xa/applicationContext.xml")
3032
class UserServiceTest {

0 commit comments

Comments
 (0)