Merge in patch from #655

This commit is contained in:
James Agnew 2017-06-09 15:36:19 -04:00
parent 872d72629c
commit e1cfc8212e
1 changed files with 11 additions and 14 deletions

View File

@ -44,9 +44,9 @@ public class BaseDateTimeDtDstu2Test {
InstantDt type = (InstantDt) new InstantDt(from).setTimeZoneZulu(true);
String encoded = type.getValueAsString();
ourLog.info("LDT: "+ ldt.toString());
ourLog.info("Expected: "+"1960-09-07T00:44:25.012");
ourLog.info("Actual: "+encoded);
ourLog.info("LDT: " + ldt.toString());
ourLog.info("Expected: " + "1960-09-07T00:44:25.012");
ourLog.info("Actual: " + encoded);
assertEquals("1960-09-07T00:44:25.012Z", encoded);
@ -84,7 +84,6 @@ public class BaseDateTimeDtDstu2Test {
}
private void validate(long millis, String expected) {
InstantDt dt;
dt = new InstantDt(new Date(millis));
@ -100,7 +99,6 @@ public class BaseDateTimeDtDstu2Test {
assertEquals(expected.replace("Z", "+00:00"), dt.getValueAsString());
}
@Test
public void testSetPartialsYearFromExisting() {
InstantDt dt = new InstantDt("2011-03-11T15:44:13.27564757855254768473697463986328969635-08:00");
@ -262,7 +260,6 @@ public class BaseDateTimeDtDstu2Test {
verifyFails("1974-A2-25");
verifyFails("1974-12-A5");
// Date shouldn't have a time zone
verifyFails("1974-12-25Z");
verifyFails("1974-12-25+10:00");