Modified: logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogMFTest.java URL: http://svn.apache.org/viewcvs/logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogMFTest.java?rev=369909&r1=369908&r2=369909&view=diff ============================================================================== --- logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogMFTest.java (original) +++ logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogMFTest.java Tue Jan 17 12:40:12 2006 @@ -15,10 +15,13 @@ */ package org.apache.log4j.formatter; + import junit.framework.TestCase; import org.apache.log4j.Logger; import org.apache.log4j.Level; import org.apache.log4j.LogManager; +import java.text.MessageFormat; +import java.util.Date; /** * Unit test for LogMF. @@ -51,7 +54,7 @@ */ public void testDebugNullPattern() { LogCapture capture = new LogCapture(Level.DEBUG); - LogMF.debug(logger, null); + LogMF.debug(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -60,7 +63,7 @@ */ public void testDebugNoArg() { LogCapture capture = new LogCapture(Level.DEBUG); - LogMF.debug(logger, "Hello, World"); + LogMF.debug(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -69,7 +72,7 @@ */ public void testDebugBadPattern() { LogCapture capture = new LogCapture(Level.DEBUG); - LogMF.debug(logger, "Hello, {."); + LogMF.debug(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -78,7 +81,7 @@ */ public void testDebugMissingArg() { LogCapture capture = new LogCapture(Level.DEBUG); - LogMF.debug(logger, "Hello, {0}World"); + LogMF.debug(logger, "Hello, {0}World", new Object[0]); assertEquals("Hello, {0}World", capture.getMessage()); } @@ -165,9 +168,10 @@ */ public void testDebugFloat() { LogCapture capture = new LogCapture(Level.DEBUG); - float val = 3.14f; - LogMF.debug(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.debug(logger, "Iteration {0}", (float) Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Float(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -175,9 +179,10 @@ */ public void testDebugDouble() { LogCapture capture = new LogCapture(Level.DEBUG); - double val = 3.14; - LogMF.debug(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.debug(logger, "Iteration {0}", Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Double(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -200,6 +205,16 @@ } /** + * Test LogMF.debug with four arguments. + */ + public void testDebugFourArg() { + LogCapture capture = new LogCapture(Level.DEBUG); + LogMF.debug(logger, "{1}{2} {0}{3}", + "World", "Hello", ",", "."); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** * Test LogMF.debug with Object[] argument. */ public void testDebugArrayArg() { @@ -210,6 +225,18 @@ } /** + * Test LogMF.debug with single field pattern with double argument. + */ + public void testDebugDate() { + LogCapture capture = new LogCapture(Level.DEBUG); + Date epoch = new Date(0); + LogMF.debug(logger, "Iteration {0}", epoch); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { epoch }); + assertEquals(expected, capture.getMessage()); + } + + /** * Test LogMF.debug with null Object[] argument. */ public void testDebugNullArrayArg() { @@ -219,12 +246,38 @@ assertEquals("{1}{2} {0}{3}", capture.getMessage()); } + + public void testDebugPercent() { + LogCapture capture = new LogCapture(Level.DEBUG); + LogMF.debug(logger, "{0, number, percent}", Math.PI); + String expected = java.text.MessageFormat.format( + "{0, number, percent}", + new Object[] { new Double(Math.PI) }); + assertEquals(expected, capture.getMessage()); + } + + public void testDebugFullPrecisionAndPercent() { + LogCapture capture = new LogCapture(Level.DEBUG); + LogMF.debug(logger, "{0}{0, number, percent}", Math.PI); + String expected = java.text.MessageFormat.format( + "{0}{0, number, percent}", + new Object[] { new Double(Math.PI) }); + assertEquals(expected, capture.getMessage()); + } + + public void testDebugQuoted() { + LogCapture capture = new LogCapture(Level.DEBUG); + LogMF.debug(logger, "'{0}'", "World"); + assertEquals("{0}", capture.getMessage()); + + } + /** * Test LogMF.info with null pattern. */ public void testInfoNullPattern() { LogCapture capture = new LogCapture(Level.INFO); - LogMF.info(logger, null); + LogMF.info(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -233,7 +286,7 @@ */ public void testInfoNoArg() { LogCapture capture = new LogCapture(Level.INFO); - LogMF.info(logger, "Hello, World"); + LogMF.info(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -242,7 +295,7 @@ */ public void testInfoBadPattern() { LogCapture capture = new LogCapture(Level.INFO); - LogMF.info(logger, "Hello, {."); + LogMF.info(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -251,7 +304,7 @@ */ public void testInfoMissingArg() { LogCapture capture = new LogCapture(Level.INFO); - LogMF.info(logger, "Hello, {0}World"); + LogMF.info(logger, "Hello, {0}World", new Object[0]); assertEquals("Hello, {0}World", capture.getMessage()); } @@ -338,9 +391,10 @@ */ public void testInfoFloat() { LogCapture capture = new LogCapture(Level.INFO); - float val = 3.14f; - LogMF.info(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.info(logger, "Iteration {0}", (float) Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Float(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -348,9 +402,10 @@ */ public void testInfoDouble() { LogCapture capture = new LogCapture(Level.INFO); - double val = 3.14; - LogMF.info(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.info(logger, "Iteration {0}", Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Double(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -373,6 +428,16 @@ } /** + * Test LogMF.info with four arguments. + */ + public void testInfoFourArg() { + LogCapture capture = new LogCapture(Level.INFO); + LogMF.info(logger, "{1}{2} {0}{3}", + "World", "Hello", ",", "."); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** * Test LogMF.info with Object[] argument. */ public void testInfoArrayArg() { @@ -387,7 +452,7 @@ */ public void testWarnNullPattern() { LogCapture capture = new LogCapture(Level.WARN); - LogMF.warn(logger, null); + LogMF.warn(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -396,7 +461,7 @@ */ public void testWarnNoArg() { LogCapture capture = new LogCapture(Level.WARN); - LogMF.warn(logger, "Hello, World"); + LogMF.warn(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -405,7 +470,7 @@ */ public void testWarnBadPattern() { LogCapture capture = new LogCapture(Level.WARN); - LogMF.warn(logger, "Hello, {."); + LogMF.warn(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -414,7 +479,7 @@ */ public void testWarnMissingArg() { LogCapture capture = new LogCapture(Level.WARN); - LogMF.warn(logger, "Hello, {0}World"); + LogMF.warn(logger, "Hello, {0}World", new Object[0]); assertEquals("Hello, {0}World", capture.getMessage()); } @@ -501,9 +566,10 @@ */ public void testWarnFloat() { LogCapture capture = new LogCapture(Level.WARN); - float val = 3.14f; - LogMF.warn(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.warn(logger, "Iteration {0}", (float) Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Float(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -511,9 +577,10 @@ */ public void testWarnDouble() { LogCapture capture = new LogCapture(Level.WARN); - double val = 3.14; - LogMF.warn(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.warn(logger, "Iteration {0}", Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Double(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -536,6 +603,16 @@ } /** + * Test LogMF.debug with four arguments. + */ + public void testWarnFourArg() { + LogCapture capture = new LogCapture(Level.WARN); + LogMF.warn(logger, "{1}{2} {0}{3}", + "World", "Hello", ",", "."); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** * Test LogMF.warn with Object[] argument. */ public void testWarnArrayArg() { @@ -550,7 +627,7 @@ */ public void testErrorNullPattern() { LogCapture capture = new LogCapture(Level.ERROR); - LogMF.error(logger, null); + LogMF.error(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -559,7 +636,7 @@ */ public void testErrorNoArg() { LogCapture capture = new LogCapture(Level.ERROR); - LogMF.error(logger, "Hello, World"); + LogMF.error(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -568,7 +645,7 @@ */ public void testErrorBadPattern() { LogCapture capture = new LogCapture(Level.ERROR); - LogMF.error(logger, "Hello, {."); + LogMF.error(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -577,7 +654,7 @@ */ public void testErrorMissingArg() { LogCapture capture = new LogCapture(Level.ERROR); - LogMF.error(logger, "Hello, {0}World"); + LogMF.error(logger, "Hello, {0}World", new Object[0]); assertEquals("Hello, {0}World", capture.getMessage()); } @@ -664,9 +741,10 @@ */ public void testErrorFloat() { LogCapture capture = new LogCapture(Level.ERROR); - float val = 3.14f; - LogMF.error(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.error(logger, "Iteration {0}", (float) Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Float(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -674,9 +752,10 @@ */ public void testErrorDouble() { LogCapture capture = new LogCapture(Level.ERROR); - double val = 3.14; - LogMF.error(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.error(logger, "Iteration {0}", Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Double(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -699,6 +778,16 @@ } /** + * Test LogMF.error with four arguments. + */ + public void testErrorFourArg() { + LogCapture capture = new LogCapture(Level.ERROR); + LogMF.error(logger, "{1}{2} {0}{3}", + "World", "Hello", ",", "."); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** * Test LogMF.error with Object[] argument. */ public void testErrorArrayArg() { @@ -713,7 +802,7 @@ */ public void testFatalNullPattern() { LogCapture capture = new LogCapture(Level.FATAL); - LogMF.fatal(logger, null); + LogMF.fatal(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -722,7 +811,7 @@ */ public void testFatalNoArg() { LogCapture capture = new LogCapture(Level.FATAL); - LogMF.fatal(logger, "Hello, World"); + LogMF.fatal(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -731,7 +820,7 @@ */ public void testFatalBadPattern() { LogCapture capture = new LogCapture(Level.FATAL); - LogMF.fatal(logger, "Hello, {."); + LogMF.fatal(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -740,7 +829,7 @@ */ public void testFatalMissingArg() { LogCapture capture = new LogCapture(Level.FATAL); - LogMF.fatal(logger, "Hello, {0}World"); + LogMF.fatal(logger, "Hello, {0}World", new Object[0]); assertEquals("Hello, {0}World", capture.getMessage()); } @@ -827,9 +916,10 @@ */ public void testFatalFloat() { LogCapture capture = new LogCapture(Level.FATAL); - float val = 3.14f; - LogMF.fatal(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.fatal(logger, "Iteration {0}", (float) Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Float(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -837,9 +927,10 @@ */ public void testFatalDouble() { LogCapture capture = new LogCapture(Level.FATAL); - double val = 3.14; - LogMF.fatal(logger, "Iteration {0}", val); - assertEquals("Iteration 3.14", capture.getMessage()); + LogMF.fatal(logger, "Iteration {0}", Math.PI); + String expected = MessageFormat.format("Iteration {0}", + new Object[] { new Double(Math.PI) }); + assertEquals(expected, capture.getMessage()); } /** @@ -858,6 +949,16 @@ public void testFatalThreeArg() { LogCapture capture = new LogCapture(Level.FATAL); LogMF.fatal(logger, "{1}{2} {0}.", "World", "Hello", ","); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** + * Test LogMF.fatal with four arguments. + */ + public void testFatalFourArg() { + LogCapture capture = new LogCapture(Level.FATAL); + LogMF.fatal(logger, "{1}{2} {0}{3}", + "World", "Hello", ",", "."); assertEquals("Hello, World.", capture.getMessage()); }
Modified: logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogMFTraceTest.java URL: http://svn.apache.org/viewcvs/logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogMFTraceTest.java?rev=369909&r1=369908&r2=369909&view=diff ============================================================================== --- logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogMFTraceTest.java (original) +++ logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogMFTraceTest.java Tue Jan 17 12:40:12 2006 @@ -52,7 +52,7 @@ public void testTraceNullPattern() { LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); - LogMF.trace(logger, null); + LogMF.trace(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -62,7 +62,7 @@ public void testTraceNoArg() { LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); - LogMF.trace(logger, "Hello, World"); + LogMF.trace(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -72,7 +72,7 @@ public void testTraceBadPattern() { LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); - LogMF.trace(logger, "Hello, {."); + LogMF.trace(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -82,7 +82,7 @@ public void testTraceMissingArg() { LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); - LogMF.trace(logger, "Hello, {0}World"); + LogMF.trace(logger, "Hello, {0}World", new Object[0]); assertEquals("Hello, {0}World", capture.getMessage()); } @@ -212,6 +212,16 @@ LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); LogMF.trace(logger, "{1}{2} {0}.", "World", "Hello", ","); + assertEquals("Hello, World.", capture.getMessage()); + } + /** + * Test LogMF.trace with four arguments. + */ + public void testTraceFourArg() { + LogCapture capture = new LogCapture(Level.TRACE); + logger.setLevel(Level.TRACE); + LogMF.trace(logger, "{1}{2} {0}{3}", + "World", "Hello", ",", "."); assertEquals("Hello, World.", capture.getMessage()); } Modified: logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogSFTest.java URL: http://svn.apache.org/viewcvs/logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogSFTest.java?rev=369909&r1=369908&r2=369909&view=diff ============================================================================== --- logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogSFTest.java (original) +++ logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogSFTest.java Tue Jan 17 12:40:12 2006 @@ -51,7 +51,7 @@ */ public void testDebugNullPattern() { LogCapture capture = new LogCapture(Level.DEBUG); - LogSF.debug(logger, null); + LogSF.debug(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -60,7 +60,7 @@ */ public void testDebugNoArg() { LogCapture capture = new LogCapture(Level.DEBUG); - LogSF.debug(logger, "Hello, World"); + LogSF.debug(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -69,7 +69,7 @@ */ public void testDebugBadPattern() { LogCapture capture = new LogCapture(Level.DEBUG); - LogSF.debug(logger, "Hello, {."); + LogSF.debug(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -78,7 +78,7 @@ */ public void testDebugMissingArg() { LogCapture capture = new LogCapture(Level.DEBUG); - LogSF.debug(logger, "Hello, {}World"); + LogSF.debug(logger, "Hello, {}World", new Object[0]); assertEquals("Hello, {}World", capture.getMessage()); } @@ -200,6 +200,15 @@ } /** + * Test LogSF.debug with four arguments. + */ + public void testDebugFourArg() { + LogCapture capture = new LogCapture(Level.DEBUG); + LogSF.debug(logger, "{}{} {}{}", "Hello", ",", "World", "."); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** * Test LogSF.debug with Object[] argument. */ public void testDebugArrayArg() { @@ -224,7 +233,7 @@ */ public void testInfoNullPattern() { LogCapture capture = new LogCapture(Level.INFO); - LogSF.info(logger, null); + LogSF.info(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -233,7 +242,7 @@ */ public void testInfoNoArg() { LogCapture capture = new LogCapture(Level.INFO); - LogSF.info(logger, "Hello, World"); + LogSF.info(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -242,7 +251,7 @@ */ public void testInfoBadPattern() { LogCapture capture = new LogCapture(Level.INFO); - LogSF.info(logger, "Hello, {."); + LogSF.info(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -251,7 +260,7 @@ */ public void testInfoMissingArg() { LogCapture capture = new LogCapture(Level.INFO); - LogSF.info(logger, "Hello, {}World"); + LogSF.info(logger, "Hello, {}World", new Object[0]); assertEquals("Hello, {}World", capture.getMessage()); } @@ -387,7 +396,7 @@ */ public void testWarnNullPattern() { LogCapture capture = new LogCapture(Level.WARN); - LogSF.warn(logger, null); + LogSF.warn(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -396,7 +405,7 @@ */ public void testWarnNoArg() { LogCapture capture = new LogCapture(Level.WARN); - LogSF.warn(logger, "Hello, World"); + LogSF.warn(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -405,7 +414,7 @@ */ public void testWarnBadPattern() { LogCapture capture = new LogCapture(Level.WARN); - LogSF.warn(logger, "Hello, {."); + LogSF.warn(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -414,7 +423,7 @@ */ public void testWarnMissingArg() { LogCapture capture = new LogCapture(Level.WARN); - LogSF.warn(logger, "Hello, {}World"); + LogSF.warn(logger, "Hello, {}World", new Object[0]); assertEquals("Hello, {}World", capture.getMessage()); } @@ -538,6 +547,16 @@ /** * Test LogSF.warn with Object[] argument. */ + public void testWarnFourArg() { + LogCapture capture = new LogCapture(Level.WARN); + LogSF.warn(logger, "{}{} {}{}", + "Hello", ",", "World", "." ); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** + * Test LogSF.warn with Object[] argument. + */ public void testWarnArrayArg() { LogCapture capture = new LogCapture(Level.WARN); Object[] args = new Object[] { "Hello", ",", "World", "." }; @@ -550,7 +569,7 @@ */ public void testErrorNullPattern() { LogCapture capture = new LogCapture(Level.ERROR); - LogSF.error(logger, null); + LogSF.error(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -559,7 +578,7 @@ */ public void testErrorNoArg() { LogCapture capture = new LogCapture(Level.ERROR); - LogSF.error(logger, "Hello, World"); + LogSF.error(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -568,7 +587,7 @@ */ public void testErrorBadPattern() { LogCapture capture = new LogCapture(Level.ERROR); - LogSF.error(logger, "Hello, {."); + LogSF.error(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -577,7 +596,7 @@ */ public void testErrorMissingArg() { LogCapture capture = new LogCapture(Level.ERROR); - LogSF.error(logger, "Hello, {}World"); + LogSF.error(logger, "Hello, {}World", new Object[0]); assertEquals("Hello, {}World", capture.getMessage()); } @@ -699,6 +718,15 @@ } /** + * Test LogSF.error with four arguments. + */ + public void testErrorFourArg() { + LogCapture capture = new LogCapture(Level.ERROR); + LogSF.error(logger, "{}{} {}{}", "Hello", ",", "World", "."); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** * Test LogSF.error with Object[] argument. */ public void testErrorArrayArg() { @@ -713,7 +741,7 @@ */ public void testFatalNullPattern() { LogCapture capture = new LogCapture(Level.FATAL); - LogSF.fatal(logger, null); + LogSF.fatal(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -722,7 +750,7 @@ */ public void testFatalNoArg() { LogCapture capture = new LogCapture(Level.FATAL); - LogSF.fatal(logger, "Hello, World"); + LogSF.fatal(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -731,7 +759,7 @@ */ public void testFatalBadPattern() { LogCapture capture = new LogCapture(Level.FATAL); - LogSF.fatal(logger, "Hello, {."); + LogSF.fatal(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -740,7 +768,7 @@ */ public void testFatalMissingArg() { LogCapture capture = new LogCapture(Level.FATAL); - LogSF.fatal(logger, "Hello, {}World"); + LogSF.fatal(logger, "Hello, {}World", new Object[0]); assertEquals("Hello, {}World", capture.getMessage()); } @@ -858,6 +886,15 @@ public void testFatalThreeArg() { LogCapture capture = new LogCapture(Level.FATAL); LogSF.fatal(logger, "{}{} {}.", "Hello", ",", "World"); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** + * Test LogSF.fatal with four arguments. + */ + public void testFatalFourArg() { + LogCapture capture = new LogCapture(Level.FATAL); + LogSF.fatal(logger, "{}{} {}{}", "Hello", ",", "World", "." ); assertEquals("Hello, World.", capture.getMessage()); } Modified: logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogSFTraceTest.java URL: http://svn.apache.org/viewcvs/logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogSFTraceTest.java?rev=369909&r1=369908&r2=369909&view=diff ============================================================================== --- logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogSFTraceTest.java (original) +++ logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/LogSFTraceTest.java Tue Jan 17 12:40:12 2006 @@ -52,7 +52,7 @@ public void testTraceNullPattern() { LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); - LogSF.trace(logger, null); + LogSF.trace(logger, null, Math.PI); assertNull(capture.getMessage()); } @@ -62,7 +62,7 @@ public void testTraceNoArg() { LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); - LogSF.trace(logger, "Hello, World"); + LogSF.trace(logger, "Hello, World", Math.PI); assertEquals("Hello, World", capture.getMessage()); } @@ -72,7 +72,7 @@ public void testTraceBadPattern() { LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); - LogSF.trace(logger, "Hello, {."); + LogSF.trace(logger, "Hello, {.", Math.PI); assertEquals("Hello, {.", capture.getMessage()); } @@ -82,7 +82,7 @@ public void testTraceMissingArg() { LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); - LogSF.trace(logger, "Hello, {}World"); + LogSF.trace(logger, "Hello, {}World", new Object[0]); assertEquals("Hello, {}World", capture.getMessage()); } @@ -212,6 +212,16 @@ LogCapture capture = new LogCapture(Level.TRACE); logger.setLevel(Level.TRACE); LogSF.trace(logger, "{}{} {}.", "Hello", ",", "World"); + assertEquals("Hello, World.", capture.getMessage()); + } + + /** + * Test LogSF.trace with Object[] argument. + */ + public void testTraceFourArg() { + LogCapture capture = new LogCapture(Level.TRACE); + logger.setLevel(Level.TRACE); + LogSF.trace(logger, "{}{} {}{}", "Hello", ",", "World", "."); assertEquals("Hello, World.", capture.getMessage()); } Modified: logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/PerformanceTest.java URL: http://svn.apache.org/viewcvs/logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/PerformanceTest.java?rev=369909&r1=369908&r2=369909&view=diff ============================================================================== --- logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/PerformanceTest.java (original) +++ logging/sandbox/log4j/formatter/src/test/java/org/apache/log4j/formatter/PerformanceTest.java Tue Jan 17 12:40:12 2006 @@ -2,7 +2,6 @@ import junit.framework.TestCase; -import org.apache.log4j.varia.NullAppender; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
