Skip to content

MCR-2816 tests changes for current main #2890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
erodde wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

MCR-2816 tests changes for current main #2890

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac5e5c9
MCR-2816 redo changes into current main
erodde Mar 26, 2026
a53d323
MC-2816 skip tearDown on Windos only
erodde Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions mycore-base/src/test/java/org/mycore/datamodel/common/MCRXMLMetadataManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
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;
Expand Down Expand Up @@ -89,19 +90,21 @@ public void setUp() throws Exception {

@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();
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);
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);
}
}
}
}
Expand Down
Loading