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 b4b3e6954fa8217974f4dd8090eade3c435147de Author: Marcin Mielżyński <[email protected]> Date: Mon Nov 24 20:36:30 2008 +0000 Make tests using invalid EUC-JP characters only run in VANILLA mode. git-svn-id: http://svn.codehaus.org/jruby/joni/trunk@8122 961051c9-f516-0410-bf72-c9f7e237a7b7 --- test/org/joni/test/Test.java | 4 ++-- test/org/joni/test/TestC.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/org/joni/test/Test.java b/test/org/joni/test/Test.java index 83d12e8..1a9cec6 100644 --- a/test/org/joni/test/Test.java +++ b/test/org/joni/test/Test.java @@ -59,13 +59,13 @@ public abstract class Test { try { reg = new Regex(pattern, 0, length(pattern), option, encoding(), syntax()); } catch (JOniException je) { - Config.err.println("Pattern: " + repr(pattern)); + Config.err.println("Pattern: " + repr(pattern) + " Str: " + repr(str)); je.printStackTrace(Config.err); Config.err.println("ERROR: " + je.getMessage()); nerror++; return; } catch (Exception e) { - Config.err.println("Pattern: " + repr(pattern)); + Config.err.println("Pattern: " + repr(pattern) + " Str: " + repr(str)); e.printStackTrace(Config.err); Config.err.println("SEVERE ERROR: " + e.getMessage()); nerror++; diff --git a/test/org/joni/test/TestC.java b/test/org/joni/test/TestC.java index ca4269f..94f4218 100644 --- a/test/org/joni/test/TestC.java +++ b/test/org/joni/test/TestC.java @@ -21,6 +21,7 @@ package org.joni.test; import org.joni.Option; import org.joni.Syntax; +import org.jcodings.Config; import org.jcodings.Encoding; import org.jcodings.specific.EUCJPEncoding; @@ -452,7 +453,7 @@ public class TestC extends Test { x2s("x((.)*)*x(?i:\\1)\\Z", "0x1x2x1X2", 1, 9); x2s("(?:()|()|()|()|()|())*\\2\\5", "", 0, 0); x2s("(?:()|()|()|(x)|()|())*\\2b\\5", "b", 0, 1); - x2s("\\xED\\xF2", "\u00ed\u0148", 0, 2); + if (Config.VANILLA) x2s("\\xED\\xF2", "\u00ed\u0148", 0, 2); x2s("", "\u00a4\u02d8", 0, 0); x2s("\u00a4\u02d8", "\u00a4\u02d8", 0, 2); ns("\u00a4\u00a4", "\u00a4\u02d8"); @@ -461,7 +462,7 @@ public class TestC extends Test { x2s("\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142", "\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\u0142\u00a4\ [...] x2s("\u00a4\u02d8", "\u00a4\u00a4\u00a4\u02d8", 2, 4); x2s("\u00a4\u00a4\u00a4\u00a6", "\u00a4\u02d8\u00a4\u00a4\u00a4\u00a6", 2, 6); - x2s("\\xca\\xb8", "\u0118\u00b8", 0, 2); + if (Config.VANILLA) x2s("\\xca\\xb8", "\u0118\u00b8", 0, 2); x2s(".", "\u00a4\u02d8", 0, 2); x2s("..", "\u00a4\u00ab\u00a4\u00ad", 0, 4); x2s("\\w", "\u00a4\u015e", 0, 2); @@ -565,7 +566,7 @@ public class TestC extends Test { x2s("(?:\u00a4\u02d8|[\u00a4\u00a6-\u00a4\u00ad])|\u00a4\u00a4\u00a4\u0148", "\u00a4\u00a4\u00a4\u0148", 0, 4); x2s("\u00a4\u02d8\u00a4\u00a4\u00a4\u00a6|(?=\u00a4\u00b1\u00a4\u00b1)..\u00a4\u0170", "\u00a4\u00b1\u00a4\u00b1\u00a4\u0170", 0, 6); x2s("\u00a4\u02d8\u00a4\u00a4\u00a4\u00a6|(?!\u00a4\u00b1\u00a4\u00b1)..\u00a4\u0170", "\u00a4\u02d8\u00a4\u00a4\u00a4\u0170", 0, 6); - x2s("(?=\u00a4\u0148\u00a4\u02d8)..\u00a4\u02d8|(?=\u00a4\u0148\u00a4\u0148)..\u00a4\u02d8", "\u00a4\u0148\u00a4\u0148\u00a4\u02d8", 0, 6); + if (Config.VANILLA) x2s("(?=\u00a4\u0148\u00a4\u02d8)..\u00a4\u02d8|(?=\u00a4\u0148\u00a4\u0148)..\u00a4\u02d8", "\u00a4\u0148\u00a4\u0148\u00a4\u02d8", 0, 6); x2s("(?<=\u00a4\u02d8|\u00a4\u00a4\u00a4\u00a6)\u00a4\u00a4", "\u00a4\u00a4\u00a4\u00a6\u00a4\u00a4", 4, 6); ns("(?>\u00a4\u02d8|\u00a4\u02d8\u00a4\u00a4\u00a4\u00a8)\u00a4\u00a6", "\u00a4\u02d8\u00a4\u00a4\u00a4\u00a8\u00a4\u00a6"); x2s("(?>\u00a4\u02d8\u00a4\u00a4\u00a4\u00a8|\u00a4\u02d8)\u00a4\u00a6", "\u00a4\u02d8\u00a4\u00a4\u00a4\u00a8\u00a4\u00a6", 0, 8); -- 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
