#450 Make reload & messages functionality use NewSetting
- Change ReloadCommand to use the new setting functionality - Check and construct the messages file in NewSetting - Unrelated: change MessagesManager not to extend CustomConfiguration anymore
This commit is contained in:
@@ -18,6 +18,7 @@ import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@@ -95,19 +96,6 @@ public class CommandServiceTest {
|
||||
verify(commandMapper).mapPartsToCommand(sender, commandParts);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
public void shouldRunTaskInAsync() {
|
||||
// given
|
||||
Runnable runnable = mock(Runnable.class);
|
||||
|
||||
// when
|
||||
commandService.runTaskAsynchronously(runnable);
|
||||
|
||||
// then
|
||||
// TODO ljacqu 20151226: AuthMe#getServer() is final, i.e. not mockable
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldGetDataSource() {
|
||||
// given
|
||||
@@ -193,10 +181,40 @@ public class CommandServiceTest {
|
||||
given(settings.getProperty(property)).willReturn(7);
|
||||
|
||||
// when
|
||||
int result = settings.getProperty(property);
|
||||
int result = commandService.getProperty(property);
|
||||
|
||||
// then
|
||||
assertThat(result, equalTo(7));
|
||||
verify(settings).getProperty(property);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldReloadMessages() {
|
||||
// given
|
||||
File file = new File("some/bogus-file.test");
|
||||
|
||||
// when
|
||||
commandService.reloadMessages(file);
|
||||
|
||||
// then
|
||||
verify(messages).reload(file);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldReturnSettings() {
|
||||
// given/when
|
||||
NewSetting result = commandService.getSettings();
|
||||
|
||||
// then
|
||||
assertThat(result, equalTo(settings));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldReturnAuthMe() {
|
||||
// given/when
|
||||
AuthMe result = commandService.getAuthMe();
|
||||
|
||||
// then
|
||||
assertThat(result, equalTo(authMe));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user