From 879fbb0bf8041e2d0310dcd657eec2d39ecb8126 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Thu, 9 Apr 2020 10:34:18 -0400 Subject: [PATCH] Test fixes --- .../java/ca/uhn/fhir/parser/LenientErrorHandler.java | 2 +- .../src/main/java/ca/uhn/fhir/parser/ParserState.java | 2 +- .../main/java/ca/uhn/fhir/parser/StrictErrorHandler.java | 2 +- .../java/ca/uhn/fhir/parser/JsonParserDstu2_1Test.java | 9 +++++---- .../java/ca/uhn/fhir/parser/XmlParserDstu2_1Test.java | 2 +- .../uhn/fhir/validation/ResourceValidatorDstu2Test.java | 2 +- .../java/ca/uhn/fhir/parser/JsonParserDstu3Test.java | 8 ++++---- .../test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java | 4 ++-- .../test/java/ca/uhn/fhir/parser/JsonParserR4Test.java | 4 ++-- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java index 5082d3cdad7..49f62bb8553 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/LenientErrorHandler.java @@ -161,7 +161,7 @@ public class LenientErrorHandler extends BaseErrorHandler implements IParserErro @Override public void extensionContainsValueAndNestedExtensions(IParseLocation theLocation) { if (myLogErrors) { - ourLog.warn("Extension contains both a value and nested extensions: {}", describeLocation(theLocation)); + ourLog.warn("{}Extension contains both a value and nested extensions", describeLocation(theLocation)); } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java index 34a2b765a0c..095997a4903 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java @@ -1282,7 +1282,7 @@ class ParserState { if ("value".equals(theName)) { if ("".equals(theValue)) { ParseLocation location = ParseLocation.fromElementName(myChildName); - myErrorHandler.invalidValue(location, theValue, "Attribute value for element must not be empty (\"\")"); + myErrorHandler.invalidValue(location, theValue, "Attribute value must not be empty (\"\")"); } else { try { myInstance.setValueAsString(theValue); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/StrictErrorHandler.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/StrictErrorHandler.java index 7c35006b255..4030b54c11c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/StrictErrorHandler.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/StrictErrorHandler.java @@ -86,7 +86,7 @@ public class StrictErrorHandler extends BaseErrorHandler implements IParserError @Override public void extensionContainsValueAndNestedExtensions(IParseLocation theLocation) { - throw new DataFormatException(describeLocation(theLocation) + "Extension contains both a value and nested extensions: " + theLocation); + throw new DataFormatException(describeLocation(theLocation) + "Extension contains both a value and nested extensions"); } } diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2_1Test.java b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2_1Test.java index f8a232a60a4..9d9c5531fab 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2_1Test.java +++ b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2_1Test.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.mock; @@ -1098,8 +1099,8 @@ public class JsonParserDstu2_1Test { assertEquals(null, parsed.getGenderElement().getValueAsString()); ArgumentCaptor msgCaptor = ArgumentCaptor.forClass(String.class); - verify(errorHandler, times(1)).invalidValue(isNull(IParseLocation.class), eq(""), msgCaptor.capture()); - assertEquals("Attribute values must not be empty (\"\")", msgCaptor.getValue()); + verify(errorHandler, times(1)).invalidValue(any(IParseLocation.class), eq(""), msgCaptor.capture()); + assertEquals("Attribute value must not be empty (\"\")", msgCaptor.getValue()); String encoded = ourCtx.newJsonParser().encodeResourceToString(parsed); assertEquals("{\"resourceType\":\"Patient\"}", encoded); @@ -1118,7 +1119,7 @@ public class JsonParserDstu2_1Test { assertEquals("foo", parsed.getGenderElement().getValueAsString()); ArgumentCaptor msgCaptor = ArgumentCaptor.forClass(String.class); - verify(errorHandler, times(1)).invalidValue(isNull(IParseLocation.class), eq("foo"), msgCaptor.capture()); + verify(errorHandler, times(1)).invalidValue(any(IParseLocation.class), eq("foo"), msgCaptor.capture()); assertEquals("Unknown AdministrativeGender code 'foo'", msgCaptor.getValue()); String encoded = ourCtx.newJsonParser().encodeResourceToString(parsed); @@ -1138,7 +1139,7 @@ public class JsonParserDstu2_1Test { assertEquals("foo", parsed.getValueDateTimeType().getValueAsString()); ArgumentCaptor msgCaptor = ArgumentCaptor.forClass(String.class); - verify(errorHandler, times(1)).invalidValue(isNull(IParseLocation.class), eq("foo"), msgCaptor.capture()); + verify(errorHandler, times(1)).invalidValue(any(IParseLocation.class), eq("foo"), msgCaptor.capture()); assertEquals("Invalid date/time format: \"foo\"", msgCaptor.getValue()); String encoded = ourCtx.newJsonParser().encodeResourceToString(parsed); diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2_1Test.java b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2_1Test.java index 2e810637a11..66fb4cd9723 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2_1Test.java +++ b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2_1Test.java @@ -2379,7 +2379,7 @@ public class XmlParserDstu2_1Test { p.parseResource(resource); fail(); } catch (DataFormatException e) { - assertEquals("DataFormatException at [[row,col {unknown-source}]: [2,4]]: Invalid attribute value \"1\": Invalid boolean string: '1'", e.getMessage()); + assertEquals("DataFormatException at [[row,col {unknown-source}]: [2,4]]: [element=\"active\"] Invalid attribute value \"1\": Invalid boolean string: '1'", e.getMessage()); } LenientErrorHandler errorHandler = new LenientErrorHandler(); diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/validation/ResourceValidatorDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/validation/ResourceValidatorDstu2Test.java index 0c7e76468fe..ce1afde22af 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/validation/ResourceValidatorDstu2Test.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/validation/ResourceValidatorDstu2Test.java @@ -82,7 +82,7 @@ public class ResourceValidatorDstu2Test { parser.parseResource(encoded); fail(); } catch (DataFormatException e) { - assertEquals("DataFormatException at [[row,col {unknown-source}]: [2,4]]: Invalid attribute value \"2000-15-31\": Invalid date/time format: \"2000-15-31\"", e.getMessage()); + assertEquals("DataFormatException at [[row,col {unknown-source}]: [2,4]]: [element=\"birthDate\"] Invalid attribute value \"2000-15-31\": Invalid date/time format: \"2000-15-31\"", e.getMessage()); } } diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java index b87a3408961..21926260b05 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java @@ -1504,7 +1504,7 @@ public class JsonParserDstu3Test { assertEquals("foo", parsed.getValueDateTimeType().getValueAsString()); ArgumentCaptor msgCaptor = ArgumentCaptor.forClass(String.class); - verify(errorHandler, times(1)).invalidValue(isNull(), eq("foo"), msgCaptor.capture()); + verify(errorHandler, times(1)).invalidValue(any(), eq("foo"), msgCaptor.capture()); assertEquals("Invalid date/time format: \"foo\"", msgCaptor.getValue()); String encoded = ourCtx.newJsonParser().encodeResourceToString(parsed); @@ -1536,8 +1536,8 @@ public class JsonParserDstu3Test { assertEquals(null, parsed.getGenderElement().getValueAsString()); ArgumentCaptor msgCaptor = ArgumentCaptor.forClass(String.class); - verify(errorHandler, times(1)).invalidValue(isNull(), eq(""), msgCaptor.capture()); - assertEquals("Attribute values must not be empty (\"\")", msgCaptor.getValue()); + verify(errorHandler, times(1)).invalidValue(any(), eq(""), msgCaptor.capture()); + assertEquals("Attribute value must not be empty (\"\")", msgCaptor.getValue()); String encoded = ourCtx.newJsonParser().encodeResourceToString(parsed); assertEquals("{\"resourceType\":\"Patient\"}", encoded); @@ -1556,7 +1556,7 @@ public class JsonParserDstu3Test { assertEquals("foo", parsed.getGenderElement().getValueAsString()); ArgumentCaptor msgCaptor = ArgumentCaptor.forClass(String.class); - verify(errorHandler, times(1)).invalidValue(isNull(), eq("foo"), msgCaptor.capture()); + verify(errorHandler, times(1)).invalidValue(any(), eq("foo"), msgCaptor.capture()); assertEquals("Unknown AdministrativeGender code 'foo'", msgCaptor.getValue()); String encoded = ourCtx.newJsonParser().encodeResourceToString(parsed); diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java index 98fdae848b5..281139b3c49 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java @@ -1542,7 +1542,7 @@ public class XmlParserDstu3Test { parser.encodeResourceToString(p); fail(); } catch (DataFormatException e) { - assertEquals("Extension contains both a value and nested extensions: Patient(res).extension", e.getMessage()); + assertEquals("[element=\"Patient(res).extension\"] Extension contains both a value and nested extensions: [element=\"Patient(res).extension\"]", e.getMessage()); } } @@ -3119,7 +3119,7 @@ public class XmlParserDstu3Test { p.parseResource(resource); fail(); } catch (DataFormatException e) { - assertEquals("DataFormatException at [[row,col {unknown-source}]: [2,4]]: Invalid attribute value \"1\": Invalid boolean string: '1'", e.getMessage()); + assertEquals("DataFormatException at [[row,col {unknown-source}]: [2,4]]: [element=\"active\"] Invalid attribute value \"1\": Invalid boolean string: '1'", e.getMessage()); } LenientErrorHandler errorHandler = new LenientErrorHandler(); diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/JsonParserR4Test.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/JsonParserR4Test.java index b3363a6a8b6..2756f643cb1 100644 --- a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/JsonParserR4Test.java +++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/JsonParserR4Test.java @@ -350,7 +350,7 @@ public class JsonParserR4Test extends BaseTest { parser.encodeResourceToString(p); fail(); } catch (DataFormatException e) { - assertEquals("Extension contains both a value and nested extensions: Patient(res).extension", e.getMessage()); + assertEquals("[element=\"Patient(res).extension\"] Extension contains both a value and nested extensions", e.getMessage()); } } @@ -590,7 +590,7 @@ public class JsonParserR4Test extends BaseTest { jsonParser.parseResource(Patient.class, input); fail(); } catch (DataFormatException e) { - assertEquals("[element=\"value\"] Invalid attribute value \"\": Attribute value for element must not be empty (\"\")", e.getMessage()); + assertEquals("[element=\"value\"] Invalid attribute value \"\": Attribute value must not be empty (\"\")", e.getMessage()); } }