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

test for existence of both lang and xml:lang on the xhtml div

This commit is contained in:
Grahame Grieve 2020-02-12 20:24:09 +11:00
parent 4d99bcb0c6
commit fccd3c1871
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/PackageClientTests.java
View File

@ -71,7 +71,6 @@ public class PackageClientTests {
} }
Assert.assertTrue(matches.size() > 0); Assert.assertTrue(matches.size() > 0);
} }
@Test @Test
public void testSearchNoMatches2() throws IOException { public void testSearchNoMatches2() throws IOException {

20
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
View File

@ -3716,11 +3716,21 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
Element div = text.getNamedChild("div"); Element div = text.getNamedChild("div");
if (lang != null && div != null) { if (lang != null && div != null) {
XhtmlNode xhtml = div.getXhtml(); XhtmlNode xhtml = div.getXhtml();
String xl = xhtml.getAttribute("lang"); String l = xhtml.getAttribute("lang");
if (xl == null) { String xl = xhtml.getAttribute("xml:lang");
warning(errors, IssueType.BUSINESSRULE, div.line(), div.col(), stack.getLiteralPath(), false, "Resource has a language, but the XHTML does not have a language tag"); if (l == null && xl == null) {
} else if (!xl.equals(lang)) { warning(errors, IssueType.BUSINESSRULE, div.line(), div.col(), stack.getLiteralPath(), false, "Resource has a language, but the XHTML does not have an lang or an xml:lang tag (needs both - see https://www.w3.org/TR/i18n-html-tech-lang/#langvalues)");
warning(errors, IssueType.BUSINESSRULE, div.line(), div.col(), stack.getLiteralPath(), false, "Resource has a language ("+lang+"), and the XHTML has a language ("+xl+"), but they differ "); } else {
if (l == null) {
warning(errors, IssueType.BUSINESSRULE, div.line(), div.col(), stack.getLiteralPath(), false, "Resource has a language, but the XHTML does not have a lang tag (needs both lang and xml:lang - see https://www.w3.org/TR/i18n-html-tech-lang/#langvalues)");
} else if (!l.equals(lang)) {
warning(errors, IssueType.BUSINESSRULE, div.line(), div.col(), stack.getLiteralPath(), false, "Resource has a language ("+lang+"), and the XHTML has a lang ("+l+"), but they differ ");
}
if (xl == null) {
warning(errors, IssueType.BUSINESSRULE, div.line(), div.col(), stack.getLiteralPath(), false, "Resource has a language, but the XHTML does not have an xml:lang tag (needs both lang and xml:lang - see https://www.w3.org/TR/i18n-html-tech-lang/#langvalues)");
} else if (!xl.equals(lang)) {
warning(errors, IssueType.BUSINESSRULE, div.line(), div.col(), stack.getLiteralPath(), false, "Resource has a language ("+lang+"), and the XHTML has an xml:lang ("+xl+"), but they differ ");
}
} }
} }
} }