From c8fa589baab1d833414193c5cf372c24be5409d9 Mon Sep 17 00:00:00 2001 From: palanm Date: Tue, 16 Feb 2021 17:27:53 -0800 Subject: [PATCH 1/3] Added the copying of "extension" fiels --- .../org/hl7/fhir/r4/model/Enumeration.java | 108 ++++++++++-------- .../org/hl7/fhir/r5/model/Enumeration.java | 108 ++++++++++-------- 2 files changed, 116 insertions(+), 100 deletions(-) diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumeration.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumeration.java index 32077c431..8a4d75779 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumeration.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumeration.java @@ -1,39 +1,40 @@ package org.hl7.fhir.r4.model; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - */ +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + */ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.util.ArrayList; import org.hl7.fhir.instance.model.api.IBaseEnumeration; @@ -43,34 +44,34 @@ import ca.uhn.fhir.model.api.annotation.DatatypeDef; Copyright (c) 2011+, HL7, Inc All rights reserved. -Redistribution and use in source and binary forms, with or without modification, +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** * Primitive type "code" in FHIR, where the code is tied to an enumerated list of possible values - * + * */ @DatatypeDef(name = "code", isSpecialization = true) public class Enumeration> extends PrimitiveType implements IBaseEnumeration, ICoding { @@ -80,7 +81,7 @@ public class Enumeration> extends PrimitiveType implements /** * Constructor - * + * * @deprecated This no-arg constructor is provided for serialization only - Do not use */ @Deprecated @@ -117,10 +118,17 @@ public class Enumeration> extends PrimitiveType implements setValue(theValue); } - @Override - public Enumeration copy() { - return new Enumeration(myEnumFactory, getValue()); - } + @Override + public Enumeration copy() { + Enumeration dst= new Enumeration(this.myEnumFactory, (Enum)this.getValue()); + //Copy the Extension + if (extension != null) { + dst.extension = new ArrayList(); + for (Extension i : extension) + dst.extension.add(i.copy()); + }; + return dst; + } @Override protected String encode(T theValue) { @@ -145,7 +153,7 @@ public class Enumeration> extends PrimitiveType implements } return null; } - + @SuppressWarnings("unchecked") @Override public void readExternal(ObjectInput theIn) throws IOException, ClassNotFoundException { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumeration.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumeration.java index a6d20dc3b..116a8daf6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumeration.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumeration.java @@ -1,39 +1,40 @@ package org.hl7.fhir.r5.model; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - */ +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + */ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.util.ArrayList; import org.hl7.fhir.instance.model.api.IBaseEnumeration; @@ -43,34 +44,34 @@ import ca.uhn.fhir.model.api.annotation.DatatypeDef; Copyright (c) 2011+, HL7, Inc All rights reserved. -Redistribution and use in source and binary forms, with or without modification, +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** * Primitive type "code" in FHIR, where the code is tied to an enumerated list of possible values - * + * */ @DatatypeDef(name = "code", isSpecialization = true) public class Enumeration> extends PrimitiveType implements IBaseEnumeration, ICoding { @@ -80,7 +81,7 @@ public class Enumeration> extends PrimitiveType implements /** * Constructor - * + * * @deprecated This no-arg constructor is provided for serialization only - Do not use */ @Deprecated @@ -117,10 +118,17 @@ public class Enumeration> extends PrimitiveType implements setValue(theValue); } - @Override - public Enumeration copy() { - return new Enumeration(myEnumFactory, getValue()); - } + @Override + public Enumeration copy() { + Enumeration dst= new Enumeration(this.myEnumFactory, (Enum)this.getValue()); + //Copy the Extension + if (extension != null) { + dst.extension = new ArrayList(); + for (Extension i : extension) + dst.extension.add(i.copy()); + }; + return dst; + } @Override protected String encode(T theValue) { @@ -145,7 +153,7 @@ public class Enumeration> extends PrimitiveType implements } return null; } - + @SuppressWarnings("unchecked") @Override public void readExternal(ObjectInput theIn) throws IOException, ClassNotFoundException { From cc03acb3c37a605932a58d97736a4c124d7fddba Mon Sep 17 00:00:00 2001 From: palanm Date: Wed, 17 Feb 2021 11:32:18 -0800 Subject: [PATCH 2/3] Junit test for Copy method --- RELEASE_NOTES.md | 3 +- .../hl7/fhir/r4/test/ResourceCopyTests.java | 56 +++++++++++++++++++ .../hl7/fhir/r5/test/ResourceCopyTests.java | 48 ++++++++++++++++ 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java create mode 100644 org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceCopyTests.java diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 42148db59..c9b909f65 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,4 @@ * add test for Observation conversion from 10 to 40 * add procedures conversion form dstu2 to r4 -* add medication conversion from dstu2 to r4 \ No newline at end of file +* add medication conversion from dstu2 to r4 +* add copy of extension field for Enumeration fieldtype by Resource.copy \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java new file mode 100644 index 000000000..c17ecada2 --- /dev/null +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java @@ -0,0 +1,56 @@ +package org.hl7.fhir.r4.test; + +import org.fhir.ucum.UcumException; +import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.formats.IParser; +import org.hl7.fhir.r4.formats.IParser.OutputStyle; +import org.hl7.fhir.r4.formats.JsonParser; +import org.hl7.fhir.r4.formats.XmlParser; +import org.hl7.fhir.r4.model.*; +import org.hl7.fhir.r4.test.utils.TestingUtilities; +import org.hl7.fhir.r4.utils.EOperationOutcome; +import org.hl7.fhir.r4.utils.NarrativeGenerator; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import java.io.*; + +public class ResourceCopyTests { + + + @Test + public void testCopyExtensionForEnumerationField() throws FHIRException { + // Create new Observation and set the Extension with field value without status field set . + Observation obs = new Observation(); + obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl")); + obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl2")); + + Observation copyObs = obs.copy(); + Assertions.assertEquals(obs.hasStatusElement(),copyObs.hasStatusElement(),"Status Element not copied "); + Assertions.assertEquals(obs.getStatusElement().hasExtension(),copyObs.getStatusElement().hasExtension(),"Status Element Extension not copied "); + Assertions.assertEquals(obs.getStatusElement().getExtension().get(0).getUrl(),copyObs.getStatusElement().getExtension().get(0).getUrl(),"Status Element Extension url not copied "); + Assertions.assertEquals(obs.getStatusElement().getExtension().get(1).getUrl(),copyObs.getStatusElement().getExtension().get(1).getUrl(),"Status Element Extension url not copied "); + //Verify the object at toplevel using equals Deep + Assertions.assertEquals(obs.equalsDeep(copyObs),true,"DeepEquals fails"); + } + + @Test + public void testCopyEnumerationField() throws FHIRException, IOException { + // Create new Observation and set the Extension with field value as well as status field set . + Observation obs = new Observation(); + obs.setStatus(Observation.ObservationStatus.AMENDED); + obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl")); + + + Observation copyObs = obs.copy(); + Assertions.assertEquals(obs.getStatus(),copyObs.getStatus(),"Status not copied "); + Assertions.assertEquals(obs.hasStatusElement(),copyObs.hasStatusElement(),"Status Element not copied "); + Assertions.assertEquals(obs.getStatusElement().hasExtension(),copyObs.getStatusElement().hasExtension(),"Status Element Extension not copied "); + Assertions.assertEquals(obs.getStatusElement().getExtension().get(0).getUrl(),copyObs.getStatusElement().getExtension().get(0).getUrl(),"Status Element Extension url not copied "); + //Verify the object at toplevel using equals Deep + Assertions.assertEquals(obs.equalsDeep(copyObs),true,"DeepEquals fails"); + + } +} \ No newline at end of file diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceCopyTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceCopyTests.java new file mode 100644 index 000000000..ef901ed0a --- /dev/null +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceCopyTests.java @@ -0,0 +1,48 @@ +package org.hl7.fhir.r5.test; + +import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.Enumerations; +import org.hl7.fhir.r5.model.Extension; +import org.hl7.fhir.r5.model.Observation; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.io.IOException; + +public class ResourceCopyTests { + + + @Test + public void testCopyExtensionForEnumerationField() throws FHIRException { + // Create new Observation and set the Extension with field value without status field set . + Observation obs = new Observation(); + obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl")); + obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl2")); + + Observation copyObs = obs.copy(); + Assertions.assertEquals(obs.hasStatusElement(),copyObs.hasStatusElement(),"Status Element not copied "); + Assertions.assertEquals(obs.getStatusElement().hasExtension(),copyObs.getStatusElement().hasExtension(),"Status Element Extension not copied "); + Assertions.assertEquals(obs.getStatusElement().getExtension().get(0).getUrl(),copyObs.getStatusElement().getExtension().get(0).getUrl(),"Status Element Extension url not copied "); + Assertions.assertEquals(obs.getStatusElement().getExtension().get(1).getUrl(),copyObs.getStatusElement().getExtension().get(1).getUrl(),"Status Element Extension url not copied "); + //Verify the object at toplevel using equals Deep + Assertions.assertEquals(obs.equalsDeep(copyObs),true,"DeepEquals fails"); + } + + @Test + public void testCopyEnumerationField() throws FHIRException, IOException { + // Create new Observation and set the Extension with field value as well as status field set . + Observation obs = new Observation(); + obs.setStatus(Enumerations.ObservationStatus.AMENDED); + obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl")); + + + Observation copyObs = obs.copy(); + Assertions.assertEquals(obs.getStatus(),copyObs.getStatus(),"Status not copied "); + Assertions.assertEquals(obs.hasStatusElement(),copyObs.hasStatusElement(),"Status Element not copied "); + Assertions.assertEquals(obs.getStatusElement().hasExtension(),copyObs.getStatusElement().hasExtension(),"Status Element Extension not copied "); + Assertions.assertEquals(obs.getStatusElement().getExtension().get(0).getUrl(),copyObs.getStatusElement().getExtension().get(0).getUrl(),"Status Element Extension url not copied "); + //Verify the object at toplevel using equals Deep + Assertions.assertEquals(obs.equalsDeep(copyObs),true,"DeepEquals fails"); + + } +} \ No newline at end of file From a3e003740a877e407d9a4b8aa46057032a7571b2 Mon Sep 17 00:00:00 2001 From: palanm Date: Wed, 17 Feb 2021 14:13:37 -0800 Subject: [PATCH 3/3] fixing crlf to lf --- .../src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java | 2 +- .../src/test/java/org/hl7/fhir/r5/test/ResourceCopyTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java index c17ecada2..1f26cf49d 100644 --- a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceCopyTests.java @@ -22,7 +22,7 @@ public class ResourceCopyTests { @Test public void testCopyExtensionForEnumerationField() throws FHIRException { - // Create new Observation and set the Extension with field value without status field set . + // Create new Observation and set the Extension with field value without status field set. Observation obs = new Observation(); obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl")); obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl2")); diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceCopyTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceCopyTests.java index ef901ed0a..e333626d1 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceCopyTests.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceCopyTests.java @@ -14,7 +14,7 @@ public class ResourceCopyTests { @Test public void testCopyExtensionForEnumerationField() throws FHIRException { - // Create new Observation and set the Extension with field value without status field set . + // Create new Observation and set the Extension with field value without status field set. Observation obs = new Observation(); obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl")); obs.getStatusElement().getExtension().add(new Extension().setUrl("Sampleurl2"));