carnold 2005/02/11 15:33:38
Modified: tests/src/java/org/apache/log4j/helpers
OptionSubstitutionTest.java
Log:
Bug 22894(Backslashes): moving strip method to FileAppender, reverting
OptionConverter
Revision Changes Path
1.5 +11 -10
logging-log4j/tests/src/java/org/apache/log4j/helpers/OptionSubstitutionTest.java
Index: OptionSubstitutionTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/helpers/OptionSubstitutionTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OptionSubstitutionTest.java 11 Feb 2005 21:17:11 -0000 1.4
+++ OptionSubstitutionTest.java 11 Feb 2005 23:33:38 -0000 1.5
@@ -5,12 +5,12 @@
import junit.framework.TestSuite;
import junit.framework.Test;
import java.util.Properties;
+import org.apache.log4j.FileAppender;
/**
* Test variable substitution code in OptionConverter.substVars method.
*
* @author Ceki Gülcü
- * @author Curt Arnold
*
* @since 1.0
*/
@@ -129,27 +129,28 @@
}
/**
- * Tests OptionsConverter.stripDuplicateBackslashes
- *
+ * Tests FileAppender.stripDuplicateBackslashes.
+ * @remarks This should be moved to a FileAppenderTestCase
+ *
* @since 1.3
*/
public void testStripDuplicateBackslashes() {
- assertEquals("\\foo\\bar\\foo",
OptionConverter.stripDuplicateBackslashes("\\foo\\bar\\foo"));
- assertEquals("\\foo\\bar\\foo\\",
OptionConverter.stripDuplicateBackslashes("\\\\foo\\\\bar\\\\foo\\\\"));
- assertEquals("\\foo\\bar\\foo\\",
OptionConverter.stripDuplicateBackslashes("\\foo\\bar\\foo\\"));
+ assertEquals("\\foo\\bar\\foo",
FileAppender.stripDuplicateBackslashes("\\foo\\bar\\foo"));
+ assertEquals("\\foo\\bar\\foo\\",
FileAppender.stripDuplicateBackslashes("\\\\foo\\\\bar\\\\foo\\\\"));
+ assertEquals("\\foo\\bar\\foo\\",
FileAppender.stripDuplicateBackslashes("\\foo\\bar\\foo\\"));
//
// UNC's should either start with two backslashes and contain
additional singles
// or four back slashes and addition doubles
- assertEquals("\\\\foo\\bar\\foo",
OptionConverter.stripDuplicateBackslashes("\\\\\\\\foo\\\\bar\\\\foo"));
- assertEquals("\\\\foo\\bar\\foo",
OptionConverter.stripDuplicateBackslashes("\\\\foo\\bar\\foo"));
+ assertEquals("\\\\foo\\bar\\foo",
FileAppender.stripDuplicateBackslashes("\\\\\\\\foo\\\\bar\\\\foo"));
+ assertEquals("\\\\foo\\bar\\foo",
FileAppender.stripDuplicateBackslashes("\\\\foo\\bar\\foo"));
//
// it it starts with doubles but has no other path component
// then it is a file path
- assertEquals("\\foo.log",
OptionConverter.stripDuplicateBackslashes("\\\\foo.log"));
+ assertEquals("\\foo.log",
FileAppender.stripDuplicateBackslashes("\\\\foo.log"));
//
// it it starts with quads but has no other path component
// then it is a UNC
- assertEquals("\\\\foo.log",
OptionConverter.stripDuplicateBackslashes("\\\\\\\\foo.log"));
+ assertEquals("\\\\foo.log",
FileAppender.stripDuplicateBackslashes("\\\\\\\\foo.log"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
