From 1438537009913be48c7dab6b278c8cf723bb2ca3 Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Fri, 17 Jan 2025 14:12:09 -0700 Subject: [PATCH] test --- .../earthquake/nshmp/model/NshmTestUtils.java | 21 ++++++++----------- .../earthquake/nshmp/model/NshmTests.java | 4 ++-- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java index f418feba..5b7e7684 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java @@ -39,11 +39,8 @@ import gov.usgs.earthquake.nshmp.calc.Site; import gov.usgs.earthquake.nshmp.calc.Sites; import gov.usgs.earthquake.nshmp.data.XySequence; import gov.usgs.earthquake.nshmp.gmm.Imt; -import gov.usgs.earthquake.nshmp.www.Application; import gov.usgs.earthquake.nshmp.www.hazard.HazardServiceUtils; -import io.micronaut.context.ApplicationContext; -import io.micronaut.runtime.Micronaut; import io.swagger.v3.core.util.Yaml; /** @@ -97,12 +94,12 @@ class NshmTestUtils { // Optional<NshmModel> nshmModel = Optional.empty(); // if (dataPath.isEmpty()) { - // nshmModel = Optional.of(loadModel(nshm)); + // nshmModel = Optional.of(loadModel(nshm)); // } // for (NamedLocation location : nshm.locations()) { - // LOGGER.info("Location: " + location.toString()); - // compareCurves(nshm, location, nshmModel, dataPath); + // LOGGER.info("Location: " + location.toString()); + // compareCurves(nshm, location, nshmModel, dataPath); // } // nshmModel.ifPresent(model -> model.exec.shutdown()); @@ -121,15 +118,15 @@ class NshmTestUtils { // Optional<ApplicationContext> context = Optional.empty(); // if (dataPath.isEmpty()) { - // context = Optional.of(Micronaut - // .build("--MODEL=" + nshm.modelPath()) - // .mainClass(Application.class) - // .start()); + // context = Optional.of(Micronaut + // .build("--MODEL=" + nshm.modelPath()) + // .mainClass(Application.class) + // .start()); // } // for (NamedLocation location : nshm.locations()) { - // LOGGER.info("Location: " + location.toString()); - // compareWebCurves(nshm, location, dataPath); + // LOGGER.info("Location: " + location.toString()); + // compareWebCurves(nshm, location, dataPath); // } // context.ifPresent(ApplicationContext::close); diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java index e3fe8d72..86458a42 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java @@ -133,8 +133,8 @@ class NshmTests { */ @Test final void testAlaska2007() throws IOException, InterruptedException, ExecutionException { - Nshm nshm = NSHMS.get("nshm-alaska-2007"); - NshmTestUtils.testNshm(nshm, getDataPath(nshm)); + // Nshm nshm = NSHMS.get("nshm-alaska-2007"); + // NshmTestUtils.testNshm(nshm, getDataPath(nshm)); // NshmTestUtils.testWebNshm(nshm, getWebDataPath(nshm)); } -- GitLab