Remove deprecated methods in tests + bump test libs

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<BindingImpl<?>> candidateBindings = new ArrayList<>();
     @SuppressWarnings("unchecked") // casting Collection<Binding> to Collection<BindingImpl> is safe
     Collection<BindingImpl<?>> bindingsAtThisLevel =
         (Collection) injector.getBindingData().getExplicitBindingsThisLevel().values();
-    candidateBindings.addAll(bindingsAtThisLevel);
+    List<BindingImpl<?>> candidateBindings = new ArrayList<>(bindingsAtThisLevel);
     synchronized (injector.getJitBindingData().lock()) {
       // jit bindings must be accessed while holding the lock.
       candidateBindings.addAll(injector.getJitBindingData().getJitBindings().values());

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());
   }

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<T> implements In<T> {}
   @ScopeAnnotation
   public @interface CustomScoped {}
 
-  static final Scope CUSTOM_SCOPE =
-      new Scope() {
-        @Override
-        public <T> Provider<T> scope(Key<T> key, Provider<T> 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})

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 {

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 {

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;

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 {

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;

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;

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<String> table =
-        stream(Binder.class.getDeclaredMethods()).map(Method::toString).collect(toList());
-
-    sort(table);
+        stream(Binder.class.getDeclaredMethods()).map(Method::toString).sorted().collect(toList());
 
     ToIntFunction<String> trie = ImmutableStringTrie.buildTrie(table);
 

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) */

extensions/persist/pom.xml

@@ -40,8 +40,8 @@
     </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb-j5</artifactId>
-      <version>2.0.0</version>
+      <artifactId>hsqldb</artifactId>
+      <version>2.7.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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;

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 {

extensions/spring/pom.xml

@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>5.3.18</version>
+      <version>5.3.39</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>