Fix for #474, handle invalid enum in the ini file.

Also added tests.

Author: SimonC4

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

@@ -17,6 +17,7 @@
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
+import com.google.common.base.Enums;
 import org.destinationsol.menu.Resolution;
 import org.destinationsol.menu.ResolutionProvider;
 
@@ -185,7 +186,7 @@ public GameOptions(boolean mobile, SolFileReader solFileReader) {
         x = reader.getInt("x", 1366);
         y = reader.getInt("y", 768);
         fullscreen = reader.getBoolean("fullscreen", false);
-        controlType = mobile ? ControlType.KEYBOARD : ControlType.valueOf(reader.getString("controlType", "MIXED"));
+        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"));
         keyUpMouseName = reader.getString("keyUpMouse", DEFAULT_MOUSE_UP);

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

@@ -15,6 +15,7 @@
  */
 package org.destinationsol;
 
+import com.google.common.base.Enums;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -52,6 +53,8 @@ public void initIniReader() {
                         "anotherFloatKey = 7.3f\n" +
                         "invalidFloatKey = 8,6\n" +
                         "anotherInvalidFloatKey = hi\n" +
+                        "enumInvalid = 1\n" +
+                        "enumValid = KEYBOARD\n" +
                         "UnicodeKey çáč🧝 = unicodevalue áśǵj́ḱĺóí⋄«»⋄⋄ǫő";
         iniReader = new IniReader(new BufferedReader(new StringReader(iniFileContents)));
     }
@@ -102,5 +105,19 @@ public void testGetFloat() {
         assertTrue(Float.compare(iniReader.getFloat("anotherInvalidFloatKey", 7.8f), 7.8f) == 0);
     }
 
+    @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);
+
+        // 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);
+
+        // 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);
+    }
+
     //TODO ADD MOAR TESTS
 }