Merge pull request #2505 from mockito/initialize-interfaces

Make sure interface types are initialized before inline mocking to avoid blocking code of static initializers.

src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java

@@ -252,8 +252,8 @@ private <T> void triggerRetransformation(Set<Class<?>> types, boolean flat) {
                 } else {
                     do {
                         if (mocked.add(type)) {
-                            assureInitialization(type);
                             if (!flatMocked.remove(type)) {
+                                assureInitialization(type);
                                 targets.add(type);
                             }
                             addInterfaces(targets, type.getInterfaces());
@@ -356,6 +356,7 @@ private void addInterfaces(Set<Class<?>> types, Class<?>[] interfaces) {
         for (Class<?> type : interfaces) {
             if (mocked.add(type)) {
                 if (!flatMocked.remove(type)) {
+                    assureInitialization(type);
                     types.add(type);
                 }
                 addInterfaces(types, type.getInterfaces());

subprojects/inline/src/test/java/org/mockitoinline/HierarchyPreInitializationTest.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockitoinline;
+
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+
+public class HierarchyPreInitializationTest {
+
+    @Test
+    @SuppressWarnings("CheckReturnValue")
+    public void testOrder() {
+        mock(MyClass.class);
+        mock(TestSubInterface.class);
+    }
+
+    public interface TestInterface {
+
+        @SuppressWarnings("unused")
+        MyClass INSTANCE = new MyClass().probe();
+    }
+
+    public interface TestSubInterface extends TestInterface {
+    }
+
+    public static class MyClass {
+
+        private final Object obj;
+
+        public MyClass() {
+            obj = new Object();
+        }
+
+        public MyClass probe() {
+            if (obj == null) {
+                throw new RuntimeException();
+            }
+            return this;
+        }
+    }
+}