Issue #316 -- Added unit test to ensure search directory changes are adequately updated in the future, and upped JVM compliance level to 1.7 since we already decided that 1.6 is more than defunct.

Author: xeno6696

src/main/java/org/owasp/esapi/reference/DefaultSecurityConfiguration.java

@@ -642,36 +642,36 @@ private Properties loadConfigurationFromClasspath(String fileName) throws Illega
 				try {
 					// try root
 					String currentClasspathSearchLocation = "/ (root)";
-					in = loaders[i].getResourceAsStream(fileName);
+					in = loaders[i].getResourceAsStream(DefaultSearchPath.ROOT.toString());
 
 					// try resourceDirectory folder
 					if (in == null) {
 						currentClasspathSearchLocation = resourceDirectory + "/";
-						in = currentLoader.getResourceAsStream(resourceDirectory + "/" + fileName);
+						in = currentLoader.getResourceAsStream(DefaultSearchPath.RESOURCE_DIRECTORY + fileName);
 					}
 
 					// try .esapi folder. Look here first for backward compatibility.
 					if (in == null) {
 						currentClasspathSearchLocation = ".esapi/";
-						in = currentLoader.getResourceAsStream(".esapi/" + fileName);
+						in = currentLoader.getResourceAsStream(DefaultSearchPath.DOT_ESAPI + fileName);
 					} 
 
 					// try esapi folder (new directory)
 					if (in == null) {
 						currentClasspathSearchLocation = "esapi/";
-						in = currentLoader.getResourceAsStream("esapi/" + fileName);
+						in = currentLoader.getResourceAsStream(DefaultSearchPath.ESAPI + fileName);
 					} 
 
 					// try resources folder
 					if (in == null) {
 						currentClasspathSearchLocation = "resources/";
-						in = currentLoader.getResourceAsStream("resources/" + fileName);
+						in = currentLoader.getResourceAsStream(DefaultSearchPath.RESOURCES + fileName);
 					}
 
 					// try src/main/resources folder
 					if (in == null) {
 						currentClasspathSearchLocation = "src/main/resources/";
-						in = currentLoader.getResourceAsStream("src/main/resources/" + fileName);
+						in = currentLoader.getResourceAsStream(DefaultSearchPath.SRC_MAIN_RESOURCES + fileName);
 					}
 
 					// now load the properties
@@ -1347,4 +1347,26 @@ protected boolean shouldPrintProperties() {
     protected Properties getESAPIProperties() {
         return properties;
     }
+    
+    public enum DefaultSearchPath {
+    	
+    	RESOURCE_DIRECTORY("resourceDirectory/"),
+    	SRC_MAIN_RESOURCES("src/main/resources/"),
+    	ROOT("/"),
+    	DOT_ESAPI(".esapi/"),
+    	ESAPI("esapi/"),
+    	RESOURCES("resources/");
+    	
+    	private final String path;
+    	
+
+    	
+    	private DefaultSearchPath(String s){
+    		this.path = s;
+    	}
+    	
+    	public String value(){
+    		return path;
+    	}
+    }
 }

src/test/java/org/owasp/esapi/reference/DefaultSecurityConfigurationTest.java

@@ -13,6 +13,7 @@
 import org.owasp.esapi.ESAPI;
 import org.owasp.esapi.Logger;
 import org.owasp.esapi.errors.ConfigurationException;
+import org.owasp.esapi.reference.DefaultSecurityConfiguration.DefaultSearchPath;
 
 public class DefaultSecurityConfigurationTest {
 
@@ -420,4 +421,20 @@ public void testValidationsPropertiesFileOptions(){
 		assertEquals(patternOrNull(secConf.getValidationPattern("TestC")), "ValueFromCommaFile");
 	}
 
+	@Test 
+	public void DefaultSearchPathTest(){
+		assertEquals("/", DefaultSearchPath.ROOT.value());
+		assertEquals("resourceDirectory/", DefaultSearchPath.RESOURCE_DIRECTORY.value());
+		assertEquals(".esapi/", DefaultSearchPath.DOT_ESAPI.value());
+		assertEquals("esapi/", DefaultSearchPath.ESAPI.value());
+		assertEquals("resources/", DefaultSearchPath.RESOURCES.value());
+		assertEquals("src/main/resources/", DefaultSearchPath.SRC_MAIN_RESOURCES.value());
+	}
+	
+	@Test
+	public void DefaultSearchPathEnumChanges(){
+		int expected = 6;
+		int testValue = DefaultSearchPath.values().length;
+		assertEquals(expected, testValue);
+	}
 }