Add tests for package installation with partitioning and null partition ID handling

Author: patrick-werner

hapi-fhir-base/src/test/java/ca/uhn/fhir/interceptor/model/RequestPartitionIdTest.java

@@ -57,11 +57,50 @@ public void testIsDefaultPartition_withPartitionAsParameter() {
 		assertThat(defaultPartition().isPartition(null)).isTrue();
 		assertThat(fromPartitionIds(ourDefaultPartitionId).isPartition(ourDefaultPartitionId)).isTrue();
 
-		assertThat(defaultPartition().isPartition(ourDefaultPartitionId)).isFalse();
+		// Since null partition ID is now treated as 0, defaultPartition() (null) matches ourDefaultPartitionId (0)
+		assertThat(defaultPartition().isPartition(ourDefaultPartitionId)).isTrue();
 		assertThat(allPartitions().isPartition(ourDefaultPartitionId)).isFalse();
 		assertThat(fromPartitionIds(ourDefaultPartitionId, 2).isPartition(ourDefaultPartitionId)).isFalse();
 	}
 
+	@Test
+	public void testIsPartition_NullPartitionIdTreatedAsZero() {
+		// Test that null partition ID in the RequestPartitionId is treated as 0
+		RequestPartitionId partitionWithNull = fromPartitionIds((Integer) null);
+		assertThat(partitionWithNull.isPartition(0)).as("Null partition ID should be treated as 0").isTrue();
+		assertThat(partitionWithNull.isPartition(null)).as("Null should match null").isTrue();
+		assertThat(partitionWithNull.isPartition(1)).as("Null partition ID should not match 1").isFalse();
+
+		// Test that partition ID 0 matches null parameter
+		RequestPartitionId partitionWithZero = fromPartitionIds(0);
+		assertThat(partitionWithZero.isPartition(null)).as("Partition ID 0 should match null parameter").isTrue();
+		assertThat(partitionWithZero.isPartition(0)).as("Partition ID 0 should match 0").isTrue();
+		assertThat(partitionWithZero.isPartition(1)).as("Partition ID 0 should not match 1").isFalse();
+	}
+
+	@Test
+	public void testIsPartition_WithNonNullPartitionIds() {
+		// Test normal partition ID matching
+		RequestPartitionId partition1 = fromPartitionIds(1);
+		assertThat(partition1.isPartition(1)).isTrue();
+		assertThat(partition1.isPartition(0)).isFalse();
+		assertThat(partition1.isPartition(null)).isFalse();
+		assertThat(partition1.isPartition(2)).isFalse();
+
+		// Test with multiple partition IDs (should return false)
+		RequestPartitionId multiPartition = fromPartitionIds(1, 2);
+		assertThat(multiPartition.isPartition(1)).isFalse();
+		assertThat(multiPartition.isPartition(2)).isFalse();
+	}
+
+	@Test
+	public void testIsPartition_WithAllPartitions() {
+		RequestPartitionId allParts = allPartitions();
+		assertThat(allParts.isPartition(0)).isFalse();
+		assertThat(allParts.isPartition(1)).isFalse();
+		assertThat(allParts.isPartition(null)).isFalse();
+	}
+
 	@Test
 	public void testHasDefaultPartition_withDefaultPartitionAsParameter() {
 

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcR4Test.java

@@ -1031,5 +1031,29 @@ public void testInstallR4PackageCircularDependency() throws Exception {
 		assertThat(snapshotMessages).hasSize(5);
 	}
 
+	@Test
+	public void testInstallPackageWithPartitioningEnabled() throws Exception {
+		// Enable partitioning
+		myPartitionSettings.setPartitioningEnabled(true);
+		myPartitionSettings.setDefaultPartitionId(0);
+
+		// Install a package containing CodeSystem resources
+		byte[] bytes = ClasspathUtil.loadResourceAsByteArray("/packages/hl7.fhir.uv.shorthand-0.12.0.tgz");
+		myFakeNpmServlet.responses.put("/hl7.fhir.uv.shorthand/0.12.0", bytes);
+
+		PackageInstallationSpec spec = new PackageInstallationSpec()
+			.setName("hl7.fhir.uv.shorthand")
+			.setVersion("0.12.0")
+			.setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL);
+
+		// This should not throw an exception about non-partitionable resources
+		myPackageInstallerSvc.install(spec);
+
+		// Verify the package was installed successfully
+		runInTransaction(() -> {
+			assertTrue(myPackageVersionDao.findByPackageIdAndVersion("hl7.fhir.uv.shorthand", "0.12.0").isPresent());
+		});
+	}
+
 
 }