Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ConfigMe and Mockito version

Browse Source
This commit is contained in:
ljacqu
2016-12-23 23:22:05 +01:00
parent 92f71d47c2
commit 5f8a19223f
39 changed files with 127 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
+1 -1
View File
@@ -1,8 +1,8 @@
package fr.xephi.authme;
import ch.jalu.configme.resource.PropertyResource;
import ch.jalu.injector.Injector;
import ch.jalu.injector.InjectorBuilder;
import com.github.authme.configme.resource.PropertyResource;
import com.google.common.io.Files;
import fr.xephi.authme.api.NewAPI;
import fr.xephi.authme.command.CommandHandler;
src/test/java/fr/xephi/authme/datasource/AbstractResourceClosingTest.java
+1 -1
View File
@@ -1,6 +1,6 @@
package fr.xephi.authme.datasource;
import com.github.authme.configme.properties.Property;
import ch.jalu.configme.properties.Property;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java
+1 -1
View File
@@ -1,6 +1,6 @@
package fr.xephi.authme.datasource;
import com.github.authme.configme.properties.Property;
import ch.jalu.configme.properties.Property;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import fr.xephi.authme.TestHelper;
src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java
+1 -1
View File
@@ -1,6 +1,6 @@
package fr.xephi.authme.datasource;
import com.github.authme.configme.properties.Property;
import ch.jalu.configme.properties.Property;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.data.auth.PlayerAuth;
import fr.xephi.authme.settings.Settings;
src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java
+2 -2
View File
@@ -1,7 +1,7 @@
package fr.xephi.authme.settings;
import com.github.authme.configme.knownproperties.ConfigurationData;
import com.github.authme.configme.properties.Property;
import ch.jalu.configme.configurationdata.ConfigurationData;
import ch.jalu.configme.properties.Property;
import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever;
import org.junit.BeforeClass;
import org.junit.Test;
src/test/java/fr/xephi/authme/settings/SettingsIntegrationTest.java
+6 -6
View File
@@ -1,11 +1,11 @@
package fr.xephi.authme.settings;
import com.github.authme.configme.knownproperties.ConfigurationData;
import com.github.authme.configme.knownproperties.ConfigurationDataBuilder;
import com.github.authme.configme.migration.PlainMigrationService;
import com.github.authme.configme.properties.Property;
import com.github.authme.configme.resource.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource;
import ch.jalu.configme.configurationdata.ConfigurationData;
import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
import ch.jalu.configme.migration.PlainMigrationService;
import ch.jalu.configme.properties.Property;
import ch.jalu.configme.resource.PropertyResource;
import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Files;
import fr.xephi.authme.TestHelper;
src/test/java/fr/xephi/authme/settings/SettingsMigrationServiceTest.java
+2 -2
View File
@@ -1,7 +1,7 @@
package fr.xephi.authme.settings;
import com.github.authme.configme.resource.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource;
import ch.jalu.configme.resource.PropertyResource;
import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.io.Files;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.output.LogLevel;
src/test/java/fr/xephi/authme/settings/SettingsTest.java
+3 -3
View File
@@ -1,8 +1,8 @@
package fr.xephi.authme.settings;
import com.github.authme.configme.knownproperties.ConfigurationData;
import com.github.authme.configme.knownproperties.ConfigurationDataBuilder;
import com.github.authme.configme.resource.PropertyResource;
import ch.jalu.configme.configurationdata.ConfigurationData;
import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
import ch.jalu.configme.resource.PropertyResource;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.settings.properties.TestConfiguration;
src/test/java/fr/xephi/authme/settings/commandconfig/CommandMigrationServiceTest.java
+3 -3
View File
@@ -1,8 +1,8 @@
package fr.xephi.authme.settings.commandconfig;
import com.github.authme.configme.knownproperties.ConfigurationDataBuilder;
import com.github.authme.configme.resource.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource;
import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
import ch.jalu.configme.resource.PropertyResource;
import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.SettingsMigrationService;
import org.junit.BeforeClass;
src/test/java/fr/xephi/authme/settings/commandconfig/CommandYmlConsistencyTest.java
+3 -3
View File
@@ -1,8 +1,8 @@
package fr.xephi.authme.settings.commandconfig;
import com.github.authme.configme.knownproperties.ConfigurationDataBuilder;
import com.github.authme.configme.resource.PropertyResource;
import com.github.authme.configme.resource.YamlFileResource;
import ch.jalu.configme.configurationdata.ConfigurationDataBuilder;
import ch.jalu.configme.resource.PropertyResource;
import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.TestHelper;
import fr.xephi.authme.settings.SettingsMigrationService;
import org.junit.Before;
src/test/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetrieverTest.java
+1 -1
View File
@@ -1,6 +1,6 @@
package fr.xephi.authme.settings.properties;
import com.github.authme.configme.knownproperties.ConfigurationData;
import ch.jalu.configme.configurationdata.ConfigurationData;
import fr.xephi.authme.TestHelper;
import org.junit.Test;
src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java
+2 -2
View File
@@ -1,7 +1,7 @@
package fr.xephi.authme.settings.properties;
import com.github.authme.configme.SettingsHolder;
import com.github.authme.configme.properties.Property;
import ch.jalu.configme.SettingsHolder;
import ch.jalu.configme.properties.Property;
import fr.xephi.authme.ClassCollector;
import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.TestHelper;
src/test/java/fr/xephi/authme/settings/properties/TestConfiguration.java
+4 -4
View File
@@ -1,12 +1,12 @@
package fr.xephi.authme.settings.properties;
import com.github.authme.configme.SettingsHolder;
import com.github.authme.configme.properties.Property;
import ch.jalu.configme.SettingsHolder;
import ch.jalu.configme.properties.Property;
import java.util.List;
import static com.github.authme.configme.properties.PropertyInitializer.newListProperty;
import static com.github.authme.configme.properties.PropertyInitializer.newProperty;
import static ch.jalu.configme.properties.PropertyInitializer.newListProperty;
import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
/**
* Sample properties for testing purposes.
src/test/java/tools/docs/config/UpdateConfigPageTask.java
+2 -2
View File
@@ -1,7 +1,7 @@
package tools.docs.config;
import com.github.authme.configme.SettingsManager;
import com.github.authme.configme.resource.YamlFileResource;
import ch.jalu.configme.SettingsManager;
import ch.jalu.configme.resource.YamlFileResource;
import fr.xephi.authme.settings.properties.AuthMeSettingsRetriever;
import fr.xephi.authme.util.FileUtils;
import tools.utils.AutoToolTask;
src/test/java/tools/docs/hashmethods/EncryptionMethodInfoGatherer.java
+1 -1
View File
@@ -1,8 +1,8 @@
package tools.docs.hashmethods;
import ch.jalu.configme.properties.Property;
import ch.jalu.injector.Injector;
import ch.jalu.injector.InjectorBuilder;
import com.github.authme.configme.properties.Property;
import com.google.common.collect.ImmutableSet;
import fr.xephi.authme.security.HashAlgorithm;
import fr.xephi.authme.security.crypts.EncryptionMethod;
src/test/java/tools/filegeneration/GenerateCommandsYml.java
+2 -2
View File
@@ -1,7 +1,7 @@
package tools.filegeneration;
import com.github.authme.configme.SettingsManager;
import com.github.authme.configme.resource.YamlFileResource;
import ch.jalu.configme.SettingsManager;
import ch.jalu.configme.resource.YamlFileResource;
import com.google.common.collect.ImmutableMap;
import fr.xephi.authme.settings.commandconfig.Command;
import fr.xephi.authme.settings.commandconfig.CommandConfig;