Skip to content

Commit 1a97d3c

Browse files
committed
UI tests fixed with new config approach.
WARNING: requires setting some config within tests, as DB is not started and therefore not the new default configurations;
1 parent 5a638ed commit 1a97d3c

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

sormas-backend/src/test/java/de/symeda/sormas/backend/ConfigFacadeEjbLocalMock.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
package de.symeda.sormas.backend;
22

3-
import static de.symeda.sormas.backend.systemconfiguration.ConfigFacadeEjb.COUNTRY_SEPARATION_CHAR;
4-
53
import java.util.Optional;
64
import java.util.function.Function;
75
import java.util.regex.Pattern;
86

97
import javax.ejb.LocalBean;
108
import javax.ejb.Stateless;
9+
import javax.enterprise.inject.Specializes;
1110

1211
import org.apache.commons.lang3.StringUtils;
1312

14-
import de.symeda.sormas.api.ConfigFacade;
1513
import de.symeda.sormas.api.i18n.I18nProperties;
1614
import de.symeda.sormas.api.systemconfiguration.Config;
1715
import de.symeda.sormas.backend.systemconfiguration.ConfigFacadeEjb;
1816

1917
@Stateless
2018
@LocalBean
21-
public class ConfigFacadeEjbLocalMock implements ConfigFacade {
19+
@Specializes
20+
public class ConfigFacadeEjbLocalMock extends ConfigFacadeEjb {
2221

2322
public static final TestHelperConfigImpl testHelperConfig = new TestHelperConfigImpl();
2423

sormas-backend/src/test/java/de/symeda/sormas/backend/MockProducer.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,14 @@ public static void resetMocks() {
135135

136136
private static void resetConfigs() {
137137
testHelperConfig.clear();
138-
testHelperConfig.setProperty(Config.COUNTRY_NAME, "nigeria");
138+
testHelperConfig.set(Config.COUNTRY_NAME, "nigeria");
139139
testHelperConfig.set(Config.COUNTRY_LOCALE, "en");
140-
testHelperConfig.setProperty(Config.CSV_SEPARATOR, ";");
140+
testHelperConfig.set(Config.CSV_SEPARATOR, ";");
141+
testHelperConfig.set(Config.STEP_SIZE_FOR_CSV_EXPORT, "5000");
141142

142-
testHelperConfig.setProperty(Config.TEMP_PATH, TMP_PATH);
143+
testHelperConfig.set(Config.TEMP_PATH, TMP_PATH);
143144

144-
testHelperConfig.setProperty(Config.DOCUMENTS_PATH, TMP_PATH + "/documents");
145+
testHelperConfig.set(Config.DOCUMENTS_PATH, TMP_PATH + "/documents");
145146

146147
testHelperConfig.set(Config.DEFAULT_CASE_CLASSIFICATION_CALCULATION_MODE, "AUTOMATIC");
147148
testHelperConfig.set(Config.CASE_CLASSIFICATION_CALCULATION_MODE_OVERRIDE, "{}");

sormas-ui/src/test/java/de/symeda/sormas/backend/MockProducer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ private static void resetConfigs() {
138138
testHelperConfig.clear();
139139
testHelperConfig.set(Config.COUNTRY_NAME, "nigeria");
140140
testHelperConfig.set(Config.COUNTRY_LOCALE, "en");
141+
testHelperConfig.set(Config.STEP_SIZE_FOR_CSV_EXPORT, "5000");
141142

142143
testHelperConfig.set(Config.CSV_SEPARATOR, ";");
143144

sormas-ui/src/test/java/de/symeda/sormas/ui/FacadeProviderMock.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ public <P> P lookupEjbRemote(Class<P> clazz) {
172172
} else if (OutbreakFacade.class == clazz) {
173173
return (P) beanTest.getBean(OutbreakFacadeEjbLocal.class);
174174
} else if (ConfigFacade.class == clazz) {
175-
System.out.println("here ConfigFacadeEjbLocalMock is instanciated");
176175
return (P) beanTest.getBean(ConfigFacadeEjbLocalMock.class);
177176
} else if (ExportFacade.class == clazz) {
178177
return (P) beanTest.getBean(ExportFacadeEjbLocal.class);

0 commit comments

Comments
 (0)