Merge pull request #351 from code-dot-org/molly/easymock

Add access to EasyMock

Author: molly-moen

org-code-javabuilder/lib/src/main/java/org/code/javabuilder/UserClassLoader.java

@@ -4,6 +4,8 @@
 
 import java.lang.invoke.LambdaMetafactory;
 import java.lang.invoke.StringConcatFactory;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.HashSet;
@@ -112,7 +114,11 @@ private boolean isInAllowedPackage(String[] allowedPackageList, String name) {
           String.class.getName(),
           StringBuffer.class.getName(),
           StringBuilder.class.getName(),
-          Throwable.class.getName());
+          Throwable.class.getName(),
+          ThreadLocal.class.getName(), // EasyMock support
+          CloneNotSupportedException.class.getName(), // EasyMock support
+          Method.class.getName(), // EasyMock support
+          InvocationTargetException.class.getName()); // EasyMock support
 
   // Allowed packages (any individual class is allowed from these classes)
   private static final String[] allowedPackages =
@@ -126,7 +132,9 @@ private boolean isInAllowedPackage(String[] allowedPackageList, String name) {
         "org.code.media.",
         "org.code.neighborhood.",
         "org.code.theater.",
-        "org.code.lang"
+        "org.code.lang",
+        "org.easymock.",
+        "jdk.internal.reflect.SerializationConstructorAccessorImpl" // EasyMock support
       };
 
   // Allowed packages for code with elevated permissions, such as validation code.

org-code-javabuilder/studentlib/build.gradle

@@ -14,6 +14,9 @@ java {
 dependencies {
     // Required to compile student unit tests
     implementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
+    // https://mvnrepository.com/artifact/org.easymock/easymock
+    implementation group: 'org.easymock', name: 'easymock', version: '4.3'
+
 }
 
 test {