Author: markt Date: Wed Jun 18 17:59:08 2014 New Revision: 1603553 URL: http://svn.apache.org/r1603553 Log: Correct test method names to reflect what is being tested
Modified: tomcat/trunk/test/javax/el/TestELProcessor.java Modified: tomcat/trunk/test/javax/el/TestELProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestELProcessor.java?rev=1603553&r1=1603552&r2=1603553&view=diff ============================================================================== --- tomcat/trunk/test/javax/el/TestELProcessor.java (original) +++ tomcat/trunk/test/javax/el/TestELProcessor.java Wed Jun 18 17:59:08 2014 @@ -63,7 +63,18 @@ public class TestELProcessor { @Test - public void testDefineFunctionMethod02() throws Exception { + public void testDefineFunctionName01() throws Exception { + ELProcessor elp = new ELProcessor(); + // java.lang should be automatically imported so no need for full class + // name + elp.defineFunction("fn", "toBoolean", "Boolean", "valueOf"); + Assert.assertEquals(Boolean.valueOf(true), + elp.eval("fn:toBoolean(true)")); + } + + + @Test + public void testDefineFunctionName02() throws Exception { ELProcessor elp = new ELProcessor(); elp.defineFunction("fn", "test", "java.lang.Integer", "Integer valueOf(int)"); Assert.assertEquals(Integer.valueOf(1), elp.eval("fn:test(1)")); @@ -71,7 +82,7 @@ public class TestELProcessor { @Test - public void testDefineFunctionMethod03() throws Exception { + public void testDefineFunctionName03() throws Exception { TesterFunctions.resetCallList(); ELProcessor elp = new ELProcessor(); elp.defineFunction("fn", "test", "javax.el.TesterFunctions", "void doIt()"); @@ -81,7 +92,7 @@ public class TestELProcessor { @Test - public void testDefineFunctionMethod04() throws Exception { + public void testDefineFunctionName04() throws Exception { TesterFunctions.resetCallList(); ELProcessor elp = new ELProcessor(); elp.defineFunction("fn", "test", "javax.el.TesterFunctions", "void doIt(int)"); @@ -91,22 +102,11 @@ public class TestELProcessor { @Test - public void testDefineFunctionMethod05() throws Exception { + public void testDefineFunctionName05() throws Exception { TesterFunctions.resetCallList(); ELProcessor elp = new ELProcessor(); elp.defineFunction("fn", "test", "javax.el.TesterFunctions", "void doIt(Integer)"); elp.eval("fn:test(null)"); Assert.assertEquals("C", TesterFunctions.getCallList()); } - - - @Test - public void testDefineFunctionName01() throws Exception { - ELProcessor elp = new ELProcessor(); - // java.lang should be automatically imported so no need for full class - // name - elp.defineFunction("fn", "toBoolean", "Boolean", "valueOf"); - Assert.assertEquals(Boolean.valueOf(true), - elp.eval("fn:toBoolean(true)")); - } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org