Found a better way to load prefs in UTs

jdf · jdf · commit f49907305570 · 2010-03-17T17:29:24.000Z
diff --git a/app/ParserTests.launch b/app/ParserTests.launch
@@ -16,5 +16,4 @@
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="test.processing.parsing.ParserTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="processing-app"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\Documents and Settings\Administrator\Desktop\processing\svn\processing\build\windows\work"/>
 </launchConfiguration>
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
@@ -592,7 +592,7 @@ protected void showFrame(Editor editor) {
   // .................................................................
 
 
-  static protected void load(InputStream input) throws IOException {
+  static public void load(InputStream input) throws IOException {
     String[] lines = PApplet.loadStrings(input);  // Reads as UTF-8
     for (String line : lines) {
       if ((line.length() == 0) ||
diff --git a/app/test/resources/preferences.txt b/app/test/resources/preferences.txt
@@ -0,0 +1,24 @@
+# unit test prefs
+
+preproc.save_build_files=false
+
+# preprocessor: pde.g
+preproc.color_datatype = true
+preproc.web_colors = true
+preproc.enhanced_casting = true
+
+# preprocessor: PdeEmitter.java
+preproc.substitute_floats = true
+#preproc.substitute_image = false
+#preproc.substitute_font = false
+
+# auto-convert non-ascii chars to unicode escape sequences
+preproc.substitute_unicode = true
+
+# PdePreproc.java
+# writes out the parse tree as parseTree.xml, which can be usefully
+# viewed in (at least) Mozilla or IE.  useful when debugging the preprocessor.
+preproc.output_parse_tree = false
+
+# Changed after 1.0.9 to a new name, and also includes the specific entries
+preproc.imports.list = java.applet.*,java.awt.Dimension,java.awt.Frame,java.awt.event.MouseEvent,java.awt.event.KeyEvent,java.awt.event.FocusEvent,java.awt.Image,java.io.*,java.net.*,java.text.*,java.util.*,java.util.zip.*,java.util.regex.*
diff --git a/app/test/src/test/processing/parsing/ParserTests.java b/app/test/src/test/processing/parsing/ParserTests.java
@@ -3,6 +3,8 @@
 import static org.junit.Assert.fail;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import org.junit.BeforeClass;
@@ -15,16 +17,21 @@
 
 public class ParserTests {
 
+  private static final String RESOURCES = "test/resources/";
+  
+  private static File res(final String resourceName)
+  {
+    return new File(RESOURCES,resourceName);
+  }
+  
   @BeforeClass
-  static public void initPrefs() {
-    System.err.println("Initializing prefs");
-    Base.initPlatform();
-    Preferences.init(null);
+  static public void initPrefs() throws Exception {
+    Preferences.load(new FileInputStream(res("preferences.txt")));
   }
 
-  static String read(final String path) {
+  static String read(final File f) {
     try {
-      final FileInputStream fin = new FileInputStream(path);
+      final FileInputStream fin = new FileInputStream(f);
       final InputStreamReader in = new InputStreamReader(fin, "UTF-8");
       try {
         final StringBuilder sb = new StringBuilder();
@@ -43,7 +50,7 @@ static String read(final String path) {
 
   static String preprocess(final String resource) throws RunnerException,
       ANTLRException {
-    final String program = read("../../../app/test/resources/" + resource);
+    final String program = read(res(resource));
     final StringWriter out = new StringWriter();
     new PdePreprocessor(resource, 4).write(out, program);
     return out.toString();
