You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/09/17 11:06:49 UTC
[1/2] git commit: WICKET-4760 JavaScriptStripper fails with single
line comments
Updated Branches:
refs/heads/wicket-1.5.x ac7748671 -> 6eb883dd3
WICKET-4760 JavaScriptStripper fails with single line comments
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6eb883dd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6eb883dd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6eb883dd
Branch: refs/heads/wicket-1.5.x
Commit: 6eb883dd3938c32644f0cbf855427dddd02eaffd
Parents: cf3daed
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 17 11:49:43 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 17 12:06:41 2012 +0300
----------------------------------------------------------------------
.../wicket/util/string/JavaScriptStripper.java | 1 +
.../wicket/util/string/JavaScriptStripperTest.java | 22 +++++++++++----
2 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6eb883dd/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java b/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java
index ced4638..eba098b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/string/JavaScriptStripper.java
@@ -171,6 +171,7 @@ public class JavaScriptStripper
if (c == '\n' || c == '\r')
{
state = REGULAR_TEXT;
+ result.append(c);
continue;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6eb883dd/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java b/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
index 537210a..6932bbb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
@@ -31,7 +31,7 @@ public class JavaScriptStripperTest extends Assert
public void unixWICKET501()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath // expression\n if ( !t.indexOf(\"//\") ) {");
- assertEquals(" if ( !t.indexOf(\"//\") ) {", s);
+ assertEquals(" \n if ( !t.indexOf(\"//\") ) {", s);
}
/** */
@@ -39,7 +39,7 @@ public class JavaScriptStripperTest extends Assert
public void dosWICKET501()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath // expression\r\n if ( !t.indexOf(\"//\") ) {");
- assertEquals(" \nif ( !t.indexOf(\"//\") ) {", s);
+ assertEquals(" \r\nif ( !t.indexOf(\"//\") ) {", s);
}
/** */
@@ -47,7 +47,7 @@ public class JavaScriptStripperTest extends Assert
public void macWICKET501()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace(" // Handle the common XPath // expression\r if ( !t.indexOf(\"//\") ) {");
- assertEquals(" if ( !t.indexOf(\"//\") ) {", s);
+ assertEquals(" \r if ( !t.indexOf(\"//\") ) {", s);
}
/** */
@@ -63,7 +63,7 @@ public class JavaScriptStripperTest extends Assert
public void regexp2()
{
String s = new JavaScriptStripper().stripCommentsAndWhitespace("foo.replace(/\"//*strip me*/, \"\"); // strip me\rdoFoo();");
- assertEquals("foo.replace(/\"/, \"\"); doFoo();", s);
+ assertEquals("foo.replace(/\"/, \"\"); \rdoFoo();", s);
}
/** */
@@ -81,7 +81,7 @@ public class JavaScriptStripperTest extends Assert
{
String before = " attr: /**/ //xyz\n /\\[((?:[\\w-]*:)?[\\w-]+)\\s*(?:([!^$*~|]?=)\\s*((['\"])([^\\4]*?)\\4|([^'\"][^\\]]*?)))?\\]/ after regex";
String after = new JavaScriptStripper().stripCommentsAndWhitespace(before);
- String expected = " attr: /\\[((?:[\\w-]*:)?[\\w-]+)\\s*(?:([!^$*~|]?=)\\s*((['\"])([^\\4]*?)\\4|([^'\"][^\\]]*?)))?\\]/ after regex";
+ String expected = " attr: \n /\\[((?:[\\w-]*:)?[\\w-]+)\\s*(?:([!^$*~|]?=)\\s*((['\"])([^\\4]*?)\\4|([^'\"][^\\]]*?)))?\\]/ after regex";
assertEquals(expected, after);
System.out.println(after);
}
@@ -127,7 +127,17 @@ public class JavaScriptStripperTest extends Assert
assertEquals(expected, after);
}
- /** */
+ /** */
+ @Test
+ public void WICKET4760()
+ {
+ String before = "x++ //\nx++";
+ String after = new JavaScriptStripper().stripCommentsAndWhitespace(before);
+ String expected = "x++ \nx++";
+ assertEquals(expected, after);
+ }
+
+ /** */
// @formatter:off
public static String TESTSTRING2 =
" var test = function () {\n" +