From 24536941c27238336c708ee59b3ebba270d1248c Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Fri, 5 Jul 2019 17:15:02 -0400
Subject: [PATCH] Test the new isEmpty() method on IBundleProvider

---
 .../fhir/rest/api/server/IBundleProvider.java |  2 +-
 .../rest/api/server/IBundleProviderTest.java  | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/api/server/IBundleProviderTest.java

diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IBundleProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IBundleProvider.java
index 888897c5113..024b9092442 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IBundleProvider.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IBundleProvider.java
@@ -158,7 +158,7 @@ public interface IBundleProvider {
 	default boolean isEmpty() {
 		Integer size = size();
 		if (size != null) {
-			return size > 0;
+			return size == 0;
 		}
 		return getResources(0, 1).isEmpty();
 	}
diff --git a/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/api/server/IBundleProviderTest.java b/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/api/server/IBundleProviderTest.java
new file mode 100644
index 00000000000..a2d71d3bdfd
--- /dev/null
+++ b/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/api/server/IBundleProviderTest.java
@@ -0,0 +1,42 @@
+package ca.uhn.fhir.rest.api.server;
+
+import ca.uhn.fhir.rest.server.SimpleBundleProvider;
+import com.google.common.collect.Lists;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+public class IBundleProviderTest {
+
+	@Test
+	public void testIsEmptyDefaultMethod_SizePopulated() {
+		SimpleBundleProvider provider = new SimpleBundleProvider();
+		assertTrue(provider.isEmpty());
+
+		provider = new SimpleBundleProvider(Lists.newArrayList(mock(IBaseResource.class)));
+		assertFalse(provider.isEmpty());
+	}
+
+	@Test
+	public void testIsEmptyDefaultMethod_SizeReturnsNull() {
+		SimpleBundleProvider provider = new SimpleBundleProvider() {
+			@Override
+			public Integer size() {
+				return null;
+			}
+		};
+		assertTrue(provider.isEmpty());
+
+		provider = new SimpleBundleProvider(Lists.newArrayList(mock(IBaseResource.class))) {
+			@Override
+			public Integer size() {
+				return null;
+			}
+		};
+		assertFalse(provider.isEmpty());
+	}
+
+}