Skip to content
Snippets Groups Projects
Commit 414e0f7a authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

add path

parent 22d9308c
No related branches found
No related tags found
1 merge request!793Test Web Service
...@@ -142,15 +142,21 @@ class NshmTestUtils { ...@@ -142,15 +142,21 @@ class NshmTestUtils {
Double.valueOf(expected).equals(Double.valueOf(actual)); 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 { Optional<Path> dataPath) throws InterruptedException, ExecutionException {
Nshm nshm = nshmModel.nshm;
Map<String, XySequence> actual = dataPath.isPresent() Map<String, XySequence> actual = dataPath.isPresent()
? readExpected(nshmModel, location, dataPath) : generateActual(nshmModel, location); ? readExpected(nshmModel, location, dataPath) : generateActual(nshmModel, location);
Map<String, XySequence> webActual = Map<String, XySequence> webActual =
HazardServiceUtils.generateActual( HazardServiceUtils.generateActual(
location, location,
nshmModel.nshm.imts(), nshm.imts(),
nshmModel.nshm.nshmInfo.repo); nshm.nshmInfo.repo + nshm.nshmInfo.year);
Map<String, XySequence> expected = readExpected(nshmModel, location, Optional.empty()); Map<String, XySequence> expected = readExpected(nshmModel, location, Optional.empty());
for (String key : actual.keySet()) { for (String key : actual.keySet()) {
......
...@@ -27,7 +27,7 @@ public class HazardServiceUtils { ...@@ -27,7 +27,7 @@ public class HazardServiceUtils {
Set<Imt> imts, Set<Imt> imts,
String model) String model)
throws InterruptedException, ExecutionException { throws InterruptedException, ExecutionException {
ApplicationContext context = Micronaut.build("--model=nshms/nshm-" + model) ApplicationContext context = Micronaut.build("--model=nshms/" + model)
.mainClass(Application.class) .mainClass(Application.class)
.start(); .start();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment