diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java b/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java index 8996fb07eab4d24e9aa3d09ff4f3f2248ab08e11..b91d58840056cf5d7a175ee6f700dfba056fcfde 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java @@ -6,10 +6,6 @@ import java.util.concurrent.ExecutionException; import gov.usgs.earthquake.nshmp.model.NshmTestUtils.Nshm; import gov.usgs.earthquake.nshmp.model.NshmTestUtils.NshmModel; -import gov.usgs.earthquake.nshmp.www.Application; - -import io.micronaut.context.ApplicationContext; -import io.micronaut.runtime.Micronaut; /** * Generate actual results to compare to expected results. @@ -29,12 +25,12 @@ class GenerateActual { NshmTestUtils.writeExpecteds(nshmModel, Optional.of(NshmTests.DATA_PATH)); nshmModel.exec.shutdown(); - // Generate web - ApplicationContext context = Micronaut - .build("--model=" + nshm.modelPath()) - .mainClass(Application.class) - .start(); - NshmTestUtils.writeWebExpecteds(nshm, Optional.of(NshmTests.WEB_DATA_PATH)); - context.close(); + // // Generate web + // ApplicationContext context = Micronaut + // .build("--model=" + nshm.modelPath()) + // .mainClass(Application.class) + // .start(); + // NshmTestUtils.writeWebExpecteds(nshm, Optional.of(NshmTests.WEB_DATA_PATH)); + // context.close(); } } 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 5b7e768485f321e10407f7e6c67db2f6496e45bd..12312f75fa77701c6a4e9b07037f8d456fe3e087 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java @@ -39,8 +39,11 @@ 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; /** @@ -91,18 +94,18 @@ class NshmTestUtils { */ static void testNshm(Nshm nshm, Optional<Path> dataPath) throws InterruptedException, ExecutionException { - // Optional<NshmModel> nshmModel = Optional.empty(); + Optional<NshmModel> nshmModel = Optional.empty(); - // if (dataPath.isEmpty()) { - // nshmModel = Optional.of(loadModel(nshm)); - // } + if (dataPath.isEmpty()) { + nshmModel = Optional.of(loadModel(nshm)); + } - // for (NamedLocation location : nshm.locations()) { - // LOGGER.info("Location: " + location.toString()); - // compareCurves(nshm, location, nshmModel, dataPath); - // } + for (NamedLocation location : nshm.locations()) { + LOGGER.info("Location: " + location.toString()); + compareCurves(nshm, location, nshmModel, dataPath); + } - // nshmModel.ifPresent(model -> model.exec.shutdown()); + nshmModel.ifPresent(model -> model.exec.shutdown()); } /** @@ -115,21 +118,21 @@ class NshmTestUtils { static void testWebNshm(Nshm nshm, Optional<Path> dataPath) throws InterruptedException, ExecutionException { - // Optional<ApplicationContext> context = Optional.empty(); + Optional<ApplicationContext> context = Optional.empty(); - // if (dataPath.isEmpty()) { - // context = Optional.of(Micronaut - // .build("--MODEL=" + nshm.modelPath()) - // .mainClass(Application.class) - // .start()); - // } + if (dataPath.isEmpty()) { + 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); - // } + for (NamedLocation location : nshm.locations()) { + LOGGER.info("Location: " + location.toString()); + compareWebCurves(nshm, location, dataPath); + } - // context.ifPresent(ApplicationContext::close); + 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 86458a42ce0e3426e7323dbc0e4b9330e6ef83f8..e3fe8d7211509c08828a3256b656e8441e700842 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)); }