Author: ebourg Date: Sat Mar 25 00:35:04 2017 New Revision: 1788591 URL: http://svn.apache.org/viewvc?rev=1788591&view=rev Log: Moved the @Test annotations to a separate line
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/IssuesTest.java commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/IssuesTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/IssuesTest.java?rev=1788591&r1=1788590&r2=1788591&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/IssuesTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/IssuesTest.java Sat Mar 25 00:35:04 2017 @@ -813,7 +813,8 @@ public class IssuesTest extends JexlTest Assert.assertEquals("EXPR01 result", 22, result); } -// @Test public void test138() throws Exception { +// @Test +// public void test138() throws Exception { // MapContext ctxt = new MapContext(); // ctxt.set("tz", java.util.TimeZone.class); // String source = "" Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java?rev=1788591&r1=1788590&r2=1788591&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java Sat Mar 25 00:35:04 2017 @@ -727,7 +727,8 @@ public class JXLTTest extends JexlTestCa } // // -// @Test public void testDeferredTemplate() throws Exception { +// @Test +// public void testDeferredTemplate() throws Exception { // JxltEngine.Template t = JXLT.createTemplate("$$", new StringReader( // "select * from \n"+ // "##for(var c : tables) {\n"+ Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java?rev=1788591&r1=1788590&r2=1788591&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PropertyAccessTest.java Sat Mar 25 00:35:04 2017 @@ -46,7 +46,8 @@ public class PropertyAccessTest extends asserter = new Asserter(JEXL); } - @Test public void testPropertyProperty() throws Exception { + @Test + public void testPropertyProperty() throws Exception { Integer i42 = Integer.valueOf(42); Integer i43 = Integer.valueOf(43); String s42 = "fourty-two"; @@ -133,7 +134,8 @@ public class PropertyAccessTest extends } } - @Test public void testInnerViaArithmetic() throws Exception { + @Test + public void testInnerViaArithmetic() throws Exception { PropertyArithmetic pa = new PropertyArithmetic(true); JexlEngine jexl = new JexlBuilder().arithmetic(pa).debug(true).strict(true).cache(32).create(); PropertyContainer quux = new PropertyContainer("bar", 169); @@ -213,7 +215,8 @@ public class PropertyAccessTest extends } } - @Test public void testInnerProperty() throws Exception { + @Test + public void testInnerProperty() throws Exception { PropertyArithmetic pa = new PropertyArithmetic(true); JexlEngine jexl = new JexlBuilder().arithmetic(pa).debug(true).strict(true).cache(32).create(); Container quux = new Container("quux", 42); @@ -269,7 +272,8 @@ public class PropertyAccessTest extends } - @Test public void testStringIdentifier() throws Exception { + @Test + public void testStringIdentifier() throws Exception { Map<String, String> foo = new HashMap<String, String>(); JexlContext jc = new MapContext(); Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java?rev=1788591&r1=1788590&r2=1788591&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java Sat Mar 25 00:35:04 2017 @@ -62,14 +62,16 @@ public class PublicFieldsTest extends Je ctxt.set("pub", pub); } - @Test public void testGetInt() throws Exception { + @Test + public void testGetInt() throws Exception { JexlExpression get = JEXL.createExpression("pub.anInt"); Assert.assertEquals(42, get.evaluate(ctxt)); JEXL.setProperty(pub, "anInt", -42); Assert.assertEquals(-42, get.evaluate(ctxt)); } - @Test public void testSetInt() throws Exception { + @Test + public void testSetInt() throws Exception { JexlExpression set = JEXL.createExpression("pub.anInt = value"); ctxt.set("value", -42); Assert.assertEquals(-42, set.evaluate(ctxt)); @@ -84,14 +86,16 @@ public class PublicFieldsTest extends Je } catch(JexlException xjexl) {} } - @Test public void testGetString() throws Exception { + @Test + public void testGetString() throws Exception { JexlExpression get = JEXL.createExpression("pub.aString"); Assert.assertEquals(LOWER42, get.evaluate(ctxt)); JEXL.setProperty(pub, "aString", UPPER42); Assert.assertEquals(UPPER42, get.evaluate(ctxt)); } - @Test public void testSetString() throws Exception { + @Test + public void testSetString() throws Exception { JexlExpression set = JEXL.createExpression("pub.aString = value"); ctxt.set("value", UPPER42); Assert.assertEquals(UPPER42, set.evaluate(ctxt)); @@ -101,14 +105,16 @@ public class PublicFieldsTest extends Je Assert.assertEquals(LOWER42, JEXL.getProperty(pub, "aString")); } - @Test public void testGetInnerDouble() throws Exception { + @Test + public void testGetInnerDouble() throws Exception { JexlExpression get = JEXL.createExpression("pub.inner.aDouble"); Assert.assertEquals(42.0, get.evaluate(ctxt)); JEXL.setProperty(pub, "inner.aDouble", -42); Assert.assertEquals(-42.0, get.evaluate(ctxt)); } - @Test public void testSetInnerDouble() throws Exception { + @Test + public void testSetInnerDouble() throws Exception { JexlExpression set = JEXL.createExpression("pub.inner.aDouble = value"); ctxt.set("value", -42.0); Assert.assertEquals(-42.0, set.evaluate(ctxt)); @@ -125,7 +131,8 @@ public class PublicFieldsTest extends Je public enum Gender { MALE, FEMALE }; - @Test public void testGetEnum() throws Exception { + @Test + public void testGetEnum() throws Exception { ctxt.set("com.jexl.gender", Gender.class); String src = "x = com.jexl.gender.FEMALE"; JexlScript script = JEXL.createScript(src); @@ -134,7 +141,8 @@ public class PublicFieldsTest extends Je Assert.assertEquals(Gender.FEMALE, ctxt.get("x")); } - @Test public void testGetStaticField() throws Exception { + @Test + public void testGetStaticField() throws Exception { ctxt.set("com.jexl", Inner.class); String src = "x = com.jexl.NOT42"; JexlScript script = JEXL.createScript(src); Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java?rev=1788591&r1=1788590&r2=1788591&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java Sat Mar 25 00:35:04 2017 @@ -54,7 +54,8 @@ public class ScriptTest extends JexlTest /** * Test creating a script from a string. */ - @Test public void testSimpleScript() throws Exception { + @Test + public void testSimpleScript() throws Exception { String code = "while (x < 10) x = x + 1;"; JexlScript s = JEXL.createScript(code); JexlContext jc = new MapContext(); @@ -65,7 +66,8 @@ public class ScriptTest extends JexlTest Assert.assertEquals("getText is wrong", code, s.getSourceText()); } - @Test public void testScriptFromFile() throws Exception { + @Test + public void testScriptFromFile() throws Exception { File testScript = new File(TEST1); JexlScript s = JEXL.createScript(testScript); JexlContext jc = new MapContext(); @@ -75,7 +77,8 @@ public class ScriptTest extends JexlTest Assert.assertEquals("Wrong result", new Integer(7), result); } - @Test public void testArgScriptFromFile() throws Exception { + @Test + public void testArgScriptFromFile() throws Exception { File testScript = new File(TEST_ADD); JexlScript s = JEXL.createScript(testScript,new String[]{"x","y"}); JexlContext jc = new MapContext(); @@ -85,7 +88,8 @@ public class ScriptTest extends JexlTest Assert.assertEquals("Wrong result", new Integer(42), result); } - @Test public void testScriptFromURL() throws Exception { + @Test + public void testScriptFromURL() throws Exception { URL testUrl = new File(TEST1).toURI().toURL(); JexlScript s = JEXL.createScript(testUrl); JexlContext jc = new MapContext(); @@ -95,7 +99,8 @@ public class ScriptTest extends JexlTest Assert.assertEquals("Wrong result", new Integer(7), result); } - @Test public void testArgScriptFromURL() throws Exception { + @Test + public void testArgScriptFromURL() throws Exception { URL testUrl = new File(TEST_ADD).toURI().toURL(); JexlScript s = JEXL.createScript(testUrl,new String[]{"x","y"}); JexlContext jc = new MapContext(); @@ -105,7 +110,8 @@ public class ScriptTest extends JexlTest Assert.assertEquals("Wrong result", new Integer(42), result); } - @Test public void testScriptUpdatesContext() throws Exception { + @Test + public void testScriptUpdatesContext() throws Exception { String jexlCode = "resultat.setCode('OK')"; JexlExpression e = JEXL.createExpression(jexlCode); JexlScript s = JEXL.createScript(jexlCode); Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java?rev=1788591&r1=1788590&r2=1788591&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java Sat Mar 25 00:35:04 2017 @@ -67,7 +67,8 @@ public class ArrayTest { * Unit test entry point. * @throws Exception */ - @Test public void testExample() throws Exception { + @Test + public void testExample() throws Exception { example(Output.JUNIT); }