#457 Improve ForceFlatToSqlite conversion

- Change ForceFlatToSqlite converter to use a generic datasource destination (i.e. can be used for Flat2MySQL later)
- Add tests, including for FlatFile
- Check that user is not present in destination datasource before adding
- Persist last location from flatfile as well

src/test/java/fr/xephi/authme/AuthMeMatchers.java

@@ -1,4 +1,4 @@
-package fr.xephi.authme.datasource;
+package fr.xephi.authme;
 
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.security.crypts.HashedPassword;

src/test/java/fr/xephi/authme/converter/ForceFlatToSqliteTest.java

@@ -0,0 +1,72 @@
+package fr.xephi.authme.converter;
+
+import com.google.common.io.Files;
+import fr.xephi.authme.ConsoleLoggerTestInitializer;
+import fr.xephi.authme.TestHelper;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.datasource.FlatFile;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.mockito.ArgumentCaptor;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import static fr.xephi.authme.AuthMeMatchers.hasAuthBasicData;
+import static fr.xephi.authme.AuthMeMatchers.hasAuthLocation;
+import static org.hamcrest.Matchers.hasItem;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Test for {@link ForceFlatToSqlite}.
+ */
+public class ForceFlatToSqliteTest {
+
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+    private FlatFile flatFile;
+
+    @BeforeClass
+    public static void setup() {
+        ConsoleLoggerTestInitializer.setupLogger();
+    }
+
+    @Before
+    public void copyFile() throws IOException {
+        File source = TestHelper.getJarFile("/datasource-integration/flatfile-test.txt");
+        File destination = temporaryFolder.newFile();
+        Files.copy(source, destination);
+        flatFile = new FlatFile(destination);
+    }
+
+    @Test
+    public void shouldConvertToSqlite() {
+        // given
+        DataSource dataSource = mock(DataSource.class);
+        ForceFlatToSqlite converter = new ForceFlatToSqlite(flatFile, dataSource);
+
+        // when
+        converter.run();
+
+        // then
+        ArgumentCaptor<PlayerAuth> authCaptor = ArgumentCaptor.forClass(PlayerAuth.class);
+        verify(dataSource, times(7)).saveAuth(authCaptor.capture());
+        List<PlayerAuth> auths = authCaptor.getAllValues();
+        assertThat(auths, hasItem(hasAuthBasicData("bobby", "Bobby", "your@email.com", "123.45.67.89")));
+        assertThat(auths, hasItem(hasAuthLocation(1.05, 2.1, 4.2, "world")));
+        assertThat(auths, hasItem(hasAuthBasicData("user", "user", "user@example.org", "34.56.78.90")));
+        assertThat(auths, hasItem(hasAuthLocation(124.1, 76.3, -127.8, "nether")));
+        assertThat(auths, hasItem(hasAuthBasicData("eightfields", "eightFields", "your@email.com", "6.6.6.66")));
+        assertThat(auths, hasItem(hasAuthLocation(8.8, 17.6, 26.4, "eightworld")));
+    }
+
+}

src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java

@@ -7,9 +7,9 @@ import org.junit.Test;
 import java.util.Arrays;
 import java.util.List;
 
-import static fr.xephi.authme.datasource.AuthMeMatchers.equalToHash;
-import static fr.xephi.authme.datasource.AuthMeMatchers.hasAuthBasicData;
-import static fr.xephi.authme.datasource.AuthMeMatchers.hasAuthLocation;
+import static fr.xephi.authme.AuthMeMatchers.equalToHash;
+import static fr.xephi.authme.AuthMeMatchers.hasAuthBasicData;
+import static fr.xephi.authme.AuthMeMatchers.hasAuthLocation;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
@@ -129,15 +129,9 @@ public abstract class AbstractDataSourceIntegrationTest {
         // then
         assertThat(response, equalTo(true));
         assertThat(authList, hasSize(2));
+        assertThat(authList, hasItem(hasAuthBasicData("bobby", "Bobby", "your@email.com", "123.45.67.89")));
         assertThat(newAuthList, hasSize(3));
-        boolean hasBobby = false;
-        for (PlayerAuth auth : authList) {
-            if (auth.getNickname().equals("bobby")) {
-                hasBobby = true;
-                break;
-            }
-        }
-        assertThat(hasBobby, equalTo(true));
+        assertThat(newAuthList, hasItem(hasAuthBasicData("bobby", "Bobby", "your@email.com", "123.45.67.89")));
     }
 
     @Test

src/test/java/fr/xephi/authme/datasource/FlatFileIntegrationTest.java

@@ -0,0 +1,100 @@
+package fr.xephi.authme.datasource;
+
+import com.google.common.io.Files;
+import fr.xephi.authme.TestHelper;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import static fr.xephi.authme.AuthMeMatchers.equalToHash;
+import static fr.xephi.authme.AuthMeMatchers.hasAuthBasicData;
+import static fr.xephi.authme.AuthMeMatchers.hasAuthLocation;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Integration test for the deprecated {@link FlatFile} datasource. The flatfile datasource is no longer used.
+ * Essentially, the only time we use it is in {@link fr.xephi.authme.converter.ForceFlatToSqlite},
+ * which requires {@link FlatFile#getAllAuths()}.
+ */
+public class FlatFileIntegrationTest {
+
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+    private DataSource dataSource;
+
+    @Before
+    public void copyFileToTemporaryFolder() throws IOException {
+        File originalFile = TestHelper.getJarFile("/datasource-integration/flatfile-test.txt");
+        File copy = temporaryFolder.newFile();
+        Files.copy(originalFile, copy);
+        dataSource = new FlatFile(copy);
+    }
+
+    @Test
+    public void shouldReturnIfAuthIsAvailableOrNot() {
+        // given / when
+        boolean isBobbyAvailable = dataSource.isAuthAvailable("bobby");
+        boolean isChrisAvailable = dataSource.isAuthAvailable("chris");
+        boolean isUserAvailable = dataSource.isAuthAvailable("USER");
+
+        // then
+        assertThat(isBobbyAvailable, equalTo(true));
+        assertThat(isChrisAvailable, equalTo(false));
+        assertThat(isUserAvailable, equalTo(true));
+    }
+
+    @Test
+    public void shouldReturnAllAuths() {
+        // given / when
+        List<PlayerAuth> authList = dataSource.getAllAuths();
+
+        // then
+        assertThat(authList, hasSize(7));
+        assertThat(getName("bobby", authList), hasAuthBasicData("bobby", "Bobby", "your@email.com", "123.45.67.89"));
+        assertThat(getName("bobby", authList), hasAuthLocation(1.05, 2.1, 4.2, "world"));
+        assertThat(getName("bobby", authList).getPassword(), equalToHash("$SHA$11aa0706173d7272$dbba966"));
+        assertThat(getName("twofields", authList), hasAuthBasicData("twofields", "twoFields", "your@email.com", "127.0.0.1"));
+        assertThat(getName("twofields", authList).getPassword(), equalToHash("hash1234"));
+        assertThat(getName("threefields", authList), hasAuthBasicData("threefields", "threeFields", "your@email.com", "33.33.33.33"));
+        assertThat(getName("fourfields", authList), hasAuthBasicData("fourfields", "fourFields", "your@email.com", "4.4.4.4"));
+        assertThat(getName("fourfields", authList).getLastLogin(), equalTo(404040404L));
+        assertThat(getName("sevenfields", authList), hasAuthLocation(7.7, 14.14, 21.21, "world"));
+        assertThat(getName("eightfields", authList), hasAuthLocation(8.8, 17.6, 26.4, "eightworld"));
+        assertThat(getName("eightfields", authList).getLastLogin(), equalTo(1234567888L));
+        assertThat(getName("eightfields", authList).getPassword(), equalToHash("hash8168"));
+    }
+
+    @Test
+    public void shouldAddAuth() {
+        // given / when
+        boolean response = dataSource.saveAuth(
+            PlayerAuth.builder().name("Test").email("user@EXAMPLE.org").ip("123.45.67.77").build());
+        List<PlayerAuth> authList = dataSource.getAllAuths();
+
+        // then
+        assertThat(response, equalTo(true));
+        assertThat(authList, hasSize(8));
+        assertThat(authList, hasItem(hasAuthBasicData("test", "test", "user@EXAMPLE.org", "123.45.67.77")));
+    }
+
+    private static PlayerAuth getName(String name, Collection<PlayerAuth> auths) {
+        for (PlayerAuth auth : auths) {
+            if (name.equals(auth.getNickname())) {
+                return auth;
+            }
+        }
+        throw new IllegalStateException("Did not find auth with name '" + name + "'");
+    }
+
+}

src/test/resources/datasource-integration/flatfile-test.txt

@@ -0,0 +1,7 @@
+Bobby:$SHA$11aa0706173d7272$dbba966:123.45.67.89:1449136800:1.05:2.1:4.2:world:your@email.com
+user:b28c32f624a4eb161d6adc9acb5bfc5b:34.56.78.90:1453242857:124.1:76.3:-127.8:nether:user@example.org
+twoFields:hash1234
+threeFields:hash369:33.33.33.33
+fourFields:$hash$4444:4.4.4.4:404040404
+sevenFields:hash7749:5.5.5.55:1414141414:7.7:14.14:21.21
+eightFields:hash8168:6.6.6.66:1234567888:8.8:17.6:26.4:eightworld