Author: bdelacretaz
Date: Wed Jul 30 07:48:57 2008
New Revision: 681070
URL: http://svn.apache.org/viewvc?rev=681070&view=rev
Log:
SLING-582 - move StringUtil.flatten to commons/testing to make it reusable
Added:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/util/
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/util/TestStringUtil.java
(with props)
Modified:
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/BodyOnlyScriptFilteredCopyTest.java
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/JsCodeGeneratorTest.java
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/ScriptFilteredCopyTest.java
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/StringUtil.java
Added:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/util/TestStringUtil.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/util/TestStringUtil.java?rev=681070&view=auto
==============================================================================
---
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/util/TestStringUtil.java
(added)
+++
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/util/TestStringUtil.java
Wed Jul 30 07:48:57 2008
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.commons.testing.util;
+
+/** String utilities for testing */
+public class TestStringUtil {
+ static private final String NATIVE_LINE_SEP =
System.getProperty("line.separator");
+
+ /** Replace \n with . in strings to make it easier to compare visually for
testing */
+ public static String flatten(String str) {
+
+ // First replace native line-endings
+ if(str.indexOf(NATIVE_LINE_SEP) >= 0) {
+ str = str.replace(NATIVE_LINE_SEP, ".");
+ }
+
+ // Now find non-native line-endings, e.g. cygwin needs this
+ if(str.indexOf('\n') >= 0) {
+ str = str.replace('\n', '.');
+ }
+
+ return str;
+ }
+}
Propchange:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/util/TestStringUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/util/TestStringUtil.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified:
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/BodyOnlyScriptFilteredCopyTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/BodyOnlyScriptFilteredCopyTest.java?rev=681070&r1=681069&r2=681070&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/BodyOnlyScriptFilteredCopyTest.java
(original)
+++
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/BodyOnlyScriptFilteredCopyTest.java
Wed Jul 30 07:48:57 2008
@@ -24,6 +24,8 @@
import junit.framework.TestCase;
+import org.apache.sling.commons.testing.util.TestStringUtil;
+
/** Test the BodyOnlyScriptFilteredCopy */
public class BodyOnlyScriptFilteredCopyTest extends TestCase {
@@ -32,7 +34,7 @@
private void runTest(String input, String expected) throws IOException {
final StringWriter sw = new StringWriter();
bfc.copy(new StringReader(input), sw);
- assertEquals(StringUtil.flatten(expected),
StringUtil.flatten(sw.toString()));
+ assertEquals(TestStringUtil.flatten(expected),
TestStringUtil.flatten(sw.toString()));
}
public void testNoChanges() throws IOException {
Modified:
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/JsCodeGeneratorTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/JsCodeGeneratorTest.java?rev=681070&r1=681069&r2=681070&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/JsCodeGeneratorTest.java
(original)
+++
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/JsCodeGeneratorTest.java
Wed Jul 30 07:48:57 2008
@@ -26,6 +26,8 @@
import junit.framework.TestCase;
+import org.apache.sling.commons.testing.util.TestStringUtil;
+
/** Test the JsCodeGenerator */
public class JsCodeGeneratorTest extends TestCase {
@@ -53,8 +55,8 @@
generator.generateCode(r, new PrintWriter(result));
assertEquals("Generated code matches expected code",
- StringUtil.flatten(expectedCode.toString().trim()),
- StringUtil.flatten(result.toString().trim())
+ TestStringUtil.flatten(expectedCode.toString().trim()),
+ TestStringUtil.flatten(result.toString().trim())
);
return true;
Modified:
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/ScriptFilteredCopyTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/ScriptFilteredCopyTest.java?rev=681070&r1=681069&r2=681070&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/ScriptFilteredCopyTest.java
(original)
+++
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/ScriptFilteredCopyTest.java
Wed Jul 30 07:48:57 2008
@@ -24,6 +24,8 @@
import junit.framework.TestCase;
+import org.apache.sling.commons.testing.util.TestStringUtil;
+
/** Test the ScriptFilteredCopy */
public class ScriptFilteredCopyTest extends TestCase {
@@ -32,7 +34,7 @@
private void runTest(String input, String expected) throws IOException {
final StringWriter sw = new StringWriter();
sfc.copy(new StringReader(input), sw);
- assertEquals(StringUtil.flatten(expected),
StringUtil.flatten(sw.toString()));
+ assertEquals(TestStringUtil.flatten(expected),
TestStringUtil.flatten(sw.toString()));
}
public void testNoChanges() throws IOException {
Modified:
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/StringUtil.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/StringUtil.java?rev=681070&r1=681069&r2=681070&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/StringUtil.java
(original)
+++
incubator/sling/trunk/scripting/jst/src/test/java/org/apache/sling/scripting/jst/StringUtil.java
Wed Jul 30 07:48:57 2008
@@ -24,24 +24,6 @@
/** Test utilities */
class StringUtil {
- static private final String NATIVE_LINE_SEP =
System.getProperty("line.separator");
-
- /** Replace \n with . in strings to make it easier to compare visually for
testing */
- static String flatten(String str) {
-
- // First replace native line-endings
- if(str.indexOf(NATIVE_LINE_SEP) >= 0) {
- str = str.replace(NATIVE_LINE_SEP, ".");
- }
-
- // Now find non-native line-endings, e.g. cygwin needs this
- if(str.indexOf('\n') >= 0) {
- str = str.replace('\n', '.');
- }
-
- return str;
- }
-
/** Read given Class resource */
static String readClassResource(Class<?> clazz, String path, String
encoding) throws IOException {
final InputStream s = clazz.getResourceAsStream(path);
