From ac5e5c953f93dbabe366ca49cb478f7097af1ae2 Mon Sep 17 00:00:00 2001 From: Eva Roddeck Date: Thu, 26 Mar 2026 15:17:22 +0100 Subject: [PATCH 1/2] MCR-2816 redo changes into current main --- .../common/MCRXMLMetadataManagerTest.java | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/mycore-base/src/test/java/org/mycore/datamodel/common/MCRXMLMetadataManagerTest.java b/mycore-base/src/test/java/org/mycore/datamodel/common/MCRXMLMetadataManagerTest.java index a3c1c47343..90b94c3521 100644 --- a/mycore-base/src/test/java/org/mycore/datamodel/common/MCRXMLMetadataManagerTest.java +++ b/mycore-base/src/test/java/org/mycore/datamodel/common/MCRXMLMetadataManagerTest.java @@ -24,12 +24,10 @@ import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayInputStream; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; -import java.nio.file.Files; import java.util.Date; import org.jdom2.Document; @@ -37,7 +35,6 @@ import org.jdom2.input.SAXBuilder; import org.jdom2.output.Format; import org.jdom2.output.XMLOutputter; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -47,11 +44,8 @@ import org.mycore.common.content.MCRByteContent; import org.mycore.datamodel.metadata.MCRObjectID; import org.mycore.datamodel.metadata.MCRObjectIDTest; -import org.mycore.datamodel.niofs.utils.MCRRecursiveDeleter; import org.mycore.test.MCRMetadataExtension; import org.mycore.test.MyCoReTest; -import org.tmatesoft.svn.core.internal.wc.SVNFileUtil; -import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.xml.sax.SAXException; /** @@ -87,25 +81,6 @@ public void setUp() throws Exception { "".getBytes(StandardCharsets.UTF_8), new Date()); } - @AfterEach - public void tearDown(MCRMetadataExtension.BaseDirs baseDirs) throws Exception { - for (File projectDir : baseDirs.storeBaseDir().toFile().listFiles()) { - for (File typeDir : projectDir.listFiles()) { - Files.walkFileTree(typeDir.toPath(), new MCRRecursiveDeleter()); - typeDir.mkdir(); - } - } - for (File projectDir : baseDirs.storeBaseDir().toFile().listFiles()) { - for (File typeDir : projectDir.listFiles()) { - //does not work on Windows (AccessdeniedExceptions): - //Files.walkFileTree(typeDir.toPath(), new MCRRecursiveDeleter()); - SVNFileUtil.deleteAll(typeDir, true); - typeDir.mkdir(); - SVNRepositoryFactory.createLocalRepository(typeDir, true, false); - } - } - } - static Document getDocument(InputStream in) throws JDOMException, IOException { try (in) { return SAX_BUILDER.build(in); From a53d323b8099a488e16716564644d3bdbd263284 Mon Sep 17 00:00:00 2001 From: Eva Roddeck Date: Thu, 26 Mar 2026 16:54:44 +0100 Subject: [PATCH 2/2] MC-2816 skip tearDown on Windos only --- .../common/MCRXMLMetadataManagerTest.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/mycore-base/src/test/java/org/mycore/datamodel/common/MCRXMLMetadataManagerTest.java b/mycore-base/src/test/java/org/mycore/datamodel/common/MCRXMLMetadataManagerTest.java index 90b94c3521..cfbd62c740 100644 --- a/mycore-base/src/test/java/org/mycore/datamodel/common/MCRXMLMetadataManagerTest.java +++ b/mycore-base/src/test/java/org/mycore/datamodel/common/MCRXMLMetadataManagerTest.java @@ -24,17 +24,21 @@ import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayInputStream; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.Date; +import java.util.Locale; import org.jdom2.Document; import org.jdom2.JDOMException; import org.jdom2.input.SAXBuilder; import org.jdom2.output.Format; import org.jdom2.output.XMLOutputter; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -44,8 +48,11 @@ import org.mycore.common.content.MCRByteContent; import org.mycore.datamodel.metadata.MCRObjectID; import org.mycore.datamodel.metadata.MCRObjectIDTest; +import org.mycore.datamodel.niofs.utils.MCRRecursiveDeleter; import org.mycore.test.MCRMetadataExtension; import org.mycore.test.MyCoReTest; +import org.tmatesoft.svn.core.internal.wc.SVNFileUtil; +import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.xml.sax.SAXException; /** @@ -81,6 +88,27 @@ public void setUp() throws Exception { "".getBytes(StandardCharsets.UTF_8), new Date()); } + @AfterEach + public void tearDown(MCRMetadataExtension.BaseDirs baseDirs) throws Exception { + if (!System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows")) { + for (File projectDir : baseDirs.storeBaseDir().toFile().listFiles()) { + for (File typeDir : projectDir.listFiles()) { + Files.walkFileTree(typeDir.toPath(), new MCRRecursiveDeleter()); + typeDir.mkdir(); + } + } + for (File projectDir : baseDirs.storeBaseDir().toFile().listFiles()) { + for (File typeDir : projectDir.listFiles()) { + //does not work on Windows (AccessdeniedExceptions): + //Files.walkFileTree(typeDir.toPath(), new MCRRecursiveDeleter()); + SVNFileUtil.deleteAll(typeDir, true); + typeDir.mkdir(); + SVNRepositoryFactory.createLocalRepository(typeDir, true, false); + } + } + } + } + static Document getDocument(InputStream in) throws JDOMException, IOException { try (in) { return SAX_BUILDER.build(in);