From 2dd6a9c1a075ef08cc5ba0a86e061a0bab831b71 Mon Sep 17 00:00:00 2001 From: Grant Cahill Date: Thu, 8 Aug 2013 06:56:49 -0700 Subject: [PATCH] Updated the unit tests for ParserTests and the expected input and output for the respective tests to match the current state of Processing. --- app/test/resources/annotations.expected | 37 ++++--- app/test/resources/annotations.pde | 2 + app/test/resources/bug1064.expected | 40 ++++--- app/test/resources/bug136.expected | 62 ++++++----- app/test/resources/bug136.pde | 1 + app/test/resources/bug1362.expected | 40 ++++--- app/test/resources/bug1442.expected | 39 ++++--- app/test/resources/bug1511.expected | 52 +++++---- app/test/resources/bug1512.expected | 40 ++++--- app/test/resources/bug1514a.expected | 48 ++++---- app/test/resources/bug1514b.expected | 48 ++++---- app/test/resources/bug1515.expected | 47 ++++---- app/test/resources/bug1516.expected | 77 ++++++------- app/test/resources/bug1517.expected | 77 ++++++------- app/test/resources/bug1518a.expected | 67 +++++------ app/test/resources/bug1518b.expected | 63 ++++++----- app/test/resources/bug1525.expected | 38 ++++--- app/test/resources/bug1534.expected | 38 ++++--- app/test/resources/bug281.expected | 46 ++++---- app/test/resources/bug315g.expected | 38 ++++--- app/test/resources/bug4.expected | 38 ++++--- app/test/resources/bug400g.expected | 33 +++--- app/test/resources/bug427g.expected | 33 +++--- app/test/resources/bug481.expected | 43 +++++--- app/test/resources/bug481.pde | 1 + app/test/resources/bug598.expected | 104 ++++++++++-------- app/test/resources/bug598.pde | 7 ++ app/test/resources/bug5a.expected | 42 +++---- app/test/resources/bug5b.expected | 42 +++---- app/test/resources/bug631.expected | 38 ++++--- .../processing/mode/java/ParserTests.java | 4 +- 31 files changed, 706 insertions(+), 579 deletions(-) diff --git a/app/test/resources/annotations.expected b/app/test/resources/annotations.expected index 8a45dbc62..76d6b79a8 100755 --- a/app/test/resources/annotations.expected +++ b/app/test/resources/annotations.expected @@ -1,21 +1,23 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +import java.io.Serializable; + +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 annotations extends PApplet { + + public void setup() { size(200,200); } @@ -40,7 +42,12 @@ class Apple implements Serializable { comments="Shazam!", date="2001-07-04T12:08:56.235-0700") class Pear {} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "annotations" }); + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "annotations" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/annotations.pde b/app/test/resources/annotations.pde index 1381d95e0..7df4e2a9b 100755 --- a/app/test/resources/annotations.pde +++ b/app/test/resources/annotations.pde @@ -1,3 +1,5 @@ +import java.io.Serializable; + void setup() { size(200,200); } diff --git a/app/test/resources/bug1064.expected b/app/test/resources/bug1064.expected index 2cbeaca7b..2fd1f3ef0 100644 --- a/app/test/resources/bug1064.expected +++ b/app/test/resources/bug1064.expected @@ -1,25 +1,29 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1064 extends PApplet { public void setup() { -// import "; - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1064" }); +// import "; + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1064" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug136.expected b/app/test/resources/bug136.expected index 81328df74..3ed7a5fc5 100644 --- a/app/test/resources/bug136.expected +++ b/app/test/resources/bug136.expected @@ -1,35 +1,41 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +import java.util.Collections; + +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 bug136 extends PApplet { -java.util.List alist = Collections.synchronizedList(new ArrayList()); - -public void setup() { -size(400, 200); -alist.add("hello"); -} - -public void draw() { -rect(width/4, height/4, width/2, height/2); -synchronized(alist) { -alist.get(0); -} -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug136" }); + +java.util.List alist = Collections.synchronizedList(new ArrayList()); + +public void setup() { +size(400, 200); +alist.add("hello"); +} + +public void draw() { +rect(width/4, height/4, width/2, height/2); +synchronized(alist) { +alist.get(0); +} +} + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug136" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug136.pde b/app/test/resources/bug136.pde index fe00c17a8..58f078e22 100644 --- a/app/test/resources/bug136.pde +++ b/app/test/resources/bug136.pde @@ -1,3 +1,4 @@ +import java.util.Collections; java.util.List alist = Collections.synchronizedList(new ArrayList()); void setup() { diff --git a/app/test/resources/bug1362.expected b/app/test/resources/bug1362.expected index ddcfb0962..479feefb6 100644 --- a/app/test/resources/bug1362.expected +++ b/app/test/resources/bug1362.expected @@ -1,25 +1,29 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1362 extends PApplet { public void setup() { -if (true) {} else { new String(); } - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1362" }); +if (true) {} else { new String(); } + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1362" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1442.expected b/app/test/resources/bug1442.expected index f04c55eb3..1a22ef53a 100644 --- a/app/test/resources/bug1442.expected +++ b/app/test/resources/bug1442.expected @@ -1,25 +1,28 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1442 extends PApplet { -public float a() { - return 1.0f; -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1442" }); +public float a() { + return 1.0f; +} + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1442" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1511.expected b/app/test/resources/bug1511.expected index f0b7611cc..10a0d155a 100644 --- a/app/test/resources/bug1511.expected +++ b/app/test/resources/bug1511.expected @@ -1,33 +1,37 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; import java.io.StringWriter; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1511 extends PApplet { public void setup() { -// \u00df - -/** -* a -*/ - - - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1511" }); +// \u00df + +/** +* a +*/ + + + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1511" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1512.expected b/app/test/resources/bug1512.expected index ef4ef3cd3..511615729 100644 --- a/app/test/resources/bug1512.expected +++ b/app/test/resources/bug1512.expected @@ -1,25 +1,29 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1512 extends PApplet { public void setup() { -println("oi/*"); - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1512" }); +println("oi/*"); + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1512" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1514a.expected b/app/test/resources/bug1514a.expected index b7cdc32aa..7596c2745 100644 --- a/app/test/resources/bug1514a.expected +++ b/app/test/resources/bug1514a.expected @@ -1,31 +1,35 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; import java.io.StringWriter; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1514a extends PApplet { public void setup() { -//----- \u00e8\u00e9\u00e9\u00e8\u00e8\u00e9\u00e9\u00e9\u00e0\u00e9\u00e9\u00e8\u00e9''\u00e9\u00e9\u00e9 -//---------------------------------------------------------------- -//--- IMPORTS -//---------------------------------------------------------------- - - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1514a" }); +//----- \u00e8\u00e9\u00e9\u00e8\u00e8\u00e9\u00e9\u00e9\u00e0\u00e9\u00e9\u00e8\u00e9''\u00e9\u00e9\u00e9 +//---------------------------------------------------------------- +//--- IMPORTS +//---------------------------------------------------------------- + + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1514a" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1514b.expected b/app/test/resources/bug1514b.expected index 8e7c95b93..b7628ef32 100644 --- a/app/test/resources/bug1514b.expected +++ b/app/test/resources/bug1514b.expected @@ -1,31 +1,35 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; import java.io.StringWriter; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1514b extends PApplet { public void setup() { -//----- \u00e8\u00e9\u00e9\u00e8\u00e8\u00e9\u00e9\u00e9\u00e0\u00e9\u00e9\u00e8\u00e9''\u00e9\u00e9 -//---------------------------------------------------------------- -//--- IMPORTS -//---------------------------------------------------------------- - - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1514b" }); +//----- \u00e8\u00e9\u00e9\u00e8\u00e8\u00e9\u00e9\u00e9\u00e0\u00e9\u00e9\u00e8\u00e9''\u00e9\u00e9 +//---------------------------------------------------------------- +//--- IMPORTS +//---------------------------------------------------------------- + + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1514b" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1515.expected b/app/test/resources/bug1515.expected index 0401a4ef2..f2d0ae2c4 100644 --- a/app/test/resources/bug1515.expected +++ b/app/test/resources/bug1515.expected @@ -1,29 +1,32 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1515 extends PApplet { -// a class definition that does something with things that extend PApplet -class Heythere{ -} - -// method definition which can do things with papplet -public void doSomething( T thing ){ -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1515" }); +// a class definition that does something with things that extend PApplet +class Heythere{ +} + +// method definition which can do things with papplet +public void doSomething( T thing ){ +} + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1515" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1516.expected b/app/test/resources/bug1516.expected index 70faf1b6b..15eb348d3 100644 --- a/app/test/resources/bug1516.expected +++ b/app/test/resources/bug1516.expected @@ -1,49 +1,52 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; import java.util.ArrayList; import java.util.List; import java.util.Collections; import java.util.Comparator; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1516 extends PApplet { - - - - - -public void setup() -{ -List list = new ArrayList(); -list.add("foo"); -list.add("bar"); -list.add("baz"); - -Comparator comparator = new Comparator() -{ -public int compare(final String value0, final String value1) -{ -return value0.compareTo(value1); -} -}; - -Collections.sort(list, comparator); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1516" }); + + + + + +public void setup() +{ +List list = new ArrayList(); +list.add("foo"); +list.add("bar"); +list.add("baz"); + +Comparator comparator = new Comparator() +{ +public int compare(final String value0, final String value1) +{ +return value0.compareTo(value1); +} +}; + +Collections.sort(list, comparator); +} + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1516" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1517.expected b/app/test/resources/bug1517.expected index b6533a310..b8bac1af2 100644 --- a/app/test/resources/bug1517.expected +++ b/app/test/resources/bug1517.expected @@ -1,49 +1,52 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; import java.util.ArrayList; import java.util.List; import java.util.Collections; import java.util.Comparator; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1517 extends PApplet { - - - - - -Comparator comparator = new Comparator() -{ -public int compare(final String value0, final String value1) -{ -return value0.compareTo(value1); -} -}; - -public void setup() -{ -List list = new ArrayList(); -list.add("foo"); -list.add("bar"); -list.add("baz"); - -Collections.sort(list, comparator); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1517" }); + + + + + +Comparator comparator = new Comparator() +{ +public int compare(final String value0, final String value1) +{ +return value0.compareTo(value1); +} +}; + +public void setup() +{ +List list = new ArrayList(); +list.add("foo"); +list.add("bar"); +list.add("baz"); + +Collections.sort(list, comparator); +} + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1517" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1518a.expected b/app/test/resources/bug1518a.expected index 3ba413d18..55288cc3c 100644 --- a/app/test/resources/bug1518a.expected +++ b/app/test/resources/bug1518a.expected @@ -1,42 +1,45 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; import java.util.ArrayList; import java.util.List; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1518a extends PApplet { - - - -public void setup() -{ -List list = new ArrayList(); -list.add("foo"); -list.add("bar"); -list.add("baz"); - -binarySearch(list, "bar"); -} - -static int binarySearch(List> list, T -key) { -return 0; -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1518a" }); + + + +public void setup() +{ +List list = new ArrayList(); +list.add("foo"); +list.add("bar"); +list.add("baz"); + +binarySearch(list, "bar"); +} + +static int binarySearch(List> list, T +key) { +return 0; +} + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1518a" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1518b.expected b/app/test/resources/bug1518b.expected index 156e9cfe0..f4144e7b1 100644 --- a/app/test/resources/bug1518b.expected +++ b/app/test/resources/bug1518b.expected @@ -1,40 +1,43 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; import java.util.ArrayList; import java.util.List; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1518b extends PApplet { - - - -public void setup() -{ -List list = new ArrayList(); -list.add("foo"); -list.add("bar"); -list.add("baz"); -} - -static int binarySearch(List> list, T -key) { -return 0; -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1518b" }); + + + +public void setup() +{ +List list = new ArrayList(); +list.add("foo"); +list.add("bar"); +list.add("baz"); +} + +static int binarySearch(List> list, T +key) { +return 0; +} + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1518b" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1525.expected b/app/test/resources/bug1525.expected index 813f98f77..c1337f7b2 100644 --- a/app/test/resources/bug1525.expected +++ b/app/test/resources/bug1525.expected @@ -1,27 +1,31 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1525 extends PApplet { public void setup() { if (frameCount > (frameRate - 1)) { println("My head asplode!"); } - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1525" }); + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1525" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug1534.expected b/app/test/resources/bug1534.expected index 2132c573f..1b61ca49c 100644 --- a/app/test/resources/bug1534.expected +++ b/app/test/resources/bug1534.expected @@ -1,25 +1,29 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug1534 extends PApplet { public void setup() { char c = '\"'; - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug1534" }); + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug1534" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug281.expected b/app/test/resources/bug281.expected index aca36a9b3..d6e7f4154 100644 --- a/app/test/resources/bug281.expected +++ b/app/test/resources/bug281.expected @@ -1,28 +1,32 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug281 extends PApplet { public void setup() { -if ( "monopoly".charAt( 3 ) == '(' ) -{ - println("parcheesi"); -} - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug281" }); +if ( "monopoly".charAt( 3 ) == '(' ) +{ + println("parcheesi"); +} + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug281" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug315g.expected b/app/test/resources/bug315g.expected index cba428de7..ef5cdffa6 100644 --- a/app/test/resources/bug315g.expected +++ b/app/test/resources/bug315g.expected @@ -1,18 +1,16 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug315g extends PApplet { public void setup() { @@ -23,9 +21,15 @@ y = 60; int d; d = 80; ellipse(75, y, d, d); - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug315g" }); + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug315g" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug4.expected b/app/test/resources/bug4.expected index a54d206c3..661de7b80 100644 --- a/app/test/resources/bug4.expected +++ b/app/test/resources/bug4.expected @@ -1,26 +1,30 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug4 extends PApplet { public void setup() { int x = 12; float u = (PApplet.parseFloat(x)/width); - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug4" }); + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug4" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug400g.expected b/app/test/resources/bug400g.expected index 3383c22cf..92dc4f577 100644 --- a/app/test/resources/bug400g.expected +++ b/app/test/resources/bug400g.expected @@ -1,18 +1,16 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug400g extends PApplet { @@ -25,7 +23,12 @@ public void setup(){ else{ // Syntax error on token "else", } expected } } - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug400g" }); + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug400g" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug427g.expected b/app/test/resources/bug427g.expected index b02e3d780..aebd13672 100755 --- a/app/test/resources/bug427g.expected +++ b/app/test/resources/bug427g.expected @@ -1,18 +1,16 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug427g extends PApplet { @@ -29,7 +27,12 @@ public class MyClass { } - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug427g" }); + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug427g" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug481.expected b/app/test/resources/bug481.expected index 467881e7a..ef2848da3 100644 --- a/app/test/resources/bug481.expected +++ b/app/test/resources/bug481.expected @@ -1,25 +1,32 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +import java.applet.Applet; + +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 bug481 extends PApplet { public void setup() { -Class[] abc = new Class[]{Applet.class}; - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug481" }); + +Class[] abc = new Class[]{Applet.class}; + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug481" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug481.pde b/app/test/resources/bug481.pde index c9aa594d5..38aead2ad 100644 --- a/app/test/resources/bug481.pde +++ b/app/test/resources/bug481.pde @@ -1 +1,2 @@ +import java.applet.Applet; Class[] abc = new Class[]{Applet.class}; \ No newline at end of file diff --git a/app/test/resources/bug598.expected b/app/test/resources/bug598.expected index 629c172c7..988c1125b 100644 --- a/app/test/resources/bug598.expected +++ b/app/test/resources/bug598.expected @@ -1,54 +1,70 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; import static java.lang.Math.tanh; import java.util.concurrent.Callable; +import java.util.List; +import java.util.Comparator; +import java.util.Map; +import java.util.Collection; +import java.util.Arrays; +import java.util.HashSet; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug598 extends PApplet { -// java 5 torture test - - - - -private static Comparator rotarapmoc = new Comparator() { - public int compare(final String o1, final String o2) - { - return o1.charAt(o1.length() - 1) - o2.charAt(o2.length() - 1); - } -}; - -final void printClass(T t) { - println(t.getClass()); -} -public final List sortem(final String... strings) { - Arrays.sort(strings, rotarapmoc); - return Arrays.asList(strings); -} - -final Map> -charlesDeGaulle = new HashMap>(); - -public void setup() { - charlesDeGaulle.put("banana", new HashSet()); - charlesDeGaulle.get("banana").add(0); - System.out.println(sortem("aztec", "maya", "spanish", "portuguese")); - printClass(12.d); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug598" }); +// java 5 torture test + + + + + + + + + + + +private static Comparator rotarapmoc = new Comparator() { + public int compare(final String o1, final String o2) + { + return o1.charAt(o1.length() - 1) - o2.charAt(o2.length() - 1); + } +}; + +final void printClass(T t) { + println(t.getClass()); +} +public final List sortem(final String... strings) { + Arrays.sort(strings, rotarapmoc); + return Arrays.asList(strings); +} + +final Map> +charlesDeGaulle = new HashMap>(); + +public void setup() { + charlesDeGaulle.put("banana", new HashSet()); + charlesDeGaulle.get("banana").add(0); + System.out.println(sortem("aztec", "maya", "spanish", "portuguese")); + printClass(12.d); +} + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug598" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug598.pde b/app/test/resources/bug598.pde index c8efc6655..e0863d6f9 100644 --- a/app/test/resources/bug598.pde +++ b/app/test/resources/bug598.pde @@ -2,6 +2,13 @@ import static java.lang.Math.tanh; import java.util.concurrent.Callable; +import java.util.List; +import java.util.Comparator; +import java.util.Map; +import java.util.Collection; +import java.util.Arrays; +import java.util.HashSet; + private static Comparator rotarapmoc = new Comparator() { public int compare(final String o1, final String o2) diff --git a/app/test/resources/bug5a.expected b/app/test/resources/bug5a.expected index b5722a425..326bd783e 100644 --- a/app/test/resources/bug5a.expected +++ b/app/test/resources/bug5a.expected @@ -1,26 +1,30 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug5a extends PApplet { public void setup() { -println("The next line should not cause a failure."); -// no newline after me - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug5a" }); +println("The next line should not cause a failure."); +// no newline after me + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug5a" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug5b.expected b/app/test/resources/bug5b.expected index 91a50b045..3731e6723 100644 --- a/app/test/resources/bug5b.expected +++ b/app/test/resources/bug5b.expected @@ -1,26 +1,30 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug5b extends PApplet { public void setup() { -println("The next line should not cause a failure."); -/* no newline after me */ - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug5b" }); +println("The next line should not cause a failure."); +/* no newline after me */ + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug5b" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/resources/bug631.expected b/app/test/resources/bug631.expected index d8f217e6a..ae5c3b7ba 100644 --- a/app/test/resources/bug631.expected +++ b/app/test/resources/bug631.expected @@ -1,18 +1,16 @@ import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; -import java.applet.*; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.MouseEvent; -import java.awt.event.KeyEvent; -import java.awt.event.FocusEvent; -import java.awt.Image; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.zip.*; -import java.util.regex.*; +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 bug631 extends PApplet { public void setup() { @@ -23,9 +21,15 @@ firstLoop: System.out.println(i + " " + j); } } - noLoop(); -} - static public void main(String args[]) { - PApplet.main(new String[] { "--bgcolor=null", "bug631" }); + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "bug631" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } } } diff --git a/app/test/src/test/processing/mode/java/ParserTests.java b/app/test/src/test/processing/mode/java/ParserTests.java index 965b63ac5..eca3de658 100644 --- a/app/test/src/test/processing/mode/java/ParserTests.java +++ b/app/test/src/test/processing/mode/java/ParserTests.java @@ -184,7 +184,7 @@ public class ParserTests { @Test public void bug820() { - expectCompilerException("bug820", "x1 is already defined in setup()", 21); + expectCompilerException("bug820", "error: variable x1 is already defined in method setup()", 18); } @Test @@ -194,7 +194,7 @@ public class ParserTests { @Test public void bug1145() { - expectCompilerException("bug1145", "'.' expected", 4); + expectCompilerException("bug1145", "error: '.' expected", 6); } @Test