Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SetterWithConversionTest.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SetterWithConversionTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff ============================================================================== --- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SetterWithConversionTest.java (original) +++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SetterWithConversionTest.java Tue May 17 09:22:09 2011 @@ -19,9 +19,15 @@ */ package org.apache.commons.ognl.test; -import junit.framework.TestSuite; import org.apache.commons.ognl.test.objects.Root; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +import java.util.ArrayList; +import java.util.Collection; + +@RunWith(value = Parameterized.class) public class SetterWithConversionTest extends OgnlTestCase { @@ -47,70 +53,49 @@ public class SetterWithConversionTest * =================================================================== Public static methods * =================================================================== */ - public static TestSuite suite() + @Parameters + public static Collection<Object[]> data() { - TestSuite result = new TestSuite(); - - for ( int i = 0; i < TESTS.length; i++ ) + Collection<Object[]> data = new ArrayList<Object[]>(TESTS.length); + for ( Object[] TEST : TESTS ) { - if ( TESTS[i].length == 3 ) - { - result.addTest( new SetterWithConversionTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], - TESTS[i][2] ) ); - } - else - { - if ( TESTS[i].length == 4 ) - { - result.addTest( new SetterWithConversionTest( (String) TESTS[i][1], TESTS[i][0], - (String) TESTS[i][1], TESTS[i][2], TESTS[i][3] ) ); - } - else - { - if ( TESTS[i].length == 5 ) - { - result.addTest( new SetterWithConversionTest( (String) TESTS[i][1], TESTS[i][0], - (String) TESTS[i][1], TESTS[i][2], TESTS[i][3], - TESTS[i][4] ) ); - } - else - { - throw new RuntimeException( "don't understand TEST format" ); - } - } + Object[] tmp = new Object[6]; + tmp[0] = TEST[1]; + tmp[1] = TEST[0]; + tmp[2] = TEST[1]; + + switch (TEST.length) { + case 3: + tmp[3] = TEST[2]; + break; + + case 4: + tmp[3] = TEST[2]; + tmp[4] = TEST[3]; + break; + + case 5: + tmp[3] = TEST[2]; + tmp[4] = TEST[3]; + tmp[5] = TEST[4]; + break; + + default: + throw new RuntimeException("don't understand TEST format with length " + TEST.length); } + + data.add(tmp); } - return result; + return data; } /* * =================================================================== Constructors * =================================================================== */ - public SetterWithConversionTest() - { - super(); - } - - public SetterWithConversionTest( String name ) - { - super( name ); - } - public SetterWithConversionTest( String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult ) { super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult ); } - - public SetterWithConversionTest( String name, Object root, String expressionString, Object expectedResult, - Object setValue ) - { - super( name, root, expressionString, expectedResult, setValue ); - } - - public SetterWithConversionTest( String name, Object root, String expressionString, Object expectedResult ) - { - super( name, root, expressionString, expectedResult ); - } }
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ShortCircuitingExpressionTest.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ShortCircuitingExpressionTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff ============================================================================== --- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ShortCircuitingExpressionTest.java (original) +++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ShortCircuitingExpressionTest.java Tue May 17 09:22:09 2011 @@ -19,10 +19,16 @@ */ package org.apache.commons.ognl.test; -import junit.framework.TestSuite; import org.apache.commons.ognl.NoSuchPropertyException; import org.apache.commons.ognl.OgnlException; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +import java.util.ArrayList; +import java.util.Collection; + +@RunWith(value = Parameterized.class) public class ShortCircuitingExpressionTest extends OgnlTestCase { @@ -37,46 +43,30 @@ public class ShortCircuitingExpressionTe * =================================================================== Public static methods * =================================================================== */ - public static TestSuite suite() + @Parameters + public static Collection<Object[]> data() { - TestSuite result = new TestSuite(); - + Collection<Object[]> data = new ArrayList<Object[]>(TESTS.length); for ( int i = 0; i < TESTS.length; i++ ) { - result.addTest( new ShortCircuitingExpressionTest( (String) TESTS[i][0] + " (" + TESTS[i][1] + ")", null, - (String) TESTS[i][0], TESTS[i][1] ) ); + Object[] tmp = new Object[6]; + tmp[0] = TESTS[i][0] + " (" + TESTS[i][1] + ")"; + tmp[1] = null; + tmp[2] = TESTS[i][0]; + tmp[3] = TESTS[i][1]; + + data.add( tmp ); } - return result; + return data; } /* * =================================================================== Constructors * =================================================================== */ - public ShortCircuitingExpressionTest() - { - super(); - } - - public ShortCircuitingExpressionTest( String name ) - { - super( name ); - } - public ShortCircuitingExpressionTest( String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult ) { super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult ); } - - public ShortCircuitingExpressionTest( String name, Object root, String expressionString, Object expectedResult, - Object setValue ) - { - super( name, root, expressionString, expectedResult, setValue ); - } - - public ShortCircuitingExpressionTest( String name, Object root, String expressionString, Object expectedResult ) - { - super( name, root, expressionString, expectedResult ); - } } Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff ============================================================================== --- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java (original) +++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java Tue May 17 09:22:09 2011 @@ -19,9 +19,18 @@ */ package org.apache.commons.ognl.test; -import junit.framework.TestSuite; +import static junit.framework.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Collection; + import org.apache.commons.ognl.Ognl; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +@RunWith(value = Parameterized.class) public class SimpleNavigationChainTreeTest extends OgnlTestCase { @@ -33,54 +42,40 @@ public class SimpleNavigationChainTreeTe * =================================================================== Public static methods * =================================================================== */ - public static TestSuite suite() + @Parameters + public static Collection<Object[]> data() { - TestSuite result = new TestSuite(); - + Collection<Object[]> data = new ArrayList<Object[]>(TESTS.length); for ( int i = 0; i < TESTS.length; i++ ) { - result.addTest( new SimpleNavigationChainTreeTest( (String) TESTS[i][0] + " (" + TESTS[i][1] + ")", null, - (String) TESTS[i][0], TESTS[i][1] ) ); + Object[] tmp = new Object[6]; + tmp[0] = TESTS[i][0] + " (" + TESTS[i][1] + ")"; + tmp[1] = null; + tmp[2] = TESTS[i][0]; + tmp[3] = TESTS[i][1]; + + data.add( tmp ); } - return result; + return data; } /* * =================================================================== Constructors * =================================================================== */ - public SimpleNavigationChainTreeTest() - { - super(); - } - - public SimpleNavigationChainTreeTest( String name ) - { - super( name ); - } - public SimpleNavigationChainTreeTest( String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult ) { super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult ); } - public SimpleNavigationChainTreeTest( String name, Object root, String expressionString, Object expectedResult, - Object setValue ) - { - super( name, root, expressionString, expectedResult, setValue ); - } - - public SimpleNavigationChainTreeTest( String name, Object root, String expressionString, Object expectedResult ) - { - super( name, root, expressionString, expectedResult ); - } - /* * =================================================================== Overridden methods * =================================================================== */ - protected void runTest() + @Test + @Override + public void runTest() throws Exception { assertTrue( Ognl.isSimpleNavigationChain( getExpression(), _context ) == ( (Boolean) getExpectedResult() ).booleanValue() ); Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff ============================================================================== --- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java (original) +++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java Tue May 17 09:22:09 2011 @@ -19,9 +19,18 @@ */ package org.apache.commons.ognl.test; -import junit.framework.TestSuite; +import static junit.framework.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Collection; + import org.apache.commons.ognl.Ognl; +import org.junit.Before; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +@RunWith(value = Parameterized.class) public class SimplePropertyTreeTest extends OgnlTestCase { @@ -33,54 +42,40 @@ public class SimplePropertyTreeTest * =================================================================== Public static methods * =================================================================== */ - public static TestSuite suite() + @Parameters + public static Collection<Object[]> data() { - TestSuite result = new TestSuite(); - + Collection<Object[]> data = new ArrayList<Object[]>(TESTS.length); for ( int i = 0; i < TESTS.length; i++ ) { - result.addTest( new SimplePropertyTreeTest( (String) TESTS[i][0] + " (" + TESTS[i][1] + ")", null, - (String) TESTS[i][0], TESTS[i][1] ) ); + Object[] tmp = new Object[6]; + tmp[0] = TESTS[i][0] + " (" + TESTS[i][1] + ")"; + tmp[1] = null; + tmp[2] = TESTS[i][0]; + tmp[3] = TESTS[i][1]; + + data.add( tmp ); } - return result; + return data; } /* * =================================================================== Constructors * =================================================================== */ - public SimplePropertyTreeTest() - { - super(); - } - - public SimplePropertyTreeTest( String name ) - { - super( name ); - } - public SimplePropertyTreeTest( String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult ) { super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult ); } - public SimplePropertyTreeTest( String name, Object root, String expressionString, Object expectedResult, - Object setValue ) - { - super( name, root, expressionString, expectedResult, setValue ); - } - - public SimplePropertyTreeTest( String name, Object root, String expressionString, Object expectedResult ) - { - super( name, root, expressionString, expectedResult ); - } - /* * =================================================================== Overridden methods * =================================================================== */ - protected void runTest() + @Before + @Override + public void runTest() throws Exception { assertTrue( Ognl.isSimpleProperty( getExpression(), _context ) == ( (Boolean) getExpectedResult() ).booleanValue() ); Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff ============================================================================== --- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java (original) +++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java Tue May 17 09:22:09 2011 @@ -19,10 +19,17 @@ */ package org.apache.commons.ognl.test; -import junit.framework.TestSuite; import org.apache.commons.ognl.test.objects.Root; import org.apache.commons.ognl.test.objects.Simple; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +import java.util.ArrayList; +import java.util.Collection; + +@RunWith(value = Parameterized.class) public class StaticsAndConstructorsTest extends OgnlTestCase { @@ -150,46 +157,39 @@ public class StaticsAndConstructorsTest * =================================================================== Public static methods * =================================================================== */ - public static TestSuite suite() + @Parameters + public static Collection<Object[]> data() { - TestSuite result = new TestSuite(); - + Collection<Object[]> data = new ArrayList<Object[]>(TESTS.length); for ( int i = 0; i < TESTS.length; i++ ) { - result.addTest( new StaticsAndConstructorsTest( (String) TESTS[i][0] + " (" + TESTS[i][1] + ")", ROOT, - (String) TESTS[i][0], TESTS[i][1] ) ); + Object[] tmp = new Object[6]; + tmp[0] = TESTS[i][0] + " (" + TESTS[i][1] + ")"; + tmp[1] = ROOT; + tmp[2] = TESTS[i][0]; + tmp[3] = TESTS[i][1]; + + data.add( tmp ); } - return result; + return data; } /* * =================================================================== Constructors * =================================================================== */ - public StaticsAndConstructorsTest() - { - super(); - } - - public StaticsAndConstructorsTest( String name ) - { - super( name ); - } - public StaticsAndConstructorsTest( String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult ) { super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult ); } - public StaticsAndConstructorsTest( String name, Object root, String expressionString, Object expectedResult, - Object setValue ) - { - super( name, root, expressionString, expectedResult, setValue ); - } + @Test - public StaticsAndConstructorsTest( String name, Object root, String expressionString, Object expectedResult ) + @Override + public void runTest() + throws Exception { - super( name, root, expressionString, expectedResult ); + super.runTest(); } } Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff ============================================================================== --- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java (original) +++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java Tue May 17 09:22:09 2011 @@ -19,7 +19,6 @@ */ package org.apache.commons.ognl.test.accessors; -import junit.framework.TestCase; import org.apache.commons.ognl.ListPropertyAccessor; import org.apache.commons.ognl.Ognl; import org.apache.commons.ognl.OgnlContext; @@ -27,16 +26,20 @@ import org.apache.commons.ognl.enhance.E import org.apache.commons.ognl.test.objects.ListSource; import org.apache.commons.ognl.test.objects.ListSourceImpl; import org.apache.commons.ognl.test.objects.Root; +import org.junit.Test; import java.util.List; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNull; + /** * Tests functionality of various built in object accessors. */ public class ListPropertyAccessorTest - extends TestCase { + @Test public void test_Get_Source_String_Number_Index() { ListPropertyAccessor pa = new ListPropertyAccessor(); @@ -56,6 +59,7 @@ public class ListPropertyAccessorTest assertEquals( null, context.getPreviousAccessor() ); } + @Test public void test_Get_Source_Object_Number_Index() { ListPropertyAccessor pa = new ListPropertyAccessor(); @@ -75,6 +79,7 @@ public class ListPropertyAccessorTest assertEquals( null, context.getPreviousAccessor() ); } + @Test public void test_List_To_Object_Property_Accessor_Read() throws Exception { Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java?rev=1104080&r1=1104079&r2=1104080&view=diff ============================================================================== --- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java (original) +++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java Tue May 17 09:22:09 2011 @@ -22,33 +22,43 @@ */ package org.apache.commons.ognl.test.enhance; -import junit.framework.TestCase; import org.apache.commons.ognl.Node; import org.apache.commons.ognl.Ognl; import org.apache.commons.ognl.OgnlContext; import org.apache.commons.ognl.enhance.ExpressionCompiler; import org.apache.commons.ognl.enhance.OgnlExpressionCompiler; -import org.apache.commons.ognl.test.objects.*; +import org.apache.commons.ognl.test.objects.Bean1; +import org.apache.commons.ognl.test.objects.GenericRoot; +import org.apache.commons.ognl.test.objects.IndexedMapObject; +import org.apache.commons.ognl.test.objects.Inherited; +import org.apache.commons.ognl.test.objects.Root; +import org.apache.commons.ognl.test.objects.TestInherited1; +import org.apache.commons.ognl.test.objects.TestInherited2; +import org.junit.Before; +import org.junit.Test; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import static junit.framework.Assert.*; + /** * Tests functionality of {@link ExpressionCompiler}. */ public class TestExpressionCompiler - extends TestCase { OgnlExpressionCompiler _compiler; OgnlContext _context = (OgnlContext) Ognl.createDefaultContext( null ); + @Before public void setUp() { _compiler = new ExpressionCompiler(); } + @Test public void test_Get_Property_Access() throws Throwable { @@ -60,6 +70,7 @@ public class TestExpressionCompiler assertNotNull( expr.getAccessor().get( _context, root ) ); } + @Test public void test_Get_Indexed_Property() throws Throwable { @@ -73,6 +84,7 @@ public class TestExpressionCompiler assertNull( expr.getAccessor().get( _context, root ) ); } + @Test public void test_Set_Indexed_Property() throws Throwable { @@ -88,6 +100,7 @@ public class TestExpressionCompiler assertEquals( "test string", expr.getAccessor().get( _context, root ) ); } + @Test public void test_Expression() throws Throwable { @@ -101,6 +114,7 @@ public class TestExpressionCompiler assertEquals( Boolean.FALSE, expr.getAccessor().get( _context, root ) ); } + @Test public void test_Get_Context_Property() throws Throwable { @@ -120,6 +134,7 @@ public class TestExpressionCompiler assertEquals( "baz", expr.getAccessor().get( _context, root ) ); } + @Test public void test_Set_Context_Property() throws Throwable { @@ -138,6 +153,7 @@ public class TestExpressionCompiler assertEquals( "bam", expr.getAccessor().get( _context, root ) ); } + @Test public void test_Property_Index() throws Throwable { @@ -149,6 +165,7 @@ public class TestExpressionCompiler assertTrue( Collection.class.isInstance( ret ) ); } + @Test public void test_Root_Expression_Inheritance() throws Throwable { @@ -161,6 +178,7 @@ public class TestExpressionCompiler assertEquals( expr.getAccessor().get( _context, obj2 ), "inherited2" ); } + @Test public void test_Create_Empty_Collection() throws Throwable { @@ -177,6 +195,7 @@ public class TestExpressionCompiler return "key"; } + @Test public void test_Indexed_Property() throws Throwable { @@ -199,6 +218,7 @@ public class TestExpressionCompiler return "property"; } + @Test public void test_Indexed_Map_Property() throws Throwable { @@ -213,6 +233,7 @@ public class TestExpressionCompiler assertEquals( "propertyValue", expression.getAccessor().get( _context, this ) ); } + @Test public void test_Set_Generic_Property() throws Exception {
