bug #3994 Issue with tests in hop-plugins-misc-git on Windows

apache · Aug 19, 2024 · 11a008d · 11a008d
1 parent e193809
commit 11a008d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/plugins/misc/git/pom.xml b/plugins/misc/git/pom.xml
@@ -29,7 +29,7 @@
     <name>Hop Plugins Miscellaneous Git</name>
 
     <properties>
-        <dependency.jgit.revision>6.7.0.202309050840-r</dependency.jgit.revision>
+        <dependency.jgit.revision>6.10.0.202406032230-r</dependency.jgit.revision>
     </properties>
 
     <dependencyManagement>

diff --git a/plugins/misc/git/src/test/java/org/apache/hop/git/model/UIGitTest.java b/plugins/misc/git/src/test/java/org/apache/hop/git/model/UIGitTest.java
@@ -33,6 +33,8 @@
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.util.List;
+import java.util.Objects;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.hop.git.model.revision.ObjectRevision;
@@ -50,6 +52,7 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.transport.RemoteConfig;
 import org.eclipse.jgit.transport.URIish;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -74,6 +77,21 @@ public void setUp() throws Exception {
     db2 = createWorkRepository();
   }
 
+  @Override
+  @After
+  public void tearDown() throws Exception {
+    this.db.close();
+    if(!System.getProperty("os.name").contains("Windows")) {
+      super.tearDown();
+    } else {
+      int lastBackslashIndex = uiGit.getDirectory().lastIndexOf('\\');
+      String updatedPath = uiGit.getDirectory().substring(0, lastBackslashIndex);
+
+      File f = new File(updatedPath);
+      FileUtils.forceDeleteOnExit(f);
+    }
+  }
+
   @Test
   public void testGetBranch() {
     assertEquals("master", uiGit.getBranch());