diff --git a/java/test/processing/mode/java/ParserTests.java b/java/test/processing/mode/java/ParserTests.java index 454d4b9fc..7d603708f 100644 --- a/java/test/processing/mode/java/ParserTests.java +++ b/java/test/processing/mode/java/ParserTests.java @@ -476,12 +476,12 @@ public class ParserTests { @Test public void testExpessionSizeMethod() { - expectRunnerException("expressionsizemethod"); + expectGood("expressionsizemethod"); } @Test public void testExpessionSizeVar() { - expectRunnerException("expressionsizevar"); + expectGood("expressionsizevar"); } } diff --git a/java/test/resources/expressionsizemethod.expected b/java/test/resources/expressionsizemethod.expected new file mode 100644 index 000000000..7a3b4a7ef --- /dev/null +++ b/java/test/resources/expressionsizemethod.expected @@ -0,0 +1,44 @@ +import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; + +import processing.pdf.*; + +import java.util.HashMap; +import java.util.ArrayList; +import java.io.File; +import java.io.BufferedReader; +import java.io.PrintWriter; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.IOException; + +public class expressionsizemethod extends PApplet { + +public int getWidth() { + return 400*2; +} + +public void setup() { + size(getWidth(), 400/2); +} + + public void draw() { + // Draw something good here + line(0, 0, width/2, height); + + // Exit the program + println("Finished."); + exit(); +} + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "expressionsizemethod" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } + } +} diff --git a/java/test/resources/expressionsizevar.expected b/java/test/resources/expressionsizevar.expected new file mode 100644 index 000000000..f7012e0a9 --- /dev/null +++ b/java/test/resources/expressionsizevar.expected @@ -0,0 +1,43 @@ +import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; + +import processing.pdf.*; + +import java.util.HashMap; +import java.util.ArrayList; +import java.io.File; +import java.io.BufferedReader; +import java.io.PrintWriter; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.IOException; + +public class expressionsizevar extends PApplet { + + + +public void setup() { + int newWidth = 400*2; + size(newWidth, 400/2); +} + + public void draw() { + // Draw something good here + line(0, 0, width/2, height); + + // Exit the program + println("Finished."); + exit(); +} + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "expressionsizevar" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } + } +} diff --git a/java/test/resources/expressionsizevar.pde b/java/test/resources/expressionsizevar.pde index 3ce0b7b24..a6d4d94c2 100644 --- a/java/test/resources/expressionsizevar.pde +++ b/java/test/resources/expressionsizevar.pde @@ -1,9 +1,5 @@ import processing.pdf.*; -int getWidth() { - return 400*2; -} - void setup() { int newWidth = 400*2; size(newWidth, 400/2);