Skip to content

Commit

Permalink
Use UMLComment.getFullText in method documentation SHA generation
Browse files Browse the repository at this point in the history
  • Loading branch information
tsantalis committed Jul 8, 2024
1 parent f91237b commit 1e0647b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/main/java/org/codetracker/MethodTrackerChangeHistory.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codetracker/element/Method.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/codetracker/blame/CodeTrackerBlameTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ private static Stream<Arguments> 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
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/blame/formatting/codetracker.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down

0 comments on commit 1e0647b

Please sign in to comment.