This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch debian/sid in repository jruby-joni.
commit a0150f25eebc7bb06659312a6295171e23828b41 Author: Marcin Mielzynski <[email protected]> Date: Fri Feb 2 20:55:36 2018 +0100 rejigger tests to accomodate for 7 bit matching --- test/org/joni/test/Test.java | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/test/org/joni/test/Test.java b/test/org/joni/test/Test.java index 531d513..992b758 100644 --- a/test/org/joni/test/Test.java +++ b/test/org/joni/test/Test.java @@ -99,6 +99,13 @@ public abstract class Test { xx(pattern, str, from, to, mem, not, option()); } + static boolean is7bit(byte[]bytes, int p, int end) { + for (int i = p; i < end; i++) { + if ((bytes[i] & 0xff) >= 0x80) return false; + } + return true; + } + public int xx(byte[] pattern, byte[] str, int from, int to, int mem, boolean not, int option) throws InterruptedException { Regex reg; @@ -118,12 +125,17 @@ public abstract class Test { return Matcher.FAILED; } - Matcher m = reg.matcher(str, 0, length(str)); - Region region; + int result = check(reg, pattern, str, option, from, to, mem, not); - int r = 0; + return result; + } + + private int check(Regex reg, byte[]pattern, byte[]str, int option, int from, int to, int mem, boolean not) throws InterruptedException { + Matcher m = reg.matcher(str, 0, length(str)); + final Region region; + final int result; try { - r = m.searchInterruptible(0, length(str), option); + result = m.searchInterruptible(0, length(str), option); region = m.getEagerRegion(); } catch (JOniException je) { Config.err.println("Pattern: " + reprTest(pattern, str, option)); @@ -141,7 +153,7 @@ public abstract class Test { return Matcher.FAILED; } - if (r == -1) { + if (result == -1) { if (not) { if (VERBOSE) Config.log.println("OK(NOT): " + reprTest(pattern, str, option)); nsucc++; @@ -164,7 +176,7 @@ public abstract class Test { } } } - return r; + return result; } protected void x2(byte[] pattern, byte[] str, int from, int to) throws InterruptedException { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
