From dba470f8d607a3accecd01eb85dec07bbc320ffd Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Tue, 14 Jun 2016 07:24:03 -0500
Subject: [PATCH] Add some tests

---
 .../uhn/fhir/model/primitive/DecimalDt.java   |  2 +-
 .../fhir/rest/method/OperationParameter.java  |  2 +-
 .../fhir/model/primitive/DecimalDtTest.java   | 53 +++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/primitive/DecimalDtTest.java

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DecimalDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DecimalDt.java
index bc842477a26..64c4c0e16a1 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DecimalDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/DecimalDt.java
@@ -78,7 +78,7 @@ public class DecimalDt extends BasePrimitive<BigDecimal> implements Comparable<D
 		if (getValue() == null && theObj.getValue() == null) {
 			return 0;
 		}
-		if (getValue() != null && theObj.getValue() == null) {
+		if (getValue() != null && (theObj == null || theObj.getValue() == null)) {
 			return 1;
 		}
 		if (getValue() == null && theObj.getValue() != null) {
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/OperationParameter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/OperationParameter.java
index 4f2ba806354..7891baea880 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/OperationParameter.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/OperationParameter.java
@@ -65,7 +65,7 @@ import ca.uhn.fhir.util.FhirTerser;
 import ca.uhn.fhir.util.ParametersUtil;
 import ca.uhn.fhir.util.ReflectionUtil;
 
-class OperationParameter implements IParameter {
+public class OperationParameter implements IParameter {
 
 	@SuppressWarnings("unchecked")
 	private static final Class<? extends IQueryParameterType>[] COMPOSITE_TYPES = new Class[0];
diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/primitive/DecimalDtTest.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/primitive/DecimalDtTest.java
new file mode 100644
index 00000000000..83dc32b4251
--- /dev/null
+++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/primitive/DecimalDtTest.java
@@ -0,0 +1,53 @@
+package ca.uhn.fhir.model.primitive;
+
+import static org.junit.Assert.*;
+
+import java.math.RoundingMode;
+
+import org.junit.Test;
+
+public class DecimalDtTest {
+
+	@Test
+	public void testRoundWithMode() {
+		DecimalDt dt = new DecimalDt("1.66666666");
+		dt.round(3, RoundingMode.FLOOR);
+		assertEquals("1.66", dt.getValueAsString());
+	}
+	
+	@Test
+	public void testGetValue() {
+		DecimalDt dt = new DecimalDt("1.66666666");
+		assertEquals(1, dt.getValueAsInteger());
+		assertEquals("1.66666666", dt.getValueAsNumber().toString());
+		assertEquals("1.66666666", dt.getValueAsString());
+	}
+
+	@Test
+	public void testSetValue() {
+		DecimalDt dt = new DecimalDt();
+		dt.setValueAsInteger(123);
+		assertEquals("123", dt.getValueAsString());
+	}
+
+	@Test
+	public void testRound() {
+		DecimalDt dt = new DecimalDt("1.66666666");
+		dt.round(3);
+		assertEquals("1.67", dt.getValueAsString());
+	}
+	
+	@Test
+	public void testCompareTo() {
+		DecimalDt dt = new DecimalDt("1.66666666");
+		assertEquals(1, dt.compareTo(null));
+		assertEquals(1, dt.compareTo(new DecimalDt()));
+		assertEquals(1, dt.compareTo(new DecimalDt("0.1")));
+		assertEquals(-1, dt.compareTo(new DecimalDt("99")));
+		assertEquals(0, dt.compareTo(new DecimalDt("1.66666666")));
+		assertEquals(0, new DecimalDt().compareTo(new DecimalDt()));
+		assertEquals(-1, new DecimalDt().compareTo(new DecimalDt("1.0")));
+	}
+	
+	
+}