From 0aa6a29422e1fa17c06ddf08160349d393d92bea Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 27 Feb 2024 10:18:01 -0700
Subject: [PATCH] added carriage return
---
.../usgs/earthquake/nshmp/model/NshmTestUtils.java | 13 +++++++++----
1 file changed, 9 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 9d0daaba..92b8917c 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -10,6 +10,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -28,6 +29,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import gov.usgs.earthquake.nshmp.NamedLocation;
+import gov.usgs.earthquake.nshmp.Text;
import gov.usgs.earthquake.nshmp.calc.CalcConfig;
import gov.usgs.earthquake.nshmp.calc.Hazard;
import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
@@ -35,7 +37,6 @@ 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 io.swagger.v3.core.util.Yaml;
/**
@@ -101,7 +102,9 @@ class NshmTestUtils {
static void writeExpecteds(NshmModel nshmModel, Optional<Path> dataPath) throws IOException {
for (NamedLocation location : nshmModel.nshm.locations()) {
Map<String, XySequence> xyMap = generateActual(nshmModel, location);
- String json = GSON.toJson(xyMap);
+ String json = new StringBuilder(GSON.toJson(xyMap))
+ .append(Text.NEWLINE)
+ .toString();
writeExpected(nshmModel.nshm, location, json, dataPath);
}
}
@@ -164,8 +167,10 @@ class NshmTestUtils {
Map<String, XySequence> xyMap = hazard.curves().entrySet().stream()
.collect(Collectors.toMap(
- e -> e.getKey().toString(),
- Entry::getValue));
+ e -> e.getKey().name(),
+ Entry::getValue,
+ (o1, o2) -> o1,
+ LinkedHashMap::new)); // preserve IMT enum order
return xyMap;
}
--
GitLab