Merge branch '1.5.x' into 2.0.x

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/ZipHeaderPeekInputStreamTests.java

@@ -100,4 +100,36 @@ public class ZipHeaderPeekInputStreamTests {
 		}
 	}
 
+	@Test
+	public void readMoreThanEntireStreamWhenStreamLengthIsLessThanZipHeaderLength()
+			throws IOException {
+		try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream(
+				new ByteArrayInputStream(new byte[] { 10 }))) {
+			byte[] bytes = new byte[8];
+			assertThat(in.read(bytes)).isEqualTo(1);
+			assertThat(bytes).containsExactly(10, 0, 0, 0, 0, 0, 0, 0);
+		}
+	}
+
+	@Test
+	public void readMoreThanEntireStreamWhenStreamLengthIsSameAsHeaderLength()
+			throws IOException {
+		try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream(
+				new ByteArrayInputStream(new byte[] { 1, 2, 3, 4 }))) {
+			byte[] bytes = new byte[8];
+			assertThat(in.read(bytes)).isEqualTo(4);
+			assertThat(bytes).containsExactly(1, 2, 3, 4, 0, 0, 0, 0);
+		}
+	}
+
+	@Test
+	public void readMoreThanEntireStreamWhenStreamLengthIsZero() throws IOException {
+		try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream(
+				new ByteArrayInputStream(new byte[0]))) {
+			byte[] bytes = new byte[8];
+			assertThat(in.read(bytes)).isEqualTo(-1);
+			assertThat(bytes).containsExactly(0, 0, 0, 0, 0, 0, 0, 0);
+		}
+	}
+
 }