From 1e0647bd36ccd8080555ed4a7d6d78a9a07273c8 Mon Sep 17 00:00:00 2001 From: tsantalis Date: Mon, 8 Jul 2024 16:03:53 -0400 Subject: [PATCH] Use UMLComment.getFullText in method documentation SHA generation --- .../java/org/codetracker/MethodTrackerChangeHistory.java | 4 ++-- src/main/java/org/codetracker/element/Method.java | 2 +- .../java/org/codetracker/blame/CodeTrackerBlameTest.java | 4 ++-- src/test/resources/blame/formatting/codetracker.txt | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/codetracker/MethodTrackerChangeHistory.java b/src/main/java/org/codetracker/MethodTrackerChangeHistory.java index 0e4e9bb07a2..96ce5d1b959 100644 --- a/src/main/java/org/codetracker/MethodTrackerChangeHistory.java +++ b/src/main/java/org/codetracker/MethodTrackerChangeHistory.java @@ -384,8 +384,8 @@ private static boolean checkOperationBodyChanged(OperationBody body1, OperationB } private static boolean checkOperationDocumentationChanged(VariableDeclarationContainer operation1, VariableDeclarationContainer operation2) { - String comments1 = Util.getSHA512(operation1.getComments().stream().map(UMLComment::getText).collect(Collectors.joining(";"))); - String comments2 = Util.getSHA512(operation2.getComments().stream().map(UMLComment::getText).collect(Collectors.joining(";"))); + String comments1 = Util.getSHA512(operation1.getComments().stream().map(UMLComment::getFullText).collect(Collectors.joining(";"))); + String comments2 = Util.getSHA512(operation2.getComments().stream().map(UMLComment::getFullText).collect(Collectors.joining(";"))); return !comments1.equals(comments2); } diff --git a/src/main/java/org/codetracker/element/Method.java b/src/main/java/org/codetracker/element/Method.java index c05ccf12e69..3ce3ae4fe6e 100644 --- a/src/main/java/org/codetracker/element/Method.java +++ b/src/main/java/org/codetracker/element/Method.java @@ -338,7 +338,7 @@ public static String getIdentifierExcludeVersion(UMLInitializer info, boolean co public static String getDocumentsSha512(VariableDeclarationContainer info) { if (info.getComments().isEmpty()) return null; - return Util.getSHA512(info.getComments().stream().map(UMLComment::getText).collect(Collectors.joining(";"))); + return Util.getSHA512(info.getComments().stream().map(UMLComment::getFullText).collect(Collectors.joining(";"))); } public void checkClosingBracket(int lineNumber) { diff --git a/src/test/java/org/codetracker/blame/CodeTrackerBlameTest.java b/src/test/java/org/codetracker/blame/CodeTrackerBlameTest.java index c54c3e4c75d..4407b7e44a2 100644 --- a/src/test/java/org/codetracker/blame/CodeTrackerBlameTest.java +++ b/src/test/java/org/codetracker/blame/CodeTrackerBlameTest.java @@ -43,8 +43,8 @@ private static Stream testBlamerInputProvider(){ String url = "https://github.com/Alluxio/alluxio/commit/9aeefcd8120bb3b89cdb437d8c32d2ed84b8a825"; String filePath = "servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java"; return Stream.of( - Arguments.of(url, filePath, new CodeTrackerBlame(), "/blame/formatting/codetracker.txt"), - Arguments.of(url, filePath, new GitBlame(), "/blame/formatting/git.txt") + Arguments.of(url, filePath, new CodeTrackerBlame(), System.getProperty("user.dir") + "/src/test/resources/blame/formatting/codetracker.txt"), + Arguments.of(url, filePath, new GitBlame(), System.getProperty("user.dir") + "/src/test/resources/blame/formatting/git.txt") ); } @Test diff --git a/src/test/resources/blame/formatting/codetracker.txt b/src/test/resources/blame/formatting/codetracker.txt index 80004638107..2f21b2273dd 100644 --- a/src/test/resources/blame/formatting/codetracker.txt +++ b/src/test/resources/blame/formatting/codetracker.txt @@ -75,9 +75,9 @@ 9aeefcd81 servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-07-09 00:34:26 -0400 75) long maxFreeBytes = blockSize - 1; 68514f3fe servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-06-26 20:52:28 -0400 76) for (StorageDir dir : tier.getStorageDirs()) { 9aeefcd81 servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-07-09 00:34:26 -0400 77) if (dir.getAvailableBytes() > maxFreeBytes) { -9aeefcd81 servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-07-09 00:34:26 -0400 78) maxFreeBytes = dir.getAvailableBytes(); -9aeefcd81 servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-07-09 00:34:26 -0400 79) candidateDir = dir; -9aeefcd81 servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-07-09 00:34:26 -0400 80) } +68514f3fe servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-06-26 20:52:28 -0400 78) maxFreeBytes = dir.getAvailableBytes(); +68514f3fe servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-06-26 20:52:28 -0400 79) candidateDir = dir; +68514f3fe servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-06-26 20:52:28 -0400 80) } 68514f3fe servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-06-26 20:52:28 -0400 81) } 9aeefcd81 servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-07-09 00:34:26 -0400 82) return candidateDir; 9aeefcd81 servers/src/main/java/tachyon/worker/block/allocator/MaxFreeAllocator.java (Carson Wang 2015-07-09 00:34:26 -0400 83) }