Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down
44 changes: 44 additions & 0 deletions subprojects/inline/src/test/java/org/mockitoinline/HierarchyPreInitializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
}