Fix blame related tests

jodavimehran · Jul 3, 2024 · b0a7815 · b0a7815
1 parent 04304c0
commit b0a7815
Show file tree

Hide file tree

Showing 6 changed files with 178 additions and 179 deletions.
diff --git a/src/main/java/org/codetracker/blame/model/LineBlameResult.java b/src/main/java/org/codetracker/blame/model/LineBlameResult.java
@@ -77,8 +77,8 @@ public static LineBlameResult of(History.HistoryInfo<? extends CodeElement> late
     public static LineBlameResult of(BlameResult blameResult, int i) {
         if (blameResult == null || i < 0 || i >= blameResult.getResultContents().size()) return null;
         String commitId = blameResult.getSourceCommit(i).getId().name();
-        String committerName = blameResult.getSourceCommit(i).getCommitterIdent().getName();
-        long commitTime = blameResult.getSourceCommit(i).getCommitterIdent().getWhen().getTime();
+        String committerName = blameResult.getSourceCommit(i).getAuthorIdent().getName();
+        long commitTime = blameResult.getSourceCommit(i).getCommitTime();
         String filePath = blameResult.getSourcePath(i);
         return new LineBlameResult(commitId, blameResult.getResultPath(), filePath, committerName, commitTime, i + 1);
     }

diff --git a/src/main/java/org/codetracker/blame/util/TabularPrint.java b/src/main/java/org/codetracker/blame/util/TabularPrint.java
@@ -31,7 +31,9 @@ private static String printRow(String[] row, int[] columnWidths, boolean showBor
                 sb.append(" ");
             }
         }
-        return sb.toString() + "\n";
+        String string = sb.toString();
+        String trimmedString = string.replaceAll("\\s+$", "");
+        return trimmedString + "\n";
     }
 
     private static void printSeparatorLine(int[] columnWidths, boolean showBorders) {

diff --git a/src/test/java/org/codetracker/blame/CodeTrackerBlameTest.java b/src/test/java/org/codetracker/blame/CodeTrackerBlameTest.java
@@ -19,14 +19,12 @@
 import org.refactoringminer.util.GitServiceImpl;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
 import static org.codetracker.blame.util.Utils.getFileContentByCommit;
-import static org.junit.Assert.assertEquals;
 
 /* Created by pourya on 2024-06-26*/
 public class CodeTrackerBlameTest {
@@ -69,9 +67,8 @@ public void testBlameWithLocalRepo() throws Exception {
     }
 
     private void assertEqualWithFile(String expectedResultPath, String actual) throws IOException {
-        InputStream resourceAsStream = this.getClass().getResourceAsStream(expectedResultPath);
         String expected = IOUtils.toString(
-                this.getClass().getResourceAsStream(expectedResultPath),
+                Objects.requireNonNull(this.getClass().getResourceAsStream(expectedResultPath)),
                 StandardCharsets.UTF_8
         );
         Assertions.assertEquals(expected, actual);

diff --git a/src/test/resources/blame/blameTestWithLocalRepo.txt b/src/test/resources/blame/blameTestWithLocalRepo.txt
@@ -35,20 +35,20 @@ e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0
 e5e209d52 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:47 -0500 35)                     logger.info("Case " + case_count + "/" + configuration.getAllCases().size());
 e5e209d52 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:47 -0500 36)                     GridSearch dat = new GridSearch(info, projectASTDiff, rm_astDiff, configuration);
 ba790bfa4 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:48 -0500 37)                     intels.addAll(dat.run(numThreads));
-e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0500 38)                 }
+e5e209d52 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:47 -0500 38)                 }
 ae3a4f8a5 src/main/java/dat/MakeIntels.java (Pouryafard75 2024-06-24 21:47:09 -0400 39)                 intelDao.insertIntels(intels);
 e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0500 40)                 // if (case_count == 2) break;
 e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0500 41)
-e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0500 42) }
+e5e209d52 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:47 -0500 42) }
 e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0500 43)         }
 ba790bfa4 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:48 -0500 44)         catch (Exception e) {
 ba790bfa4 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:48 -0500 45)             logger.error("Error in DAT", e);
 ba790bfa4 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:48 -0500 46)             logger.debug("Error in DAT", e);
 ba790bfa4 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:48 -0500 47)             throw new RuntimeException(e);
-e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0500 48)         }
+ba790bfa4 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:48 -0500 48)         }
 ae3a4f8a5 src/main/java/dat/MakeIntels.java (Pouryafard75 2024-06-24 21:47:09 -0400 49)         finally {
 ae3a4f8a5 src/main/java/dat/MakeIntels.java (Pouryafard75 2024-06-24 21:47:09 -0400 50)             HibernateUtil.shutdown();
-e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0500 51)         }
+ae3a4f8a5 src/main/java/dat/MakeIntels.java (Pouryafard75 2024-06-24 21:47:09 -0400 51)         }
 e5e209d52 src/main/java/dat/Make.java       (Pouryafard75 2024-03-06 20:33:47 -0500 52)         logger.info("DAT finished");
 e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0500 53)
 e5e209d52 src/main/java/rq/RQ7.java         (Pouryafard75 2024-03-06 20:33:47 -0500 54)     }