Improve test coverage

hapifhir · Jun 17, 2016 · dcecde5 · dcecde5
1 parent 56ed7fc
commit dcecde5
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 420 deletions.
diff --git a/...ase/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectSensitivityEnum.java b/...ase/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectSensitivityEnum.java
diff --git a/...-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectTypeEnum.java b/...-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectTypeEnum.java
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java
@@ -137,7 +137,7 @@
 import ca.uhn.fhir.rest.method.SortParameter;
 import ca.uhn.fhir.rest.method.TransactionMethodBinding;
 import ca.uhn.fhir.rest.method.ValidateMethodBindingDstu1;
-import ca.uhn.fhir.rest.method.ValidateMethodBindingDstu2;
+import ca.uhn.fhir.rest.method.ValidateMethodBindingDstu2Plus;
 import ca.uhn.fhir.rest.param.DateParam;
 import ca.uhn.fhir.rest.param.DateRangeParam;
 import ca.uhn.fhir.rest.param.TokenParam;
@@ -556,7 +556,7 @@ public MethodOutcome validate(IBaseResource theResource) {
 		if (myContext.getVersion().getVersion().equals(FhirVersionEnum.DSTU1)) {
 			invocation = ValidateMethodBindingDstu1.createValidateInvocation(theResource, null, myContext);
 		} else {
-			invocation = ValidateMethodBindingDstu2.createValidateInvocation(myContext, theResource);
+			invocation = ValidateMethodBindingDstu2Plus.createValidateInvocation(myContext, theResource);
 		}
 
 		if (isKeepResponses()) {
@@ -2409,7 +2409,7 @@ private class ValidateInternal extends BaseClientExecutable<IValidateUntyped, Me
 
 		@Override
 		public MethodOutcome execute() {
-			BaseHttpClientInvocation invocation = ValidateMethodBindingDstu2.createValidateInvocation(myContext, myResource);
+			BaseHttpClientInvocation invocation = ValidateMethodBindingDstu2Plus.createValidateInvocation(myContext, myResource);
 			ResourceResponseHandler<BaseOperationOutcome> handler = new ResourceResponseHandler<BaseOperationOutcome>(null, null);
 			IBaseOperationOutcome outcome = invoke(null, handler, invocation);
 			MethodOutcome retVal = new MethodOutcome();

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java
@@ -516,7 +516,7 @@ public static BaseMethodBinding<?> bindMethod(Method theMethod, FhirContext theC
 			if (theContext.getVersion().getVersion() == FhirVersionEnum.DSTU1) {
 				return new ValidateMethodBindingDstu1(theMethod, theContext, theProvider);
 			} else {
-				return new ValidateMethodBindingDstu2(returnType, returnTypeFromRp, theMethod, theContext, theProvider, validate);
+				return new ValidateMethodBindingDstu2Plus(returnType, returnTypeFromRp, theMethod, theContext, theProvider, validate);
 			}
 		} else if (getTags != null) {
 			return new GetTagsMethodBinding(theMethod, theContext, theProvider, getTags);

diff --git a/...st/method/ValidateMethodBindingDstu2.java → ...ethod/ValidateMethodBindingDstu2Plus.java b/...st/method/ValidateMethodBindingDstu2.java → ...ethod/ValidateMethodBindingDstu2Plus.java
@@ -37,9 +37,9 @@
 import ca.uhn.fhir.rest.server.EncodingEnum;
 import ca.uhn.fhir.util.ParametersUtil;
 
-public class ValidateMethodBindingDstu2 extends OperationMethodBinding {
+public class ValidateMethodBindingDstu2Plus extends OperationMethodBinding {
 
-	public ValidateMethodBindingDstu2(Class<?> theReturnResourceType, Class<? extends IBaseResource> theReturnTypeFromRp, Method theMethod, FhirContext theContext, Object theProvider,
+	public ValidateMethodBindingDstu2Plus(Class<?> theReturnResourceType, Class<? extends IBaseResource> theReturnTypeFromRp, Method theMethod, FhirContext theContext, Object theProvider,
 			Validate theAnnotation) {
 		super(theReturnResourceType, theReturnTypeFromRp, theMethod, theContext, theProvider, true, Constants.EXTOP_VALIDATE, theAnnotation.type(), new OperationParam[0], BundleTypeEnum.COLLECTION);