Add unit tests; fix identified issues

Author: sbabcoc

src/main/java/com/nordstrom/common/file/OSUtils.java

@@ -58,6 +58,18 @@ public T getType() {
         return null;
     }
 
+    /**
+     * Add the specified mapping to the collection.<br>
+     * <b>NOTE</b>: If a mapping for the specified constant already exists, this mapping will be replaced.
+     * 
+     * @param typeConst OS type constant
+     * @return value of previous mapping; 'null' if no mapping existed
+     */
+    @SuppressWarnings("unchecked")
+    public <U extends Enum<U> & OSProps> String put(U typeConst) {
+        return typeMap.put((T) typeConst, typeConst.pattern());
+    }
+    
     /**
      * Add the specified mapping to the collection.<br>
      * <b>NOTE</b>: If a mapping for the specified constant already exists, this mapping will be replaced.
@@ -66,8 +78,9 @@ public T getType() {
      * @param pattern OS name match pattern
      * @return value of previous mapping; 'null' if no mapping existed
      */
-    public String put(T typeConst, String pattern) {
-        return typeMap.put(typeConst, pattern);
+    @SuppressWarnings("unchecked")
+    public <U extends Enum<U> & OSProps> String put(U typeConst, String pattern) {
+        return typeMap.put((T) typeConst, pattern);
     }
 
     /**
@@ -76,9 +89,9 @@ public String put(T typeConst, String pattern) {
      * 
      * @param enumClass operating system mapping enumeration
      */
-    public void putAll(Class<T> enumClass) {
-        for (T typeConst : enumClass.getEnumConstants()) {
-            typeMap.put(typeConst, typeConst.pattern());
+    public <U extends Enum<U> & OSProps> void putAll(Class<U> enumClass) {
+        for (U typeConst : enumClass.getEnumConstants()) {
+            put(typeConst);
         }
     }
 

src/test/java/com/nordstrom/common/file/OSUtilsTest.java

@@ -1,18 +1,65 @@
 package com.nordstrom.common.file;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
 import org.testng.annotations.Test;
 
+import com.nordstrom.common.file.OSUtils.OSProps;
 import com.nordstrom.common.file.OSUtils.OSType;
 
 public class OSUtilsTest {
 
+    private static String osName = System.getProperty("os.name").toLowerCase();
+    
     @Test
-    public void testDefault() {
+    public void testDefaultMapping() {
         OSUtils<OSType> osUtils = OSUtils.getDefault();
-        System.out.println(osUtils.getType());
-        System.out.println(OSUtils.osName());
-        System.out.println(OSUtils.version());
-        System.out.println(OSUtils.arch());
+        OSType expected = (osName.startsWith("windows")) ? OSType.WINDOWS : OSType.UNIX;
+        assertEquals(osUtils.getType(), expected, "Reported OS type doesn't match expected type");
+    }
+    
+    @Test
+    public void testCustomMapping() {
+        OSUtils<TestEnum> osUtils = new OSUtils<>(TestEnum.class);
+        assertEquals(osUtils.getType(), TestEnum.TEST, "Reported OS type doesn't match expected type");
+    }
+    
+    @Test
+    public void testAddOneMapping() {
+        OSUtils<OSType> osUtils = OSUtils.getDefault();
+        osUtils.put(TestEnum.TEST);
+        assertEquals(osUtils.getType(), TestEnum.TEST, "Reported OS type doesn't match expected type");
+    }
+    
+    @Test
+    public void testAddMappingSet() {
+        OSUtils<OSType> osUtils = OSUtils.getDefault();
+        osUtils.putAll(TestEnum.class);
+        assertEquals(osUtils.getType(), TestEnum.TEST, "Reported OS type doesn't match expected type");
+    }
+    
+    @Test
+    public void testOverrideMapping() {
+        OSUtils<OSType> osUtils = OSUtils.getDefault();
+        osUtils.put(OSType.SOLARIS, "(?i)" + osName);
+        assertEquals(osUtils.getType(), OSType.SOLARIS, "Reported OS type doesn't match expected type");
+    }
+    
+    @Test
+    public void testUnsupportedType() {
+        OSUtils<OSType> osUtils = OSUtils.getDefault();
+        osUtils.put(osUtils.getType(), "");
+        assertNull(osUtils.getType(), "Reported OS type doesn't match expected type");
+    }
+    
+    public enum TestEnum implements OSProps {
+        TEST;
+        
+        @Override
+        public String pattern() {
+            return "(?i)" + osName;
+        }
+        
     }
-
 }