Get the tests runnable again.

app/.classpath

@@ -10,7 +10,8 @@
 	<classpathentry kind="lib" path="lib/jna-platform.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/>
-	<classpathentry kind="lib" path="/processing4-core/library-test/junit-4.8.1.jar"/>
+	<classpathentry kind="lib" path="/processing4-core/library-test/junit-4.13.2.jar"/>
+	<classpathentry kind="lib" path="/processing4-core/library-test/hamcrest-core-1.3.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/build.xml

@@ -78,8 +78,8 @@
   </path>
 
   <path id="classpath.test">
-    <pathelement location="library-test/junit-4.8.1.jar" />
-    <pathelement location="library-test/mockito-all-1.10.19.jar" />
+    <pathelement location="library-test/junit-4.13.2.jar" />
+    <pathelement location="library-test/hamcrest-core-1.3.jar" />
     <pathelement location="bin-test" />
     <path refid="classpath.base" />
   </path>

java/.classpath

@@ -24,6 +24,7 @@
 	<classpathentry kind="lib" path="mode/org.eclipse.osgi.jar"/>
 	<classpathentry kind="lib" path="mode/org.eclipse.text.jar"/>
 	<classpathentry kind="lib" path="mode/org.netbeans.swing.outline.jar"/>
-	<classpathentry kind="lib" path="test/lib/junit-4.8.1.jar"/>
+	<classpathentry kind="lib" path="test/lib/junit-4.13.2.jar"/>
+	<classpathentry kind="lib" path="test/lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/build.xml

@@ -75,8 +75,11 @@
   </path>
 
   <path id="classpath.test">
-    <pathelement location="../core/library-test/junit-4.8.1.jar" />
-    <pathelement location="../core/library-test/mockito-all-1.10.19.jar" />
+    <pathelement location="../core/library-test/junit-4.13.2.jar" />
+    <pathelement location="../core/library-test/hamcrest-core-1.3.jar" />
+    <pathelement location="../core/library-test/byte-buddy-1.11.19.jar" />
+    <pathelement location="../core/library-test/objenesis-3.2.jar" />
+    <pathelement location="../core/library-test/mockito-core-4.0.0.jar" />
     <pathelement location = "bin-test" />
     <path refid="classpath.base" />
   </path>

java/src/processing/mode/java/preproc/PdeParseTreeListener.java

@@ -325,6 +325,10 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
   public void exitMethodCall(ProcessingParser.MethodCallContext ctx) {
     String methodName = ctx.getChild(0).getText();
 
+    // Check if calling on something other than this.
+    //System.out.println(ctx.getParent());
+
+    // If referring to the applet, check for rewrites.
     if (SIZE_METHOD_NAME.equals(methodName) || FULLSCREEN_METHOD_NAME.equals(methodName)) {
       handleSizeCall(ctx);
     } else if (PIXEL_DENSITY_METHOD_NAME.equals(methodName)) {

java/test/processing/mode/java/ParserTests.java

@@ -390,4 +390,9 @@ public class ParserTests {
     expectGood("colorimport");
   }
 
+  /*@Test
+  public void testPGraphicsStandalone() {
+    expectGood("pgraphics");
+  }*/
+
 }

java/test/resources/pgraphics.pde

@@ -0,0 +1,10 @@
+PGraphics gfx;
+
+void setup() {
+
+  gfx = createGraphics(width, height);
+  gfx.smooth();
+}
+
+void draw() {
+}