From 5f1d3903b029831569bbaed4fb81214d07fbb3e7 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Tue, 8 Oct 2024 22:00:18 +0200 Subject: [PATCH] GH-861 - Polishing. --- .../modulith/junit/diff/FileModificationDetector.java | 2 +- .../junit/diff/WorkingDirectoryChangesDetector.java | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/spring-modulith-junit/src/main/java/org/springframework/modulith/junit/diff/FileModificationDetector.java b/spring-modulith-junit/src/main/java/org/springframework/modulith/junit/diff/FileModificationDetector.java index 1f9234b1..b75129dc 100644 --- a/spring-modulith-junit/src/main/java/org/springframework/modulith/junit/diff/FileModificationDetector.java +++ b/spring-modulith-junit/src/main/java/org/springframework/modulith/junit/diff/FileModificationDetector.java @@ -100,7 +100,7 @@ public interface FileModificationDetector { return new ReferenceCommitDetector(referenceCommit); } - log.info("Using default file modification detector (uncommitted and unpushed changes)."); + log.info("Using default file modification detector (uncommitted and unpushed changes):"); return () -> Stream.of(UncommittedChangesDetector.INSTANCE, UnpushedCommitsDetector.INSTANCE) .flatMap(it -> it.getModifiedFiles()); diff --git a/spring-modulith-junit/src/main/java/org/springframework/modulith/junit/diff/WorkingDirectoryChangesDetector.java b/spring-modulith-junit/src/main/java/org/springframework/modulith/junit/diff/WorkingDirectoryChangesDetector.java index d2df2d7f..e6e1b568 100644 --- a/spring-modulith-junit/src/main/java/org/springframework/modulith/junit/diff/WorkingDirectoryChangesDetector.java +++ b/spring-modulith-junit/src/main/java/org/springframework/modulith/junit/diff/WorkingDirectoryChangesDetector.java @@ -57,13 +57,10 @@ class WorkingDirectoryChangesDetector implements FileModificationDetector { public static WorkingDirectoryChangesDetector of(FileModificationDetector delegate) { var pathToRepo = JGitUtil.withRepository(it -> it.getDirectory().getParent()); - - // someFolder/. - var currentWorkingDirectory = new File(".").getAbsolutePath(); - - // Strip repository base and /. - var repositoryRelative = currentWorkingDirectory.substring(pathToRepo.length() + 1, - currentWorkingDirectory.length() - 2); + var currentWorkingDirectory = new File("").getAbsolutePath(); + var repositoryRelative = !pathToRepo.equals(currentWorkingDirectory) + ? currentWorkingDirectory.substring(pathToRepo.length() + 1) + : ""; return new WorkingDirectoryChangesDetector(delegate, repositoryRelative); }