Skip to content

Commit 8ecef21

Browse files
author
Grant Cahill
committed
Updated the unit tests for ParserTests and the expected input and output for the respective tests to match the current state of Processing.
1 parent a9b0dcb commit 8ecef21

31 files changed

+706
-579
lines changed

‎app/test/resources/annotations.expected‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
import processing.core.*;
2+
import processing.data.*;
3+
import processing.event.*;
4+
import processing.opengl.*;
25

3-
import java.applet.*;
4-
import java.awt.Dimension;
5-
import java.awt.Frame;
6-
import java.awt.event.MouseEvent;
7-
import java.awt.event.KeyEvent;
8-
import java.awt.event.FocusEvent;
9-
import java.awt.Image;
10-
import java.io.*;
11-
import java.net.*;
12-
import java.text.*;
13-
import java.util.*;
14-
import java.util.zip.*;
15-
import java.util.regex.*;
6+
import java.io.Serializable;
7+
8+
import java.util.HashMap;
9+
import java.util.ArrayList;
10+
import java.io.File;
11+
import java.io.BufferedReader;
12+
import java.io.PrintWriter;
13+
import java.io.InputStream;
14+
import java.io.OutputStream;
15+
import java.io.IOException;
1616

1717
public class annotations extends PApplet {
1818

19+
20+
1921
public void setup() {
2022
size(200,200);
2123
}
@@ -40,7 +42,12 @@ class Apple implements Serializable {
4042
comments="Shazam!",
4143
date="2001-07-04T12:08:56.235-0700")
4244
class Pear {}
43-
static public void main(String args[]) {
44-
PApplet.main(new String[] { "--bgcolor=null", "annotations" });
45+
static public void main(String[] passedArgs) {
46+
String[] appletArgs = new String[] { "annotations" };
47+
if (passedArgs != null) {
48+
PApplet.main(concat(appletArgs, passedArgs));
49+
} else {
50+
PApplet.main(appletArgs);
51+
}
4552
}
4653
}

‎app/test/resources/annotations.pde‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import java.io.Serializable;
2+
13
void setup() {
24
size(200,200);
35
}

‎app/test/resources/bug1064.expected‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
import processing.core.*;
2+
import processing.data.*;
3+
import processing.event.*;
4+
import processing.opengl.*;
25

3-
import java.applet.*;
4-
import java.awt.Dimension;
5-
import java.awt.Frame;
6-
import java.awt.event.MouseEvent;
7-
import java.awt.event.KeyEvent;
8-
import java.awt.event.FocusEvent;
9-
import java.awt.Image;
10-
import java.io.*;
11-
import java.net.*;
12-
import java.text.*;
13-
import java.util.*;
14-
import java.util.zip.*;
15-
import java.util.regex.*;
6+
import java.util.HashMap;
7+
import java.util.ArrayList;
8+
import java.io.File;
9+
import java.io.BufferedReader;
10+
import java.io.PrintWriter;
11+
import java.io.InputStream;
12+
import java.io.OutputStream;
13+
import java.io.IOException;
1614

1715
public class bug1064 extends PApplet {
1816
public void setup() {
19-
// import ";
20-
noLoop();
21-
}
22-
static public void main(String args[]) {
23-
PApplet.main(new String[] { "--bgcolor=null", "bug1064" });
17+
// import ";
18+
noLoop();
19+
}
20+
21+
static public void main(String[] passedArgs) {
22+
String[] appletArgs = new String[] { "bug1064" };
23+
if (passedArgs != null) {
24+
PApplet.main(concat(appletArgs, passedArgs));
25+
} else {
26+
PApplet.main(appletArgs);
27+
}
2428
}
2529
}

‎app/test/resources/bug136.expected‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
11
import processing.core.*;
2+
import processing.data.*;
3+
import processing.event.*;
4+
import processing.opengl.*;
25

3-
import java.applet.*;
4-
import java.awt.Dimension;
5-
import java.awt.Frame;
6-
import java.awt.event.MouseEvent;
7-
import java.awt.event.KeyEvent;
8-
import java.awt.event.FocusEvent;
9-
import java.awt.Image;
10-
import java.io.*;
11-
import java.net.*;
12-
import java.text.*;
13-
import java.util.*;
14-
import java.util.zip.*;
15-
import java.util.regex.*;
6+
import java.util.Collections;
7+
8+
import java.util.HashMap;
9+
import java.util.ArrayList;
10+
import java.io.File;
11+
import java.io.BufferedReader;
12+
import java.io.PrintWriter;
13+
import java.io.InputStream;
14+
import java.io.OutputStream;
15+
import java.io.IOException;
1616

1717
public class bug136 extends PApplet {
1818

19-
java.util.List alist = Collections.synchronizedList(new ArrayList());
20-
21-
public void setup() {
22-
size(400, 200);
23-
alist.add("hello");
24-
}
25-
26-
public void draw() {
27-
rect(width/4, height/4, width/2, height/2);
28-
synchronized(alist) {
29-
alist.get(0);
30-
}
31-
}
32-
static public void main(String args[]) {
33-
PApplet.main(new String[] { "--bgcolor=null", "bug136" });
19+
20+
java.util.List alist = Collections.synchronizedList(new ArrayList());
21+
22+
public void setup() {
23+
size(400, 200);
24+
alist.add("hello");
25+
}
26+
27+
public void draw() {
28+
rect(width/4, height/4, width/2, height/2);
29+
synchronized(alist) {
30+
alist.get(0);
31+
}
32+
}
33+
static public void main(String[] passedArgs) {
34+
String[] appletArgs = new String[] { "bug136" };
35+
if (passedArgs != null) {
36+
PApplet.main(concat(appletArgs, passedArgs));
37+
} else {
38+
PApplet.main(appletArgs);
39+
}
3440
}
3541
}

‎app/test/resources/bug136.pde‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import java.util.Collections;
12
java.util.List alist = Collections.synchronizedList(new ArrayList());
23

34
void setup() {

‎app/test/resources/bug1362.expected‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
import processing.core.*;
2+
import processing.data.*;
3+
import processing.event.*;
4+
import processing.opengl.*;
25

3-
import java.applet.*;
4-
import java.awt.Dimension;
5-
import java.awt.Frame;
6-
import java.awt.event.MouseEvent;
7-
import java.awt.event.KeyEvent;
8-
import java.awt.event.FocusEvent;
9-
import java.awt.Image;
10-
import java.io.*;
11-
import java.net.*;
12-
import java.text.*;
13-
import java.util.*;
14-
import java.util.zip.*;
15-
import java.util.regex.*;
6+
import java.util.HashMap;
7+
import java.util.ArrayList;
8+
import java.io.File;
9+
import java.io.BufferedReader;
10+
import java.io.PrintWriter;
11+
import java.io.InputStream;
12+
import java.io.OutputStream;
13+
import java.io.IOException;
1614

1715
public class bug1362 extends PApplet {
1816
public void setup() {
19-
if (true) {} else { new String(); }
20-
noLoop();
21-
}
22-
static public void main(String args[]) {
23-
PApplet.main(new String[] { "--bgcolor=null", "bug1362" });
17+
if (true) {} else { new String(); }
18+
noLoop();
19+
}
20+
21+
static public void main(String[] passedArgs) {
22+
String[] appletArgs = new String[] { "bug1362" };
23+
if (passedArgs != null) {
24+
PApplet.main(concat(appletArgs, passedArgs));
25+
} else {
26+
PApplet.main(appletArgs);
27+
}
2428
}
2529
}

‎app/test/resources/bug1442.expected‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
import processing.core.*;
2+
import processing.data.*;
3+
import processing.event.*;
4+
import processing.opengl.*;
25

3-
import java.applet.*;
4-
import java.awt.Dimension;
5-
import java.awt.Frame;
6-
import java.awt.event.MouseEvent;
7-
import java.awt.event.KeyEvent;
8-
import java.awt.event.FocusEvent;
9-
import java.awt.Image;
10-
import java.io.*;
11-
import java.net.*;
12-
import java.text.*;
13-
import java.util.*;
14-
import java.util.zip.*;
15-
import java.util.regex.*;
6+
import java.util.HashMap;
7+
import java.util.ArrayList;
8+
import java.io.File;
9+
import java.io.BufferedReader;
10+
import java.io.PrintWriter;
11+
import java.io.InputStream;
12+
import java.io.OutputStream;
13+
import java.io.IOException;
1614

1715
public class bug1442 extends PApplet {
1816

19-
public float a() {
20-
return 1.0f;
21-
}
22-
static public void main(String args[]) {
23-
PApplet.main(new String[] { "--bgcolor=null", "bug1442" });
17+
public float a() {
18+
return 1.0f;
19+
}
20+
static public void main(String[] passedArgs) {
21+
String[] appletArgs = new String[] { "bug1442" };
22+
if (passedArgs != null) {
23+
PApplet.main(concat(appletArgs, passedArgs));
24+
} else {
25+
PApplet.main(appletArgs);
26+
}
2427
}
2528
}

‎app/test/resources/bug1511.expected‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
import processing.core.*;
2+
import processing.data.*;
3+
import processing.event.*;
4+
import processing.opengl.*;
25

36
import java.io.StringWriter;
47

5-
import java.applet.*;
6-
import java.awt.Dimension;
7-
import java.awt.Frame;
8-
import java.awt.event.MouseEvent;
9-
import java.awt.event.KeyEvent;
10-
import java.awt.event.FocusEvent;
11-
import java.awt.Image;
12-
import java.io.*;
13-
import java.net.*;
14-
import java.text.*;
15-
import java.util.*;
16-
import java.util.zip.*;
17-
import java.util.regex.*;
8+
import java.util.HashMap;
9+
import java.util.ArrayList;
10+
import java.io.File;
11+
import java.io.BufferedReader;
12+
import java.io.PrintWriter;
13+
import java.io.InputStream;
14+
import java.io.OutputStream;
15+
import java.io.IOException;
1816

1917
public class bug1511 extends PApplet {
2018
public void setup() {
21-
// \u00df
22-
23-
/**
24-
* a
25-
*/
26-
27-
28-
noLoop();
29-
}
30-
static public void main(String args[]) {
31-
PApplet.main(new String[] { "--bgcolor=null", "bug1511" });
19+
// \u00df
20+
21+
/**
22+
* a
23+
*/
24+
25+
26+
noLoop();
27+
}
28+
29+
static public void main(String[] passedArgs) {
30+
String[] appletArgs = new String[] { "bug1511" };
31+
if (passedArgs != null) {
32+
PApplet.main(concat(appletArgs, passedArgs));
33+
} else {
34+
PApplet.main(appletArgs);
35+
}
3236
}
3337
}

‎app/test/resources/bug1512.expected‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
import processing.core.*;
2+
import processing.data.*;
3+
import processing.event.*;
4+
import processing.opengl.*;
25

3-
import java.applet.*;
4-
import java.awt.Dimension;
5-
import java.awt.Frame;
6-
import java.awt.event.MouseEvent;
7-
import java.awt.event.KeyEvent;
8-
import java.awt.event.FocusEvent;
9-
import java.awt.Image;
10-
import java.io.*;
11-
import java.net.*;
12-
import java.text.*;
13-
import java.util.*;
14-
import java.util.zip.*;
15-
import java.util.regex.*;
6+
import java.util.HashMap;
7+
import java.util.ArrayList;
8+
import java.io.File;
9+
import java.io.BufferedReader;
10+
import java.io.PrintWriter;
11+
import java.io.InputStream;
12+
import java.io.OutputStream;
13+
import java.io.IOException;
1614

1715
public class bug1512 extends PApplet {
1816
public void setup() {
19-
println("oi/*");
20-
noLoop();
21-
}
22-
static public void main(String args[]) {
23-
PApplet.main(new String[] { "--bgcolor=null", "bug1512" });
17+
println("oi/*");
18+
noLoop();
19+
}
20+
21+
static public void main(String[] passedArgs) {
22+
String[] appletArgs = new String[] { "bug1512" };
23+
if (passedArgs != null) {
24+
PApplet.main(concat(appletArgs, passedArgs));
25+
} else {
26+
PApplet.main(appletArgs);
27+
}
2428
}
2529
}

0 commit comments

Comments
 (0)