Merge pull request #347 from code-dot-org/revert-342-molly/mockito

molly-moen · web-flow · commit 32d5055b59bd · 2022-08-15T15:23:12.000-07:00
Revert "Make mockito available to users"
diff --git a/org-code-javabuilder/lib/src/main/java/org/code/javabuilder/UserClassLoader.java b/org-code-javabuilder/lib/src/main/java/org/code/javabuilder/UserClassLoader.java
@@ -126,8 +126,7 @@ private boolean isInAllowedPackage(String[] allowedPackageList, String name) {
         "org.code.media.",
         "org.code.neighborhood.",
         "org.code.theater.",
-        "org.code.lang",
-        "org.mockito."
+        "org.code.lang"
       };
 
   // Allowed packages for code with elevated permissions, such as validation code.
diff --git a/org-code-javabuilder/studentlib/build.gradle b/org-code-javabuilder/studentlib/build.gradle
@@ -14,7 +14,6 @@ java {
 dependencies {
     // Required to compile student unit tests
     implementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
-    implementation group: 'org.mockito', name: 'mockito-inline', version: '3.9.0'
 }
 
 test {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ java {`
`14`	`14`	`dependencies {`
`15`	`15`	`// Required to compile student unit tests`
`16`	`16`	`implementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'`
`17`		`- implementation group: 'org.mockito', name: 'mockito-inline', version: '3.9.0'`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`test {`