From 071d538cffaa51e159aa741a967c3bb4539cd693 Mon Sep 17 00:00:00 2001 From: Kamil Krzywanski Date: Sun, 19 Apr 2026 01:33:36 +0200 Subject: [PATCH] Remove deprecated methods in tests + bump test libs Signed-off-by: Kamil Krzywanski --- .../inject/internal/InternalInjectorCreator.java | 3 +-- core/test/com/google/inject/Asserts.java | 12 ++++++------ core/test/com/google/inject/ScopesTest.java | 10 ++-------- .../ClientServiceWithDependencyInjection.java | 2 +- .../inject/example/ClientServiceWithFactories.java | 2 +- .../inject/example/ClientServiceWithGuice.java | 2 +- .../example/ClientServiceWithGuiceDefaults.java | 2 +- core/test/com/google/inject/internal/SpiUtils.java | 12 ++++++------ .../com/google/inject/internal/WeakKeySetUtils.java | 10 +++++----- .../inject/internal/aop/ImmutableStringTrieTest.java | 7 ++----- core/test/com/google/inject/util/TypesTest.java | 2 +- extensions/persist/pom.xml | 4 ++-- .../inject/persist/jpa/JpaPersistServiceTest.java | 2 +- .../google/inject/servlet/UriPatternTypeTest.java | 2 -- extensions/spring/pom.xml | 2 +- 15 files changed, 31 insertions(+), 43 deletions(-) diff --git a/core/src/com/google/inject/internal/InternalInjectorCreator.java b/core/src/com/google/inject/internal/InternalInjectorCreator.java index af1cb3fdc1..dce93e3222 100644 --- a/core/src/com/google/inject/internal/InternalInjectorCreator.java +++ b/core/src/com/google/inject/internal/InternalInjectorCreator.java @@ -194,11 +194,10 @@ private void injectDynamically() { * while we're binding these singletons are not be eager. */ void loadEagerSingletons(InjectorImpl injector, Stage stage, final Errors errors) { - List> candidateBindings = new ArrayList<>(); @SuppressWarnings("unchecked") // casting Collection to Collection is safe Collection> bindingsAtThisLevel = (Collection) injector.getBindingData().getExplicitBindingsThisLevel().values(); - candidateBindings.addAll(bindingsAtThisLevel); + List> candidateBindings = new ArrayList<>(bindingsAtThisLevel); synchronized (injector.getJitBindingData().lock()) { // jit bindings must be accessed while holding the lock. candidateBindings.addAll(injector.getJitBindingData().getJitBindings().values()); diff --git a/core/test/com/google/inject/Asserts.java b/core/test/com/google/inject/Asserts.java index 144da9715d..a482f42e85 100644 --- a/core/test/com/google/inject/Asserts.java +++ b/core/test/com/google/inject/Asserts.java @@ -20,10 +20,10 @@ import static com.google.common.base.StandardSystemProperty.PATH_SEPARATOR; import static com.google.common.truth.Truth.assertThat; import static com.google.inject.internal.InternalFlags.getIncludeStackTraceOption; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import com.google.common.base.Joiner; import com.google.common.base.Splitter; @@ -43,7 +43,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; -import junit.framework.Assert; +import org.junit.Assert; /** @author jessewilson@google.com (Jesse Wilson) */ public class Asserts { @@ -88,7 +88,7 @@ public static boolean isIncludeStackTraceOff() { public static void assertEqualsBothWays(Object expected, Object actual) { assertNotNull(expected); assertNotNull(actual); - assertEquals("expected.equals(actual)", actual, expected); + assertEquals("expected.equals(actual)", expected, actual); assertEquals("actual.equals(expected)", expected, actual); assertEquals("hashCode", expected.hashCode(), actual.hashCode()); } diff --git a/core/test/com/google/inject/ScopesTest.java b/core/test/com/google/inject/ScopesTest.java index 51c7606166..7b267fdc48 100644 --- a/core/test/com/google/inject/ScopesTest.java +++ b/core/test/com/google/inject/ScopesTest.java @@ -20,7 +20,7 @@ import static com.google.inject.Asserts.assertContains; import static com.google.inject.name.Names.named; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static junit.framework.Assert.assertSame; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; @@ -545,13 +545,7 @@ public static class Injected implements In {} @ScopeAnnotation public @interface CustomScoped {} - static final Scope CUSTOM_SCOPE = - new Scope() { - @Override - public Provider scope(Key key, Provider unscoped) { - return Scopes.SINGLETON.scope(key, unscoped); - } - }; + static final Scope CUSTOM_SCOPE = Scopes.SINGLETON; @SuppressWarnings("InjectScopeOrQualifierAnnotationRetention") // to check failure mode @Target({ElementType.TYPE, ElementType.METHOD}) diff --git a/core/test/com/google/inject/example/ClientServiceWithDependencyInjection.java b/core/test/com/google/inject/example/ClientServiceWithDependencyInjection.java index eb2fa5b4c7..39e8db9dc4 100644 --- a/core/test/com/google/inject/example/ClientServiceWithDependencyInjection.java +++ b/core/test/com/google/inject/example/ClientServiceWithDependencyInjection.java @@ -16,7 +16,7 @@ package com.google.inject.example; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; /** @author crazybob@google.com (Bob Lee) */ public class ClientServiceWithDependencyInjection { diff --git a/core/test/com/google/inject/example/ClientServiceWithFactories.java b/core/test/com/google/inject/example/ClientServiceWithFactories.java index 83a8ae6fbb..dc2034dff7 100644 --- a/core/test/com/google/inject/example/ClientServiceWithFactories.java +++ b/core/test/com/google/inject/example/ClientServiceWithFactories.java @@ -16,7 +16,7 @@ package com.google.inject.example; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; /** @author crazybob@google.com (Bob Lee) */ public class ClientServiceWithFactories { diff --git a/core/test/com/google/inject/example/ClientServiceWithGuice.java b/core/test/com/google/inject/example/ClientServiceWithGuice.java index 2c7567d66c..58d102ad51 100644 --- a/core/test/com/google/inject/example/ClientServiceWithGuice.java +++ b/core/test/com/google/inject/example/ClientServiceWithGuice.java @@ -16,7 +16,7 @@ package com.google.inject.example; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import com.google.inject.AbstractModule; import com.google.inject.CreationException; diff --git a/core/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java b/core/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java index ce90db7b0f..caeb933be2 100644 --- a/core/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java +++ b/core/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java @@ -22,7 +22,7 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; -import junit.framework.Assert; +import org.junit.Assert; /** @author crazybob@google.com (Bob Lee) */ public class ClientServiceWithGuiceDefaults { diff --git a/core/test/com/google/inject/internal/SpiUtils.java b/core/test/com/google/inject/internal/SpiUtils.java index 7fb5baadde..55eae3c5d3 100644 --- a/core/test/com/google/inject/internal/SpiUtils.java +++ b/core/test/com/google/inject/internal/SpiUtils.java @@ -37,12 +37,12 @@ import static com.google.inject.internal.SpiUtils.VisitType.BOTH; import static com.google.inject.internal.SpiUtils.VisitType.INJECTOR; import static com.google.inject.internal.SpiUtils.VisitType.MODULE; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import com.google.common.base.Joiner; import com.google.common.base.Objects; diff --git a/core/test/com/google/inject/internal/WeakKeySetUtils.java b/core/test/com/google/inject/internal/WeakKeySetUtils.java index 0dbcf125a5..7838bad7d5 100644 --- a/core/test/com/google/inject/internal/WeakKeySetUtils.java +++ b/core/test/com/google/inject/internal/WeakKeySetUtils.java @@ -14,11 +14,11 @@ package com.google.inject.internal; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import com.google.inject.Injector; import com.google.inject.Key; diff --git a/core/test/com/google/inject/internal/aop/ImmutableStringTrieTest.java b/core/test/com/google/inject/internal/aop/ImmutableStringTrieTest.java index 1b412f9c52..2606fd5069 100644 --- a/core/test/com/google/inject/internal/aop/ImmutableStringTrieTest.java +++ b/core/test/com/google/inject/internal/aop/ImmutableStringTrieTest.java @@ -17,10 +17,9 @@ package com.google.inject.internal.aop; import static java.util.Arrays.stream; -import static java.util.Collections.sort; import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import com.google.common.collect.ImmutableSet; import com.google.inject.Binder; @@ -48,9 +47,7 @@ public void testSingletonTrie() { public void testMethodStrings() { List table = - stream(Binder.class.getDeclaredMethods()).map(Method::toString).collect(toList()); - - sort(table); + stream(Binder.class.getDeclaredMethods()).map(Method::toString).sorted().collect(toList()); ToIntFunction trie = ImmutableStringTrie.buildTrie(table); diff --git a/core/test/com/google/inject/util/TypesTest.java b/core/test/com/google/inject/util/TypesTest.java index 4cdb78acb3..ecd773247d 100644 --- a/core/test/com/google/inject/util/TypesTest.java +++ b/core/test/com/google/inject/util/TypesTest.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; /** @author jessewilson@google.com (Jesse Wilson) */ diff --git a/extensions/persist/pom.xml b/extensions/persist/pom.xml index 7d57fbe57f..d01f7d35db 100644 --- a/extensions/persist/pom.xml +++ b/extensions/persist/pom.xml @@ -40,8 +40,8 @@ org.hsqldb - hsqldb-j5 - 2.0.0 + hsqldb + 2.7.4 test diff --git a/extensions/persist/test/com/google/inject/persist/jpa/JpaPersistServiceTest.java b/extensions/persist/test/com/google/inject/persist/jpa/JpaPersistServiceTest.java index 9ca2e05263..67b041d5e8 100644 --- a/extensions/persist/test/com/google/inject/persist/jpa/JpaPersistServiceTest.java +++ b/extensions/persist/test/com/google/inject/persist/jpa/JpaPersistServiceTest.java @@ -17,7 +17,7 @@ package com.google.inject.persist.jpa; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/extensions/servlet/test/com/google/inject/servlet/UriPatternTypeTest.java b/extensions/servlet/test/com/google/inject/servlet/UriPatternTypeTest.java index 3662349f6b..74e1a3e9af 100644 --- a/extensions/servlet/test/com/google/inject/servlet/UriPatternTypeTest.java +++ b/extensions/servlet/test/com/google/inject/servlet/UriPatternTypeTest.java @@ -16,8 +16,6 @@ package com.google.inject.servlet; -import static junit.framework.Assert.fail; - import junit.framework.TestCase; public class UriPatternTypeTest extends TestCase { diff --git a/extensions/spring/pom.xml b/extensions/spring/pom.xml index 7430e1a04f..de22455c9c 100644 --- a/extensions/spring/pom.xml +++ b/extensions/spring/pom.xml @@ -17,7 +17,7 @@ org.springframework spring-beans - 5.3.18 + 5.3.39 provided