From 414e0f7a4ff7ac8131b29cd4e889fa0fa00efab5 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 23 Oct 2024 12:42:05 -0600
Subject: [PATCH] add path
---
.../usgs/earthquake/nshmp/model/NshmTestUtils.java | 12 +++++++++---
.../nshmp/www/hazard/HazardServiceUtils.java | 2 +-
2 files changed, 10 insertions(+), 4 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 887e82d9..afb20de1 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 00a108df..98d30ffc 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();
--
GitLab