Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: d8911c6e95 am: 82af4b8b1d

Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib180e48a4cc266c12a2d9238385adbb07540d3dc

1 files changed, 27 insertions, 1 deletions

diff --git a/src/main/java/org/junit/internal/Classes.java b/src/main/java/org/junit/internal/Classes.java
index 154603d..e8404f6 100644
--- a/src/main/java/org/junit/internal/Classes.java
+++ b/src/main/java/org/junit/internal/Classes.java
@@ -6,13 +6,39 @@ import static java.lang.Thread.currentThread;
  * Miscellaneous functions dealing with classes.

  */

 public class Classes {

+

+    /**

+     * Do not instantiate.

+     * @deprecated will be private soon.

+     */

+    @Deprecated

+    public Classes() {

+    }

+

     /**

      * Returns Class.forName for {@code className} using the current thread's class loader.

+     * If the current thread does not have a class loader, falls back to the class loader for

+     * {@link Classes}.

      *

      * @param className Name of the class.

      * @throws ClassNotFoundException

      */

     public static Class<?> getClass(String className) throws ClassNotFoundException {

-        return Class.forName(className, true, currentThread().getContextClassLoader());

+        return getClass(className, Classes.class);

+    }

+

+    /**

+     * Returns Class.forName for {@code className} using the current thread's class loader.

+     * If the current thread does not have a class loader, falls back to the class loader for the

+     * passed-in class.

+     *

+     * @param className Name of the class.

+     * @param callingClass Class that is requesting a the class

+     * @throws ClassNotFoundException

+     * @since 4.13

+     */

+    public static Class<?> getClass(String className, Class<?> callingClass) throws ClassNotFoundException {

+        ClassLoader classLoader = currentThread().getContextClassLoader();

+        return Class.forName(className, true, classLoader == null ? callingClass.getClassLoader() : classLoader);

     }

 }