mirror
/
MapWithAI
kopia lustrzana https://github.com/JOSM/MapWithAI
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Only reset MapWithAILayerInfo if the @Territories annotation is ued 

Signed-off-by: Taylor Smock <tsmock@meta.com>
pull/30/head v803
Taylor Smock 2023-07-26 08:30:01 -06:00
rodzic 35bad2f762
commit 3fdb8b0560
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 233BB2E466604E27
1 zmienionych plików z 11 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Wiremock.java
Wyświetl plik

@ -12,6 +12,7 @@ import org.awaitility.Awaitility;
import org.awaitility.Durations; import org.awaitility.Durations;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.platform.commons.support.AnnotationSupport;
import org.openstreetmap.josm.plugins.mapwithai.backend.DataAvailability; import org.openstreetmap.josm.plugins.mapwithai.backend.DataAvailability;
import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIConflationCategory; import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIConflationCategory;
import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo; import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo;
@ -108,13 +109,14 @@ public @interface Wiremock {
try { try {
super.afterAll(context); super.afterAll(context);
} finally { } finally {
resetMapWithAILayerInfo(); resetMapWithAILayerInfo(context);
} }
} }
@Override @Override
public void beforeAll(ExtensionContext context) throws Exception { public void beforeAll(ExtensionContext context) throws Exception {
super.beforeAll(context); super.beforeAll(context);
MapWithAILayerInfo.setImageryLayersSites(null); MapWithAILayerInfo.setImageryLayersSites(null);
AtomicBoolean finished = new AtomicBoolean(); AtomicBoolean finished = new AtomicBoolean();
MapWithAILayerInfo.getInstance().clear(); MapWithAILayerInfo.getInstance().clear();
@ -122,14 +124,15 @@ public @interface Wiremock {
Awaitility.await().atMost(Durations.TEN_SECONDS).until(finished::get); Awaitility.await().atMost(Durations.TEN_SECONDS).until(finished::get);
} }
private static void resetMapWithAILayerInfo() { private static void resetMapWithAILayerInfo(ExtensionContext context) {
// This should probably only be run if territories is initialized
// TODO update if @Territories becomes an annotation
synchronized (MapWithAILayerInfo.class) { synchronized (MapWithAILayerInfo.class) {
MapWithAILayerInfo.getInstance().clear(); final var info = MapWithAILayerInfo.getInstance();
MapWithAILayerInfo.getInstance().getDefaultLayers().stream().filter(MapWithAIInfo::isDefaultEntry) info.clear();
.forEach(MapWithAILayerInfo.getInstance()::add); if (false && AnnotationSupport.isAnnotated(context.getTestClass(), Territories.class)) {
MapWithAILayerInfo.getInstance().save(); // This should probably only be run if territories is initialized
info.getDefaultLayers().stream().filter(MapWithAIInfo::isDefaultEntry).forEach(info::add);
}
info.save();
} }
} }