Skip to content

Commit d12bf5a

Browse files
committed
[tests] Enable one deprecated test with comments and add missing deprecated
1 parent bdcbbe5 commit d12bf5a

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/test/java/org/mybatis/guice/MyBatisModuleTest.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2024 the original author or authors.
2+
* Copyright 2009-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -63,7 +63,6 @@
6363
import org.apache.ibatis.type.TypeHandler;
6464
import org.junit.jupiter.api.Assertions;
6565
import org.junit.jupiter.api.BeforeEach;
66-
import org.junit.jupiter.api.Disabled;
6766
import org.junit.jupiter.api.Test;
6867
import org.junit.jupiter.api.extension.ExtendWith;
6968
import org.mockito.Mock;
@@ -240,6 +239,7 @@ protected void initialize() {
240239
assertEquals(false, configuration.isAggressiveLazyLoading());
241240
}
242241

242+
@Deprecated
243243
@Test
244244
void multipleResultSetsEnabled_Default() {
245245
Injector injector = Guice.createInjector(new MyBatisModule() {
@@ -256,6 +256,7 @@ protected void initialize() {
256256
assertEquals(true, configuration.isMultipleResultSetsEnabled());
257257
}
258258

259+
@Deprecated
259260
@Test
260261
void multipleResultSetsEnabled_True() {
261262
Injector injector = Guice.createInjector(new MyBatisModule() {
@@ -273,12 +274,13 @@ protected void initialize() {
273274
assertEquals(true, configuration.isMultipleResultSetsEnabled());
274275
}
275276

276-
@Disabled("multipleResultSetsEnabled is deprecated")
277+
@Deprecated
277278
@Test
278279
void multipleResultSetsEnabled_False() {
279280
Injector injector = Guice.createInjector(new MyBatisModule() {
280281
@Override
281282
protected void initialize() {
283+
// Does nothing
282284
multipleResultSetsEnabled(false);
283285
environmentId("test_environment");
284286
bindDataSourceProvider(dataSourceProvider);
@@ -288,7 +290,8 @@ protected void initialize() {
288290

289291
Configuration configuration = injector.getInstance(Configuration.class);
290292

291-
assertEquals(false, configuration.isMultipleResultSetsEnabled());
293+
// Normally expected 'false' but this no longer does anything!
294+
assertEquals(true, configuration.isMultipleResultSetsEnabled());
292295
}
293296

294297
@Test
@@ -1532,7 +1535,7 @@ public static class TestDatabaseIdProvider implements DatabaseIdProvider {
15321535

15331536
@Override
15341537
public void setProperties(Properties p) {
1535-
// Do Nothing
1538+
// Do Nothing
15361539
}
15371540

15381541
@Override

0 commit comments

Comments
 (0)