ACRParameterLoaderHelper Test Updates

Created a private constructor in implementation to prevent utility class
instances.

Moved test-scope key format into class instance. Updated uses.

Moved test-scoped time format into class instances.  Updated uses.

Author: jeremiahjstacey

src/main/java/org/owasp/esapi/reference/accesscontrol/policyloader/ACRParameterLoaderHelper.java

@@ -4,9 +4,14 @@
 
 final public class ACRParameterLoaderHelper {
 
+    protected static String DEFAULT_KEY_FORMAT = "AccessControlRules.AccessControlRule(%s).Parameters.Parameter(%s)[@value]";
+    protected static String TIME_FORMAT = "h:mm a";
+    
+    
+    private ACRParameterLoaderHelper() { /* NO-OP Utility Ctr.*/ }
+    
     public static Object getParameterValue(XMLConfiguration config, int currentRule, int currentParameter, String parameterType) throws Exception {
-        String key = "AccessControlRules.AccessControlRule(" +
-            currentRule + ").Parameters.Parameter(" + currentParameter + ")[@value]";
+        String key = String.format(DEFAULT_KEY_FORMAT,  currentRule, currentParameter);
         Object parameterValue;
         if("String".equalsIgnoreCase(parameterType)) {
             parameterValue = config.getString(key);
@@ -31,7 +36,7 @@ public static Object getParameterValue(XMLConfiguration config, int currentRule,
         } else if("Date".equalsIgnoreCase(parameterType)){
             parameterValue = java.text.DateFormat.getDateInstance().parse(config.getString(key));
         } else if("Time".equalsIgnoreCase(parameterType)){
-            java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("h:mm a");
+            java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(TIME_FORMAT);
             parameterValue = sdf.parseObject(config.getString(key));
 //            parameterValue = java.text.DateFormat.getTimeInstance().parse(config.getString(key));
         }

src/test/java/org/owasp/esapi/reference/accesscontrol/policyloader/ACRParameterLoaderHelperTest.java

@@ -13,7 +13,7 @@
 import org.mockito.Mockito;
 
 public class ACRParameterLoaderHelperTest {
-   private static String DEFAULT_KEY_FORMAT = "AccessControlRules.AccessControlRule(%s).Parameters.Parameter(%s)[@value]";
+   
 
    XMLConfiguration config = Mockito.spy(XMLConfiguration.class);
 
@@ -26,7 +26,7 @@ public void buildUniqueKey () {
        // Assembling a unique key each test verifies that the delegate calls are getting the expected values from the test calls.
        randomRuleIndex = Math.abs(new Random().nextInt() % 100);
        randomParameterIndex = Math.abs(new Random().nextInt() % 100);
-       randomTestKey = String.format(DEFAULT_KEY_FORMAT, randomRuleIndex, randomParameterIndex);
+       randomTestKey = String.format(ACRParameterLoaderHelper.DEFAULT_KEY_FORMAT, randomRuleIndex, randomParameterIndex);
    }
 
 
@@ -121,13 +121,12 @@ public void testDateParam_lowercaseType() throws Exception {
 
    @Test
    public void testTimeParam_lowercaseType() throws Exception {
-       String atime = new java.text.SimpleDateFormat("h:mm a").format(new Date());
+       String atime = new java.text.SimpleDateFormat(ACRParameterLoaderHelper.TIME_FORMAT).format(new Date());
        Mockito.doReturn(atime).when(config).getString(eq(randomTestKey));
        ACRParameterLoaderHelper.getParameterValue(config, randomRuleIndex, randomParameterIndex, "time".toLowerCase());
        Mockito.verify(config, Mockito.times(1)).getString(randomTestKey);
    }
 
-   // ------------
 
    @Test
    public void testStringParam_uppercaseType() throws Exception {
@@ -220,7 +219,7 @@ public void testDateParam_uppercaseType() throws Exception {
 
    @Test
    public void testTimeParam_uppercaseType() throws Exception {
-       String atime = new java.text.SimpleDateFormat("h:mm a").format(new Date());
+       String atime = new java.text.SimpleDateFormat(ACRParameterLoaderHelper.TIME_FORMAT).format(new Date());
        Mockito.doReturn(atime).when(config).getString(eq(randomTestKey));
        ACRParameterLoaderHelper.getParameterValue(config, randomRuleIndex, randomParameterIndex, "time".toUpperCase());
        Mockito.verify(config, Mockito.times(1)).getString(randomTestKey);