You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2026/04/20 09:22:05 UTC
(sling-org-apache-sling-jcr-contentloader) branch master updated: Merge pull request #36 from apache/issue/SLING-13173
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git
The following commit(s) were added to refs/heads/master by this push:
new 06d8dd8 Merge pull request #36 from apache/issue/SLING-13173
06d8dd8 is described below
commit 06d8dd89d979d405debaecafb584bece8f173b3c
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Apr 20 11:22:00 2026 +0200
Merge pull request #36 from apache/issue/SLING-13173
SLING-13173 - Overly broad mocking of Files.class can lead to test failures
---
.../sling/jcr/contentloader/internal/readers/ZipReaderTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/ZipReaderTest.java b/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/ZipReaderTest.java
index dc08e32..729242f 100644
--- a/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/ZipReaderTest.java
+++ b/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/ZipReaderTest.java
@@ -252,7 +252,7 @@ class ZipReaderTest {
try {
final File finalTempFile = ZipReader.createTempFile();
tempFile = finalTempFile;
- try (MockedStatic<Files> filesMock = Mockito.mockStatic(Files.class); ) {
+ try (MockedStatic<Files> filesMock = Mockito.mockStatic(Files.class, CALLS_REAL_METHODS); ) {
filesMock
.when(() -> Files.delete(finalTempFile.toPath()))
.thenThrow(new IOException("simulating ioexception during delete"));
@@ -303,7 +303,7 @@ class ZipReaderTest {
}
});
- try (MockedStatic<Files> filesMock = Mockito.mockStatic(Files.class); ) {
+ try (MockedStatic<Files> filesMock = Mockito.mockStatic(Files.class, CALLS_REAL_METHODS); ) {
filesMock.when(() -> Files.createTempFile("zipentry", ".tmp")).thenReturn(pathMock);
IOException ioe = assertThrows(IOException.class, ZipReader::createTempFile);
assertEquals(expectedMsg, ioe.getMessage());