From f310f9f8e6135daaa688a4094f6de874ba0c314a Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Sat, 20 Aug 2022 10:30:15 +0200 Subject: [PATCH] Fix diff parsing and run unit tests (#1190) Closes https://codeberg.org/gitnex/GitNex/issues/1167 The regex didn't match if the raw string starts with a `+` or `-`. Co-authored-by: qwerty287 Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1190 Reviewed-by: M M Arif Co-authored-by: qwerty287 Co-committed-by: qwerty287 --- .woodpecker/check.yml | 5 +++++ app/src/main/java/org/mian/gitnex/helpers/ParseDiff.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/.woodpecker/check.yml b/.woodpecker/check.yml index 3d929904..31ce0882 100644 --- a/.woodpecker/check.yml +++ b/.woodpecker/check.yml @@ -13,3 +13,8 @@ pipeline: settings: file_pattern: "*.java" path: "app/" + + test: + image: alvrme/alpine-android:android-31-jdk11 + commands: + - ./gradlew test diff --git a/app/src/main/java/org/mian/gitnex/helpers/ParseDiff.java b/app/src/main/java/org/mian/gitnex/helpers/ParseDiff.java index 1641bef9..0db62b6c 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/ParseDiff.java +++ b/app/src/main/java/org/mian/gitnex/helpers/ParseDiff.java @@ -43,6 +43,12 @@ public class ParseDiff { Matcher rmMatcher = rmPattern.matcher(raw); Matcher addMatcher = addPattern.matcher(raw); + if(raw.startsWith("+")) { + add++; + } + else if(raw.startsWith("-")) { + rm++; + } while(rmMatcher.find()) rm++; while(addMatcher.find())