#1539 Integrate data source columns library
- Create wrapper around SqlColumnsHandler for AuthMe-specific behavior - Integrate columns handler into first SQLite and MySQL method implementations
This commit is contained in:
@@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import fr.xephi.authme.data.captcha.CaptchaCodeStorage;
|
||||
import fr.xephi.authme.datasource.AuthMeColumns;
|
||||
import fr.xephi.authme.datasource.Columns;
|
||||
import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
|
||||
import fr.xephi.authme.initialization.HasCleanup;
|
||||
@@ -52,7 +53,7 @@ public class ClassesConsistencyTest {
|
||||
int.class, long.class, float.class, String.class, File.class, Enum.class, collectionsUnmodifiableList(),
|
||||
Charset.class,
|
||||
/* AuthMe */
|
||||
Property.class, RegistrationMethod.class,
|
||||
Property.class, RegistrationMethod.class, AuthMeColumns.class,
|
||||
/* Guava */
|
||||
ImmutableMap.class, ImmutableList.class);
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ public abstract class AbstractDataSourceIntegrationTest {
|
||||
// when
|
||||
HashedPassword bobbyPassword = dataSource.getPassword("bobby");
|
||||
HashedPassword invalidPassword = dataSource.getPassword("doesNotExist");
|
||||
HashedPassword userPassword = dataSource.getPassword("user");
|
||||
HashedPassword userPassword = dataSource.getPassword("User");
|
||||
|
||||
// then
|
||||
assertThat(bobbyPassword, equalToHash("$SHA$11aa0706173d7272$dbba966"));
|
||||
@@ -160,7 +160,8 @@ public abstract class AbstractDataSourceIntegrationTest {
|
||||
boolean response2 = dataSource.updatePassword("non-existent-name", new HashedPassword("sd"));
|
||||
|
||||
// then
|
||||
assertThat(response1 && response2, equalTo(true));
|
||||
assertThat(response1, equalTo(true));
|
||||
assertThat(response2, equalTo(false)); // no record modified
|
||||
assertThat(dataSource.getPassword("user"), equalToHash(newHash));
|
||||
}
|
||||
|
||||
@@ -175,7 +176,8 @@ public abstract class AbstractDataSourceIntegrationTest {
|
||||
boolean response2 = dataSource.updatePassword("non-existent-name", new HashedPassword("asdfasdf", "a1f34ec"));
|
||||
|
||||
// then
|
||||
assertThat(response1 && response2, equalTo(true));
|
||||
assertThat(response1, equalTo(true));
|
||||
assertThat(response2, equalTo(false)); // no record modified
|
||||
assertThat(dataSource.getPassword("user"), equalToHash("new_hash"));
|
||||
}
|
||||
|
||||
@@ -191,7 +193,8 @@ public abstract class AbstractDataSourceIntegrationTest {
|
||||
boolean response2 = dataSource.updatePassword(invalidAuth);
|
||||
|
||||
// then
|
||||
assertThat(response1 && response2, equalTo(true));
|
||||
assertThat(response1, equalTo(true));
|
||||
assertThat(response2, equalTo(false)); // no record modified
|
||||
assertThat(dataSource.getPassword("bobby"), equalToHash("tt", "cc"));
|
||||
}
|
||||
|
||||
@@ -273,7 +276,8 @@ public abstract class AbstractDataSourceIntegrationTest {
|
||||
boolean response2 = dataSource.updateEmail(invalidAuth);
|
||||
|
||||
// then
|
||||
assertThat(response1 && response2, equalTo(true));
|
||||
assertThat(response1, equalTo(true));
|
||||
assertThat(response2, equalTo(false)); // no record modified
|
||||
assertThat(dataSource.getAllAuths(), hasItem(hasAuthBasicData("user", "user", email, "34.56.78.90")));
|
||||
}
|
||||
|
||||
@@ -328,7 +332,8 @@ public abstract class AbstractDataSourceIntegrationTest {
|
||||
boolean response2 = dataSource.updateRealName("notExists", "NOTEXISTS");
|
||||
|
||||
// then
|
||||
assertThat(response1 && response2, equalTo(true));
|
||||
assertThat(response1, equalTo(true));
|
||||
assertThat(response2, equalTo(false)); // no record modified
|
||||
assertThat(dataSource.getAuth("bobby"), hasAuthBasicData("bobby", "BOBBY", null, "123.45.67.89"));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user