EventTypeSupplier Improvement

Improving null handling by defaulting a null constructor parameter to
Logger.EVENT_UNSPECIFIED. This then prevents the get() call from ever
returning an empty String.  Test case updated to be parameterized and
validates each of the define EventType cases, along with the null
EventType case.

Author: jeremiahjstacey

src/main/java/org/owasp/esapi/logging/appender/EventTypeLogSupplier.java

@@ -17,6 +17,7 @@
 
 import java.util.function.Supplier;
 
+import org.owasp.esapi.Logger;
 import org.owasp.esapi.Logger.EventType;
 
 /**
@@ -34,11 +35,11 @@ public class EventTypeLogSupplier implements Supplier<String> {
      * @param evtyp EventType reference to supply log representation for
      */
     public EventTypeLogSupplier(EventType evtyp) {
-        this.eventType = evtyp;
+        this.eventType = evtyp == null ? Logger.EVENT_UNSPECIFIED : evtyp;
     }
 
     @Override
     public String get() {
-        return eventType == null ? "" : eventType.toString();
+        return eventType.toString();
     }
 }

src/test/java/org/owasp/esapi/logging/appender/EventTypeLogSupplierTest.java

@@ -2,25 +2,45 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 import org.owasp.esapi.Logger;
 import org.owasp.esapi.Logger.EventType;
 
+@RunWith(Parameterized.class)
 public class EventTypeLogSupplierTest {
 
+    @Parameters (name="{0} -> {1}")
+    public static Collection<Object[]> assembleTests() {
+        List<Object[]> paramSets = new ArrayList<>();
+        paramSets.add(new Object[] {Logger.EVENT_FAILURE,Logger.EVENT_FAILURE.toString()});
+        paramSets.add(new Object[] {Logger.EVENT_SUCCESS,Logger.EVENT_SUCCESS.toString()});
+        paramSets.add(new Object[] {Logger.EVENT_UNSPECIFIED,Logger.EVENT_UNSPECIFIED.toString()});
+        paramSets.add(new Object[] {Logger.SECURITY_AUDIT,Logger.SECURITY_AUDIT.toString()});
+        paramSets.add(new Object[] {Logger.SECURITY_FAILURE,Logger.SECURITY_FAILURE.toString()});
+        paramSets.add(new Object[] {Logger.SECURITY_SUCCESS,Logger.SECURITY_SUCCESS.toString()});
+        paramSets.add(new Object[] {null, Logger.EVENT_UNSPECIFIED.toString()});
+        
+        return paramSets;
+    }
+    
+    private final EventType eventType;
+    private final String expectedResult;
+    
+    public EventTypeLogSupplierTest(EventType eventType, String result) {
+        this.eventType = eventType;
+        this.expectedResult = result;
+    }
 	@Test
 	public void testEventTypeLog() {
-		EventType eventType = Logger.EVENT_UNSPECIFIED;
 		EventTypeLogSupplier supplier = new EventTypeLogSupplier(eventType);
-		
-		assertEquals(eventType.toString(), supplier.get());
+		assertEquals(expectedResult, supplier.get());
 	}
 
-	@Test
-	public void testNullEventTypeLog() {
-		
-		EventTypeLogSupplier supplier = new EventTypeLogSupplier(null);
-		
-		assertEquals("", supplier.get());
-	}
 }