honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve comparison of generated java code

This commit is contained in:
Grahame Grieve 2023-09-27 11:36:16 +10:00
parent e18ba8a2e1
commit 75f2d559ca
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/PETests.java
View File

@ -40,6 +40,7 @@ import org.hl7.fhir.r5.context.IWorkerContext;
import org.hl7.fhir.r5.formats.IParser.OutputStyle;
import org.hl7.fhir.r5.formats.JsonParser;
import org.hl7.fhir.r5.model.Coding;
import org.hl7.fhir.r5.model.Comparison;
import org.hl7.fhir.r5.model.Enumerations.ObservationStatus;
import org.hl7.fhir.r5.model.Observation;
import org.hl7.fhir.r5.model.Resource;
@ -51,6 +52,7 @@ import org.hl7.fhir.r5.profilemodel.gen.PECodeGenerator.ExtensionPolicy;
import org.hl7.fhir.r5.profilemodel.PEBuilder;
import org.hl7.fhir.r5.profilemodel.PEBuilder.PEElementPropertiesPolicy;
import org.hl7.fhir.r5.profilemodel.PEInstance.PEInstanceDataKind;
import org.hl7.fhir.r5.test.utils.CompareUtilities;
import org.hl7.fhir.r5.test.utils.TestPackageLoader;
import org.hl7.fhir.r5.test.utils.TestingUtilities;
import org.hl7.fhir.utilities.TextFile;
@ -419,10 +421,12 @@ public class PETests {
private void checkGeneratedJava(String name) throws FileNotFoundException, IOException {
String actual = TextFile.fileToString(Utilities.path("[tmp]", name+".java"));
String expected = TestingUtilities.loadTestResource("r5", "profiles", name+".java");
if (!actual.equals(expected)) {
Assertions.fail("Generated code for "+name+" is different");
String actual = Utilities.normalize(TextFile.fileToString(Utilities.path("[tmp]", name+".java")));
String expected = Utilities.normalize(TestingUtilities.loadTestResource("r5", "profiles", name+".java"));
String msg = CompareUtilities.checkTextIsSame(expected, actual);
if (msg != null) {
Assertions.fail("Generated code for "+name+" is different: "+msg);
}
}
}

6
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
View File

@ -831,7 +831,11 @@ public class Utilities {
b.append(Character.toLowerCase(c));
isWhitespace = false;
} else if (!isWhitespace) {
b.append(' ');
if (c == '\r' || c == '\n') {
b.append('\n');
} else {
b.append(' ');
}
isWhitespace = true;
}
}