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 887e82d9ceb9ae0431c5bd234a0609228cd548d4..afb20de1f434767403914a167f867ac8ebefa8be 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java @@ -142,15 +142,21 @@ class NshmTestUtils { Double.valueOf(expected).equals(Double.valueOf(actual)); } - private static void compareCurves(NshmModel nshmModel, NamedLocation location, + private static void compareCurves( + NshmModel nshmModel, + NamedLocation location, Optional<Path> dataPath) throws InterruptedException, ExecutionException { + Nshm nshm = nshmModel.nshm; + Map<String, XySequence> actual = dataPath.isPresent() ? readExpected(nshmModel, location, dataPath) : generateActual(nshmModel, location); + Map<String, XySequence> webActual = HazardServiceUtils.generateActual( location, - nshmModel.nshm.imts(), - nshmModel.nshm.nshmInfo.repo); + nshm.imts(), + nshm.nshmInfo.repo + nshm.nshmInfo.year); + Map<String, XySequence> expected = readExpected(nshmModel, location, Optional.empty()); for (String key : actual.keySet()) { diff --git a/src/test/java/gov/usgs/earthquake/nshmp/www/hazard/HazardServiceUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/www/hazard/HazardServiceUtils.java index 00a108df65b5eb72da7c79a2229abacea6fb2b6e..98d30ffc4ba2ba8e99aa5ae69aa75ab9b95a5374 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/www/hazard/HazardServiceUtils.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/www/hazard/HazardServiceUtils.java @@ -27,7 +27,7 @@ public class HazardServiceUtils { Set<Imt> imts, String model) throws InterruptedException, ExecutionException { - ApplicationContext context = Micronaut.build("--model=nshms/nshm-" + model) + ApplicationContext context = Micronaut.build("--model=nshms/" + model) .mainClass(Application.class) .start();