Merge branch 'global-replacements'

2018-03-10 16:59:56 +01:00
parent 6ddfa3fd2b 1a53cd11b2
commit 15f49dcbb3
48 changed files with 298 additions and 70 deletions
@@ -83,15 +83,16 @@ public class CommonServiceTest {
    public void shouldRetrieveSingleMessage() {
        // given
        MessageKey key = MessageKey.ACCOUNT_NOT_ACTIVATED;
+        Player player = mock(Player.class);
        String text = "Test text";
-        given(messages.retrieveSingle(key)).willReturn(text);
+        given(messages.retrieveSingle(player, key)).willReturn(text);

        // when
-        String result = commonService.retrieveSingleMessage(key);
+        String result = commonService.retrieveSingleMessage(player, key);

        // then
        assertThat(result, equalTo(text));
-        verify(messages).retrieveSingle(key);
+        verify(messages).retrieveSingle(player, key);
    }

    @Test