Handle invalid ini values for Volum.

Also fixed up tests and added a couple more.

Author: SimonC4

engine/src/main/java/org/destinationsol/GameOptions.java

@@ -187,8 +187,8 @@ public GameOptions(boolean mobile, SolFileReader solFileReader) {
         y = reader.getInt("y", 768);
         fullscreen = reader.getBoolean("fullscreen", false);
         controlType = mobile ? ControlType.KEYBOARD : Enums.getIfPresent(ControlType.class,  reader.getString("controlType", "MIXED")).or(ControlType.MIXED);
-        sfxVolume = Volume.valueOf(reader.getString("sfxVolume", "MAX"));
-        musicVolume = Volume.valueOf(reader.getString("musicVolume", "MAX"));
+        sfxVolume = Enums.getIfPresent(Volume.class, reader.getString("sfxVolume", "MAX")).or(Volume.MAX);
+        musicVolume = Enums.getIfPresent(Volume.class, reader.getString("musicVolume", "MAX")).or(Volume.MAX);
         keyUpMouseName = reader.getString("keyUpMouse", DEFAULT_MOUSE_UP);
         keyDownMouseName = reader.getString("keyDownMouse", DEFAULT_MOUSE_DOWN);
         keyUpName = reader.getString("keyUp", DEFAULT_UP);

engine/src/test/java/org/destinationsol/IniReaderTest.java

@@ -49,11 +49,13 @@ public void initIniReader() {
                         "intKey = 5\n" +
                         "invalidIntKey = 3.4\n" +
                         "anotherInvalidIntKey = two\n" +
+                        "blankIntKey = \n" +
                         "floatKey = 6\n" +
                         "anotherFloatKey = 7.3f\n" +
                         "invalidFloatKey = 8,6\n" +
                         "anotherInvalidFloatKey = hi\n" +
                         "enumInvalid = 1\n" +
+                        "enumEmpty =\n" +
                         "enumValid = KEYBOARD\n" +
                         "UnicodeKey çáč🧝 = unicodevalue áśǵj́ḱĺóí⋄«»⋄⋄ǫő";
         iniReader = new IniReader(new BufferedReader(new StringReader(iniFileContents)));
@@ -82,6 +84,7 @@ public void testGetInt() {
         assertEquals(iniReader.getInt("intKey", 0), 5);
         assertEquals(iniReader.getInt("invalidIntKey", 56), 56);
         assertEquals(iniReader.getInt("anotherInvalidIntKey", 57), 57);
+        assertEquals(iniReader.getInt("blankIntKey", 58), 58);
     }
 
     @Test
@@ -108,16 +111,16 @@ public void testGetFloat() {
     @Test
     public void testEnums() {
         // When no value exists in the file, use the defaultValue in getString.
-        assertEquals(Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumDefault", "MIXED")).or(GameOptions.ControlType.KEYBOARD), GameOptions.ControlType.MIXED);
-        assertEquals(Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumDefault", "MIXED")).or(GameOptions.ControlType.MIXED), GameOptions.ControlType.MIXED);
+        assertEquals(GameOptions.ControlType.MIXED, Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumDefault", "MIXED")).or(GameOptions.ControlType.KEYBOARD));
+        assertEquals(GameOptions.ControlType.MIXED, Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumDefault", "MIXED")).or(GameOptions.ControlType.MIXED));
+        assertEquals(GameOptions.ControlType.KEYBOARD, Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumEmpty", "KEYBOARD")).or(GameOptions.ControlType.MIXED));
 
         // When the value in the file isn't a valid enum, use the default value in getIfPresent
-        assertEquals(Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumInvalid", "KEYBOARD")).or(GameOptions.ControlType.MIXED), GameOptions.ControlType.MIXED);
-        assertEquals(Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumInvalid", "MIXED")).or(GameOptions.ControlType.MIXED), GameOptions.ControlType.MIXED);
+        assertEquals(GameOptions.ControlType.MIXED, Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumInvalid", "KEYBOARD")).or(GameOptions.ControlType.MIXED));
+        assertEquals(GameOptions.ControlType.MIXED, Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumInvalid", "MIXED")).or(GameOptions.ControlType.MIXED));
 
         // When the value is in the file, use that value regardless of the default values.
-        assertEquals(Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumValid", "MIXED")).or(GameOptions.ControlType.MIXED), GameOptions.ControlType.KEYBOARD);
+        assertEquals(GameOptions.ControlType.KEYBOARD, Enums.getIfPresent(GameOptions.ControlType.class,  iniReader.getString("enumValid", "MIXED")).or(GameOptions.ControlType.MIXED));
     }
 
-    //TODO ADD MOAR TESTS
 }