diff --git a/java/test/processing/mode/java/ParserTests.java b/java/test/processing/mode/java/ParserTests.java index 34e8add92..dfc184a25 100644 --- a/java/test/processing/mode/java/ParserTests.java +++ b/java/test/processing/mode/java/ParserTests.java @@ -385,4 +385,9 @@ public class ParserTests { expectGood("smoothparamstatic"); } + @Test + public void testColorInImport() { + expectGood("colorimport"); + } + } diff --git a/java/test/resources/colorimport.expected b/java/test/resources/colorimport.expected new file mode 100644 index 000000000..97c801b27 --- /dev/null +++ b/java/test/resources/colorimport.expected @@ -0,0 +1,34 @@ +import processing.core.*; +import processing.data.*; +import processing.event.*; +import processing.opengl.*; + +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; + +import test.color; + +public class colorimport extends PApplet { + + public void setup() { +boolean test = true; +int c1 = color(255, 255, 255); +int c2 = test ? 0xFFA011CD : 0xC0C0C0C0; + noLoop(); + } + + static public void main(String[] passedArgs) { + String[] appletArgs = new String[] { "color" }; + if (passedArgs != null) { + PApplet.main(concat(appletArgs, passedArgs)); + } else { + PApplet.main(appletArgs); + } + } +} diff --git a/java/test/resources/colorimport.pde b/java/test/resources/colorimport.pde new file mode 100644 index 000000000..2da84c3a1 --- /dev/null +++ b/java/test/resources/colorimport.pde @@ -0,0 +1,5 @@ +import test.color; + +boolean test = true; +color c1 = color(255, 255, 255); +color c2 = test ? #A011CD : #C0C0C0C0;