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

#411 Finalize forced commands implementation

Browse Source
This commit is contained in:
ljacqu
2016-11-28 21:51:31 +01:00
parent f6ed39b118
commit 808ed84269
8 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/settings/commandconfig/CommandManagerTest.java
+2 -2
View File
@@ -42,7 +42,7 @@ public class CommandManagerTest {
private CommandManager manager;
@InjectMocks
private CommandsMigrater commandsMigrater;
private CommandMigrationService commandMigrationService;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -158,7 +158,7 @@ public class CommandManagerTest {
}
private void initManager() {
manager = new CommandManager(testFolder, bukkitService, commandsMigrater);
manager = new CommandManager(testFolder, bukkitService, commandMigrationService);
}
private void copyJarFileAsCommandsYml(String path) {
src/test/java/fr/xephi/authme/settings/commandconfig/CommandsMigraterTest.java → src/test/java/fr/xephi/authme/settings/commandconfig/CommandMigrationServiceTest.java
+6 -6
View File
@@ -33,13 +33,13 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verifyZeroInteractions;
/**
* Test for {@link CommandsMigrater}.
* Test for {@link CommandMigrationService}.
*/
@RunWith(MockitoJUnitRunner.class)
public class CommandsMigraterTest {
public class CommandMigrationServiceTest {
@InjectMocks
private CommandsMigrater commandsMigrater;
private CommandMigrationService commandMigrationService;
@Mock
private SettingsMigrationService settingsMigrationService;
@@ -62,7 +62,7 @@ public class CommandsMigraterTest {
CommandConfig configSpy = spy(commandConfig);
// when
boolean result = commandsMigrater.transformOldCommands(configSpy);
boolean result = commandMigrationService.transformOldCommands(configSpy);
// then
assertThat(result, equalTo(false));
@@ -92,7 +92,7 @@ public class CommandsMigraterTest {
commandConfig.setOnRegister(onRegisterCommands);
// when
boolean result = commandsMigrater.transformOldCommands(commandConfig);
boolean result = commandMigrationService.transformOldCommands(commandConfig);
// then
assertThat(result, equalTo(true));
@@ -122,7 +122,7 @@ public class CommandsMigraterTest {
PropertyResource resource = new YamlFileResource(commandFile);
// when
boolean result = commandsMigrater.checkAndMigrate(
boolean result = commandMigrationService.checkAndMigrate(
resource, ConfigurationDataBuilder.collectData(CommandSettingsHolder.class).getProperties());
// then
src/test/java/fr/xephi/authme/settings/commandconfig/CommandYmlConsistencyTest.java
+2 -2
View File
@@ -28,7 +28,7 @@ import static org.mockito.BDDMockito.given;
public class CommandYmlConsistencyTest {
@InjectMocks
private CommandsMigrater commandsMigrater;
private CommandMigrationService commandMigrationService;
@Mock
private SettingsMigrationService settingsMigrationService;
@@ -51,7 +51,7 @@ public class CommandYmlConsistencyTest {
PropertyResource resource = new YamlFileResource(commandFile);
// when
boolean result = commandsMigrater.checkAndMigrate(
boolean result = commandMigrationService.checkAndMigrate(
resource, ConfigurationDataBuilder.collectData(CommandSettingsHolder.class).getProperties());
// then