Skip to content

Commit 1a1763c

Browse files
authored
Remove SecureMockMaker (#127773)
The SecureMockMaker is a way for mockito to be allowed SM permissions for proxying. Since the Security Manager is no longer used, secure mocks are no longer needed. This commit removes them.
1 parent 0df9d1c commit 1a1763c

9 files changed

+0
-238
lines changed

test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java

-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.core.Booleans;
1717
import org.elasticsearch.core.PathUtils;
1818
import org.elasticsearch.jdk.JarHell;
19-
import org.elasticsearch.test.mockito.SecureMockMaker;
2019

2120
import java.io.IOException;
2221
import java.nio.file.Files;
@@ -70,9 +69,6 @@ public class BootstrapForTesting {
7069
throw new RuntimeException("found jar hell in test classpath", e);
7170
}
7271

73-
// init mockito
74-
SecureMockMaker.init();
75-
7672
// Log ifconfig output before SecurityManager is installed
7773
IfConfig.logIfNecessary();
7874
}

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureAnnotationEngine.java

-28
This file was deleted.

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureMockMaker.java

-98
This file was deleted.

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureMockUtil.java

-45
This file was deleted.

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureObjectInstantiator.java

-28
This file was deleted.

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureObjectInstantiatorProvider.java

-32
This file was deleted.

test/framework/src/main/resources/mockito-extensions/org.mockito.plugins.AnnotationEngine

-1
This file was deleted.

test/framework/src/main/resources/mockito-extensions/org.mockito.plugins.InstantiatorProvider2

-1
This file was deleted.

test/framework/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker

-1
This file was deleted.

0 commit comments

Comments
 (0)