From edc8614ba894f32e8cb15cee01e61f57a65c0029 Mon Sep 17 00:00:00 2001 From: "b.debeaubien" Date: Thu, 30 Oct 2014 10:06:42 -0400 Subject: [PATCH] Merging master --- .../ca/uhn/fhir/context/RuntimeResourceDefinitionTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionTest.java index 597c750a5b3..01981d9b0e5 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionTest.java @@ -79,7 +79,8 @@ public class RuntimeResourceDefinitionTest { assertEquals("ResourceWithExtensionsA.extension", element.get(2).getPath().getValue()); assertEquals("ResourceWithExtensionsA.extension", element.get(3).getPath().getValue()); assertEquals("ResourceWithExtensionsA.extension", element.get(4).getPath().getValue()); - assertEquals("ResourceWithExtensionsA.modifierExtension", element.get(5).getPath().getValue()); + assertEquals("ResourceWithExtensionsA.extension", element.get(5).getPath().getValue()); + assertEquals("ResourceWithExtensionsA.modifierExtension", element.get(6).getPath().getValue()); assertEquals(DataTypeEnum.EXTENSION, element.get(1).getDefinition().getType().get(0).getCode().getValueAsEnum()); assertEquals("url", element.get(1).getSlicing().getDiscriminator().getValue()); @@ -87,7 +88,7 @@ public class RuntimeResourceDefinitionTest { assertEquals(DataTypeEnum.EXTENSION, element.get(2).getDefinition().getType().get(0).getCode().getValueAsEnum()); assertEquals("#f1", element.get(2).getDefinition().getType().get(0).getProfile().getValueAsString()); - assertEquals("ResourceWithExtensionsA.identifier", element.get(12).getPath().getValue()); + assertEquals("ResourceWithExtensionsA.identifier", element.get(13).getPath().getValue()); }