Skip to content
Snippets Groups Projects
Commit 0aa6a294 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

added carriage return

parent b9e02c08
No related branches found
No related tags found
1 merge request!772Increment lib and test updates
...@@ -10,6 +10,7 @@ import java.nio.file.Files; ...@@ -10,6 +10,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
...@@ -28,6 +29,7 @@ import com.google.gson.JsonObject; ...@@ -28,6 +29,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import gov.usgs.earthquake.nshmp.NamedLocation; 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.CalcConfig;
import gov.usgs.earthquake.nshmp.calc.Hazard; import gov.usgs.earthquake.nshmp.calc.Hazard;
import gov.usgs.earthquake.nshmp.calc.HazardCalcs; import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
...@@ -35,7 +37,6 @@ import gov.usgs.earthquake.nshmp.calc.Site; ...@@ -35,7 +37,6 @@ import gov.usgs.earthquake.nshmp.calc.Site;
import gov.usgs.earthquake.nshmp.data.XySequence; import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.geo.Location; import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Imt; import gov.usgs.earthquake.nshmp.gmm.Imt;
import io.swagger.v3.core.util.Yaml; import io.swagger.v3.core.util.Yaml;
/** /**
...@@ -101,7 +102,9 @@ class NshmTestUtils { ...@@ -101,7 +102,9 @@ class NshmTestUtils {
static void writeExpecteds(NshmModel nshmModel, Optional<Path> dataPath) throws IOException { static void writeExpecteds(NshmModel nshmModel, Optional<Path> dataPath) throws IOException {
for (NamedLocation location : nshmModel.nshm.locations()) { for (NamedLocation location : nshmModel.nshm.locations()) {
Map<String, XySequence> xyMap = generateActual(nshmModel, location); 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); writeExpected(nshmModel.nshm, location, json, dataPath);
} }
} }
...@@ -164,8 +167,10 @@ class NshmTestUtils { ...@@ -164,8 +167,10 @@ class NshmTestUtils {
Map<String, XySequence> xyMap = hazard.curves().entrySet().stream() Map<String, XySequence> xyMap = hazard.curves().entrySet().stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
e -> e.getKey().toString(), e -> e.getKey().name(),
Entry::getValue)); Entry::getValue,
(o1, o2) -> o1,
LinkedHashMap::new)); // preserve IMT enum order
return xyMap; return xyMap;
} }
......
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