Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

Move the json merge in the I18nServlet class

Browse Source
This commit is contained in:
Mohamed Karray
2018-10-24 10:18:09 +02:00
parent a7d14636dc
commit 36a55bffae
3 changed files with 65 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-webapp/src/test/java/sonia/scm/web/i18n/I18nServletTest.java
View File

@@ -23,7 +23,6 @@ import sonia.scm.cache.Cache;
import sonia.scm.cache.CacheManager;
import sonia.scm.event.ScmEventBus;
import sonia.scm.plugin.PluginLoader;
import sonia.scm.util.JacksonUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -205,8 +204,8 @@ public class I18nServletTest {
when(classLoader.getResources("locales/de/plugins.json")).thenReturn(resources);
ObjectMapper objectMapper = new ObjectMapper();
JsonNode node = objectMapper.readTree(GIT_PLUGIN_JSON);
node = JacksonUtils.merge(node, objectMapper.readTree(HG_PLUGIN_JSON));
node = JacksonUtils.merge(node, objectMapper.readTree(SVN_PLUGIN_JSON));
node = servlet.merge(node, objectMapper.readTree(HG_PLUGIN_JSON));
node = servlet.merge(node, objectMapper.readTree(SVN_PLUGIN_JSON));
when(cache.get(path)).thenReturn(node);
servlet.doGet(request, response);