diff --git a/src/test/java/de/ozgcloud/admin/setting/SettingEnvironmentITCase.java b/src/test/java/de/ozgcloud/admin/setting/SettingEnvironmentITCase.java index 46e79f03c3fbd644a3f3c33224ba4003c33294f9..c50d09934b9cfd835215a4589a0c70000fdc9419 100644 --- a/src/test/java/de/ozgcloud/admin/setting/SettingEnvironmentITCase.java +++ b/src/test/java/de/ozgcloud/admin/setting/SettingEnvironmentITCase.java @@ -71,13 +71,13 @@ class SettingEnvironmentITCase { @BeforeEach void fillDb() { - fillDbWithInitialSettings(); + fillDbWithInitialSetting(); } @Test @SneakyThrows void shouldHandleEmptySetting() { - var result = getAlfaSetting(); + var result = getAlfaSettings(); assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createInitialYaml()); } @@ -88,19 +88,19 @@ class SettingEnvironmentITCase { @BeforeEach void fillDb() { - fillDbWithPostfachSettings(); + fillDbWithPostfachSetting(); } @Test @SneakyThrows void shouldReturnValuesForAlfa() { - var result = getAlfaSetting(); + var result = getAlfaSettings(); assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createAlfaYaml()); } } - private ResultActions getAlfaSetting() throws Exception { + private ResultActions getAlfaSettings() throws Exception { return mockMvc.perform(get("/configserver/Alfa-any.yaml")).andExpect(status().isOk()); } } @@ -113,13 +113,13 @@ class SettingEnvironmentITCase { @BeforeEach void fillDb() { - fillDbWithInitialSettings(); + fillDbWithInitialSetting(); } @Test @SneakyThrows void shouldHandleEmptySetting() { - var result = getVorgangManagerSetting(); + var result = getVorgangManagerSettings(); assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createInitialYaml()); } @@ -130,20 +130,20 @@ class SettingEnvironmentITCase { @BeforeEach void fillDb() { - fillDbWithPostfachSettings(); + fillDbWithPostfachSetting(); } @Test @SneakyThrows void shouldReturnValuesForVorgangManager() { - var result = getVorgangManagerSetting(); + var result = getVorgangManagerSettings(); assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())) .isEqualTo(YamlTestFactory.createVorgangManagerYaml()); } } - private ResultActions getVorgangManagerSetting() throws Exception { + private ResultActions getVorgangManagerSettings() throws Exception { return mockMvc.perform(get("/configserver/OzgCloud_VorgangManager-profile.yaml")).andExpect(status().isOk()); } } @@ -152,21 +152,21 @@ class SettingEnvironmentITCase { return text.replaceAll("\\\\\\s+\\\\", "").replace("\\n", "\n"); } - private void fillDbWithInitialSettings() { + private void fillDbWithInitialSetting() { var initialSetting = Setting.builder().name("Postfach").build(); mongoOperations.dropCollection(Setting.class); mongoOperations.dropCollection(OrganisationsEinheit.class); mongoOperations.save(initialSetting); } - private void fillDbWithPostfachSettings() { - var postfachSettings = SettingTestFactory.createBuilder() + private void fillDbWithPostfachSetting() { + var postfachSetting = SettingTestFactory.createBuilder() .name("Postfach") .settingBody(PostfachSettingBodyTestFactory.create()) .build(); mongoOperations.dropCollection(Setting.class); mongoOperations.dropCollection(OrganisationsEinheit.class); - mongoOperations.save(postfachSettings); + mongoOperations.save(postfachSetting); mongoOperations.save(OrganisationsEinheitTestFactory.create()); } } \ No newline at end of file