Allow for emulated Preferences in testing.

sampottinger · sampottinger · commit 2e3f573ef87d · 2020-06-29T14:42:39.000-07:00
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
@@ -129,6 +129,14 @@ static public void init() {
   }
 
 
+  /**
+   * For testing, pretend to load preferences without a real file.
+   */
+  static public void skipInit() {
+    initalized = true;
+  }
+
+
   static void handleProxy(String protocol, String hostProp, String portProp) {
     String proxyHost = get("proxy." + protocol + ".host");
     String proxyPort = get("proxy." + protocol + ".port");
diff --git a/java/test/processing/mode/java/ProcessingTestUtil.java b/java/test/processing/mode/java/ProcessingTestUtil.java
@@ -17,7 +17,7 @@ public class ProcessingTestUtil {
   static void init() {
     // noop; just causes class to be loaded
   }
-  
+
   private static final String RESOURCES = "test/resources/";
   private static final String RESOURCES_UP_DIR = "../java/test/resources";
   static final UTCompiler COMPILER;
@@ -64,9 +64,10 @@ static String preprocess(final String name, final File resource, Optional<String
 
     return normalize(out);
   }
-  
+
   static String format(final File resource)
   {
+    Preferences.skipInit();
     return format(read(resource));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class ProcessingTestUtil {`
`17`	`17`	`static void init() {`
`18`	`18`	`// noop; just causes class to be loaded`
`19`	`19`	`}`
`20`		`-`
	`20`	`+`
`21`	`21`	`private static final String RESOURCES = "test/resources/";`
`22`	`22`	`private static final String RESOURCES_UP_DIR = "../java/test/resources";`
`23`	`23`	`static final UTCompiler COMPILER;`
`@@ -64,9 +64,10 @@ static String preprocess(final String name, final File resource, Optional<String`
`64`	`64`
`65`	`65`	`return normalize(out);`
`66`	`66`	`}`
`67`		`-`
	`67`	`+`
`68`	`68`	`static String format(final File resource)`
`69`	`69`	`{`
	`70`	`+ Preferences.skipInit();`
`70`	`71`	`return format(read(resource));`
`71`	`72`	`}`
`72`	`73`