Settings: use class constants for properties, create custom writer

- Create Property class for defining config properties
  - Create logic for typed retrival of properties from YAML file
- Add custom save method
  - Retain comments from Comment annotations in the classes
  - Write in a sorted order: first discovered properties are first written to config.yml
- Adjust properties to reflect the current config.yml
- Add sample tests for the retrieval and writing of properties with the new setup

src/test/java/fr/xephi/authme/settings/custom/NewSettingTest.java

@@ -0,0 +1,111 @@
+package fr.xephi.authme.settings.custom;
+
+import fr.xephi.authme.settings.custom.domain.Property;
+import fr.xephi.authme.settings.custom.domain.PropertyType;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
+import static fr.xephi.authme.settings.custom.domain.Property.newProperty;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+
+public class NewSettingTest {
+
+    private static final String CONFIG_FILE = "437-config-test.yml";
+
+    @Test
+    public void shouldReturnIntegerFromFile() {
+        // given
+        YamlConfiguration file = mock(YamlConfiguration.class);
+        Property<Integer> config = TestConfiguration.DURATION_IN_SECONDS;
+        given(file.getInt("test.duration", 4)).willReturn(18);
+        NewSetting settings = new NewSetting(file, "conf.txt");
+
+        // when
+        int retrieve = settings.getOption(config);
+
+        // then
+        assertThat(retrieve, equalTo(18));
+    }
+
+    @Test
+    public void shouldLoadAllConfigs() {
+        // given
+        YamlConfiguration file = mock(YamlConfiguration.class);
+
+        given(file.getString(anyString(), anyString())).willAnswer(new Answer<String>() {
+            @Override
+            public String answer(InvocationOnMock invocation) throws Throwable {
+                // Return the second parameter -> the default
+                return (String) invocation.getArguments()[1];
+            }
+        });
+
+        given(file.getInt(eq(EmailSettings.RECOVERY_PASSWORD_LENGTH.getPath()), anyInt()))
+            .willReturn(20);
+        given(file.getBoolean(eq(SecuritySettings.REMOVE_PASSWORD_FROM_CONSOLE.getPath()), anyBoolean()))
+            .willReturn(false);
+
+        // when
+        NewSetting settings = new NewSetting(file, "conf.txt");
+
+        // then
+        // Expect the value we told the YAML mock to return:
+        assertThat(settings.getOption(EmailSettings.RECOVERY_PASSWORD_LENGTH), equalTo(20));
+        // Expect the default:
+        assertThat(settings.getOption(EmailSettings.SMTP_HOST), equalTo(EmailSettings.SMTP_HOST.getDefaultValue()));
+        // Expect the value we told the YAML mock to return:
+        assertThat(settings.getOption(SecuritySettings.REMOVE_PASSWORD_FROM_CONSOLE), equalTo(false));
+    }
+
+    @Test
+    public void executeIntegrationTest() {
+        // given
+        YamlConfiguration yamlFile = YamlConfiguration.loadConfiguration(getConfigFile());
+        NewSetting settings = new NewSetting(yamlFile, "conf.txt");
+
+        // when
+        int result = settings.getOption(TestConfiguration.DURATION_IN_SECONDS);
+        String systemName = settings.getOption(TestConfiguration.SYSTEM_NAME);
+        String helpHeader = settings.getOption(newProperty("settings.helpHeader", ""));
+        List<String> unsafePasswords = settings.getOption(
+            newProperty(PropertyType.STRING_LIST, "Security.unsafePasswords"));
+
+        // then
+        assertThat(result, equalTo(22));
+        assertThat(systemName, equalTo(TestConfiguration.SYSTEM_NAME.getDefaultValue()));
+        assertThat(helpHeader, equalTo("AuthMeReloaded"));
+        assertThat(unsafePasswords, contains("123456", "qwerty", "54321"));
+    }
+
+    private File getConfigFile() {
+        URL url = getClass().getClassLoader().getResource(CONFIG_FILE);
+        if (url == null) {
+            throw new RuntimeException("File '" + CONFIG_FILE + "' could not be loaded");
+        }
+        return new File(url.getFile());
+    }
+
+    private static class TestConfiguration {
+
+        public static final Property<Integer> DURATION_IN_SECONDS =
+            newProperty("test.duration", 4);
+
+        public static final Property<String> SYSTEM_NAME =
+            newProperty("test.systemName", "[TestDefaultValue]");
+    }
+
+}

src/test/java/fr/xephi/authme/settings/custom/NewSettingsWriteTest.java

@@ -0,0 +1,42 @@
+package fr.xephi.authme.settings.custom;
+
+import org.junit.Test;
+
+import java.io.File;
+import java.net.URL;
+
+import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+/**
+ * Test for the save() function of new settings
+ */
+public class NewSettingsWriteTest {
+
+    private static final String CONFIG_FILE = "437-write-test.yml";
+
+    @Test
+    public void shouldWriteProperties() {
+        File file = getConfigFile();
+        NewSetting setting = new NewSetting(file);
+        setting.save();
+
+        // assert that we can load the file again -- i.e. that it's valid YAML!
+        NewSetting newSetting = new NewSetting(file);
+        assertThat(newSetting.getOption(SecuritySettings.CAPTCHA_LENGTH),
+            equalTo(SecuritySettings.CAPTCHA_LENGTH.getDefaultValue()));
+        assertThat(newSetting.getOption(ProtectionSettings.COUNTRIES_BLACKLIST),
+            equalTo(ProtectionSettings.COUNTRIES_BLACKLIST.getDefaultValue()));
+    }
+
+
+
+    private File getConfigFile() {
+        URL url = getClass().getClassLoader().getResource(CONFIG_FILE);
+        if (url == null) {
+            throw new RuntimeException("File '" + CONFIG_FILE + "' could not be loaded");
+        }
+        return new File(url.getFile());
+    }
+
+}