honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unit test bugs

This commit is contained in:
jamesagnew 2014-03-17 10:25:00 -04:00
parent 2ca5d57f0d
commit d6e3750657
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDatatypeDefinition.java
View File

@ -21,7 +21,6 @@ public abstract class BaseRuntimeChildDatatypeDefinition extends BaseRuntimeDecl
public BaseRuntimeChildDatatypeDefinition(Field theField, String theElementName, Child theChildAnnotation, Description theDescriptionAnnotation, Class<? extends IDatatype> theDatatype) { public BaseRuntimeChildDatatypeDefinition(Field theField, String theElementName, Child theChildAnnotation, Description theDescriptionAnnotation, Class<? extends IDatatype> theDatatype) {
super(theField, theChildAnnotation, theDescriptionAnnotation, theElementName); super(theField, theChildAnnotation, theDescriptionAnnotation, theElementName);
assert theDatatype != IResource.class; // shouldn't exist
assert theDatatype != IDatatype.class; // should use RuntimeChildAny assert theDatatype != IDatatype.class; // should use RuntimeChildAny
myDatatype = theDatatype; myDatatype = theDatatype;
} }

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java
View File

@ -131,7 +131,9 @@ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger
String expectedPath = StringUtils.join(path, '.'); String expectedPath = StringUtils.join(path, '.');
ourLog.info("Filling profile for: {} - Path: {}", expectedPath); ourLog.info("Filling profile for: {} - Path: {}", expectedPath);
if (!expectedPath.equals(def.getName())) { String name = def.getName();
if (!expectedPath.equals(name)) {
path.pollLast();
theElement.getDefinition().getNameReference().setValue(def.getName()); theElement.getDefinition().getNameReference().setValue(def.getName());
return; return;
} }

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
View File

@ -157,7 +157,7 @@ public abstract class RestfulServer extends HttpServlet {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.getAuthorName().setValue(getClass().getCanonicalName()); bundle.getAuthorName().setValue(getClass().getCanonicalName());
bundle.getId().setValue(UUID.randomUUID().toString()); bundle.getBundleId().setValue(UUID.randomUUID().toString());
bundle.getPublished().setToCurrentTimeInLocalTimeZone(); bundle.getPublished().setToCurrentTimeInLocalTimeZone();
for (IResource next : theResult) { for (IResource next : theResult) {

2
hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/XmlParserTest.java
View File

@ -126,7 +126,7 @@ public class XmlParserTest {
BundleEntry entry = bundle.getEntries().get(0); BundleEntry entry = bundle.getEntries().get(0);
assertEquals("HL7, Inc (FHIR Project)", entry.getAuthorName().getValue()); assertEquals("HL7, Inc (FHIR Project)", entry.getAuthorName().getValue());
assertEquals("http://hl7.org/fhir/valueset/256a5231-a2bb-49bd-9fea-f349d428b70d", entry.getId().getValue()); assertEquals("http://hl7.org/fhir/valueset/256a5231-a2bb-49bd-9fea-f349d428b70d", entry.getEntryId().getValue());
ValueSet resource = (ValueSet) entry.getResource(); ValueSet resource = (ValueSet) entry.getResource();
assertEquals("LOINC Codes for Cholesterol", resource.getName().getValue()); assertEquals("LOINC Codes for Cholesterol", resource.getName().getValue());