Skip to content
Snippets Groups Projects
Commit db6d5725 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-7239 OZG-7286 Change spelling

parent 587bc6d3
No related branches found
No related tags found
No related merge requests found
...@@ -71,13 +71,13 @@ class SettingEnvironmentITCase { ...@@ -71,13 +71,13 @@ class SettingEnvironmentITCase {
@BeforeEach @BeforeEach
void fillDb() { void fillDb() {
fillDbWithInitialSettings(); fillDbWithInitialSetting();
} }
@Test @Test
@SneakyThrows @SneakyThrows
void shouldHandleEmptySetting() { void shouldHandleEmptySetting() {
var result = getAlfaSetting(); var result = getAlfaSettings();
assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createInitialYaml()); assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createInitialYaml());
} }
...@@ -88,19 +88,19 @@ class SettingEnvironmentITCase { ...@@ -88,19 +88,19 @@ class SettingEnvironmentITCase {
@BeforeEach @BeforeEach
void fillDb() { void fillDb() {
fillDbWithPostfachSettings(); fillDbWithPostfachSetting();
} }
@Test @Test
@SneakyThrows @SneakyThrows
void shouldReturnValuesForAlfa() { void shouldReturnValuesForAlfa() {
var result = getAlfaSetting(); var result = getAlfaSettings();
assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createAlfaYaml()); 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()); return mockMvc.perform(get("/configserver/Alfa-any.yaml")).andExpect(status().isOk());
} }
} }
...@@ -113,13 +113,13 @@ class SettingEnvironmentITCase { ...@@ -113,13 +113,13 @@ class SettingEnvironmentITCase {
@BeforeEach @BeforeEach
void fillDb() { void fillDb() {
fillDbWithInitialSettings(); fillDbWithInitialSetting();
} }
@Test @Test
@SneakyThrows @SneakyThrows
void shouldHandleEmptySetting() { void shouldHandleEmptySetting() {
var result = getVorgangManagerSetting(); var result = getVorgangManagerSettings();
assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createInitialYaml()); assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createInitialYaml());
} }
...@@ -130,20 +130,20 @@ class SettingEnvironmentITCase { ...@@ -130,20 +130,20 @@ class SettingEnvironmentITCase {
@BeforeEach @BeforeEach
void fillDb() { void fillDb() {
fillDbWithPostfachSettings(); fillDbWithPostfachSetting();
} }
@Test @Test
@SneakyThrows @SneakyThrows
void shouldReturnValuesForVorgangManager() { void shouldReturnValuesForVorgangManager() {
var result = getVorgangManagerSetting(); var result = getVorgangManagerSettings();
assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())) assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString()))
.isEqualTo(YamlTestFactory.createVorgangManagerYaml()); .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()); return mockMvc.perform(get("/configserver/OzgCloud_VorgangManager-profile.yaml")).andExpect(status().isOk());
} }
} }
...@@ -152,21 +152,21 @@ class SettingEnvironmentITCase { ...@@ -152,21 +152,21 @@ class SettingEnvironmentITCase {
return text.replaceAll("\\\\\\s+\\\\", "").replace("\\n", "\n"); return text.replaceAll("\\\\\\s+\\\\", "").replace("\\n", "\n");
} }
private void fillDbWithInitialSettings() { private void fillDbWithInitialSetting() {
var initialSetting = Setting.builder().name("Postfach").build(); var initialSetting = Setting.builder().name("Postfach").build();
mongoOperations.dropCollection(Setting.class); mongoOperations.dropCollection(Setting.class);
mongoOperations.dropCollection(OrganisationsEinheit.class); mongoOperations.dropCollection(OrganisationsEinheit.class);
mongoOperations.save(initialSetting); mongoOperations.save(initialSetting);
} }
private void fillDbWithPostfachSettings() { private void fillDbWithPostfachSetting() {
var postfachSettings = SettingTestFactory.createBuilder() var postfachSetting = SettingTestFactory.createBuilder()
.name("Postfach") .name("Postfach")
.settingBody(PostfachSettingBodyTestFactory.create()) .settingBody(PostfachSettingBodyTestFactory.create())
.build(); .build();
mongoOperations.dropCollection(Setting.class); mongoOperations.dropCollection(Setting.class);
mongoOperations.dropCollection(OrganisationsEinheit.class); mongoOperations.dropCollection(OrganisationsEinheit.class);
mongoOperations.save(postfachSettings); mongoOperations.save(postfachSetting);
mongoOperations.save(OrganisationsEinheitTestFactory.create()); mongoOperations.save(OrganisationsEinheitTestFactory.create());
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment