test web results

src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java

@@ -16,6 +16,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
@@ -37,6 +38,7 @@ import gov.usgs.earthquake.nshmp.calc.Site;
 import gov.usgs.earthquake.nshmp.data.XySequence;
 import gov.usgs.earthquake.nshmp.geo.Location;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.www.hazard.HazardServiceUtils;
 
 import io.swagger.v3.core.util.Yaml;
 
@@ -83,8 +85,11 @@ class NshmTestUtils {
    * Test a NSHM.
    *
    * @param nshm The NSHM to test
+   * @throws ExecutionException
+   * @throws InterruptedException
    */
-  static void testNshm(Nshm nshm, Optional<Path> dataPath) {
+  static void testNshm(Nshm nshm, Optional<Path> dataPath)
+      throws InterruptedException, ExecutionException {
     NshmModel nshmModel = loadModel(nshm);
 
     for (NamedLocation location : nshm.locations()) {
@@ -138,13 +143,16 @@ class NshmTestUtils {
   }
 
   private static void compareCurves(NshmModel nshmModel, NamedLocation location,
-      Optional<Path> dataPath) {
+      Optional<Path> dataPath) throws InterruptedException, ExecutionException {
     Map<String, XySequence> actual = dataPath.isPresent()
         ? readExpected(nshmModel, location, dataPath) : generateActual(nshmModel, location);
+    Map<String, XySequence> webActual =
+        HazardServiceUtils.generateActual(location, nshmModel.nshm.imts());
     Map<String, XySequence> expected = readExpected(nshmModel, location, Optional.empty());
 
     for (String key : actual.keySet()) {
       assertCurveEquals(expected.get(key), actual.get(key), TOLERANCE);
+      assertCurveEquals(expected.get(key), webActual.get(key), TOLERANCE);
     }
   }