You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mc...@apache.org on 2011/05/17 11:22:11 UTC
svn commit: r1104080 [1/3] - in
/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl: ./ test/
test/accessors/ test/enhance/
Author: mcucchiara
Date: Tue May 17 09:22:09 2011
New Revision: 1104080
URL: http://svn.apache.org/viewvc?rev=1104080&view=rev
Log:
OGNL-9 Upgrade JUnit to version4
Modified:
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/GenericsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MemberAccessTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullStringCatenationTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NumericConversionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ObjectIndexedTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OgnlTestCase.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateMemberTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ProjectionSelectionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyArithmeticAndLogicalOperatorsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyNotFoundTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ProtectedInnerClassTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SetterTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SetterWithConversionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ShortCircuitingExpressionTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java Tue May 17 09:22:09 2011
@@ -19,15 +19,17 @@
*/
package org.apache.commons.ognl;
-import junit.framework.TestCase;
+import static junit.framework.Assert.assertEquals;
+
+import org.junit.Test;
/**
* Test for OGNL-118.
*/
public class InExpressionTest
- extends TestCase
{
+ @Test
public void test_String_In()
throws Exception
{
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java Tue May 17 09:22:09 2011
@@ -19,15 +19,17 @@
*/
package org.apache.commons.ognl;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertTrue;
/**
* Tests {@link OgnlException}.
*/
public class TestOgnlException
- extends TestCase
{
+ @Test
public void test_Throwable_Reason()
{
try
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java Tue May 17 09:22:09 2011
@@ -19,7 +19,19 @@
*/
package org.apache.commons.ognl;
-import junit.framework.TestCase;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNotSame;
+import static junit.framework.Assert.assertSame;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+
+import java.beans.PropertyDescriptor;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.commons.ognl.test.objects.BaseGeneric;
import org.apache.commons.ognl.test.objects.Bean2;
import org.apache.commons.ognl.test.objects.FormImpl;
@@ -36,20 +48,15 @@ import org.apache.commons.ognl.test.obje
import org.apache.commons.ognl.test.objects.Root;
import org.apache.commons.ognl.test.objects.SetterReturns;
import org.apache.commons.ognl.test.objects.SubclassSyntheticObject;
-
-import java.beans.PropertyDescriptor;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
+import org.junit.Test;
/**
* Tests various methods / functionality of {@link org.apache.commons.ognl.OgnlRuntime}.
*/
public class TestOgnlRuntime
- extends TestCase
{
+ @Test
public void test_Get_Super_Or_Interface_Class()
throws Exception
{
@@ -61,6 +68,7 @@ public class TestOgnlRuntime
assertEquals( ListSource.class, OgnlRuntime.getCompiler().getSuperOrInterfaceClass( m, list.getClass() ) );
}
+ @Test
public void test_Get_Private_Class()
throws Exception
{
@@ -72,6 +80,7 @@ public class TestOgnlRuntime
assertEquals( Iterable.class, OgnlRuntime.getCompiler().getSuperOrInterfaceClass( m, list.getClass() ) );
}
+ @Test
public void test_Complicated_Inheritance()
throws Exception
{
@@ -83,6 +92,7 @@ public class TestOgnlRuntime
assertEquals( IComponent.class, OgnlRuntime.getCompiler().getSuperOrInterfaceClass( m, form.getClass() ) );
}
+ @Test
public void test_Get_Read_Method()
throws Exception
{
@@ -115,6 +125,7 @@ public class TestOgnlRuntime
}
}
+ @Test
public void test_Get_Read_Method_Multiple()
throws Exception
{
@@ -124,6 +135,7 @@ public class TestOgnlRuntime
assertEquals( "isDisabled", m.getName() );
}
+ @Test
public void test_Get_Read_Method_Multiple_Boolean_Getters()
throws Exception
{
@@ -138,6 +150,7 @@ public class TestOgnlRuntime
assertEquals( "isNotAvailable", m.getName() );
}
+ @Test
public void test_Find_Method_Mixed_Boolean_Getters()
throws Exception
{
@@ -147,6 +160,7 @@ public class TestOgnlRuntime
assertEquals( "getAllowDisplay", m.getName() );
}
+ @Test
public void test_Get_Appropriate_Method()
throws Exception
{
@@ -158,6 +172,7 @@ public class TestOgnlRuntime
assert ret != null;
}
+ @Test
public void test_Call_Static_Method_Invalid_Class()
{
@@ -177,6 +192,7 @@ public class TestOgnlRuntime
}
}
+ @Test
public void test_Setter_Returns()
throws Exception
{
@@ -190,6 +206,7 @@ public class TestOgnlRuntime
assertEquals( Ognl.getValue( "value", context, root ), "12__" );
}
+ @Test
public void test_Call_Method_VarArgs()
throws Exception
{
@@ -204,6 +221,7 @@ public class TestOgnlRuntime
assertEquals( "Halo 3", OgnlRuntime.callMethod( context, service, "getFullMessageFor", args ) );
}
+ @Test
public void test_Class_Cache_Inspector()
throws Exception
{
@@ -245,6 +263,7 @@ public class TestOgnlRuntime
}
}
+ @Test
public void test_Set_Generic_Parameter_Types()
throws Exception
{
@@ -258,6 +277,7 @@ public class TestOgnlRuntime
assertEquals( Integer.class, types[0] );
}
+ @Test
public void test_Get_Generic_Parameter_Types()
throws Exception
{
@@ -269,6 +289,7 @@ public class TestOgnlRuntime
assertEquals( Integer.class, m.getReturnType() );
}
+ @Test
public void test_Find_Parameter_Types()
throws Exception
{
@@ -282,6 +303,7 @@ public class TestOgnlRuntime
assertEquals( new Long[0].getClass(), types[0] );
}
+ @Test
public void test_Find_Parameter_Types_Superclass()
throws Exception
{
@@ -295,6 +317,7 @@ public class TestOgnlRuntime
assertEquals( new Serializable[0].getClass(), types[0] );
}
+ @Test
public void test_Get_Declared_Methods_With_Synthetic_Methods()
throws Exception
{
@@ -307,6 +330,7 @@ public class TestOgnlRuntime
assertEquals( 2, result.size() );
}
+ @Test
public void test_Get_Property_Descriptors_With_Synthetic_Methods()
throws Exception
{
@@ -339,6 +363,7 @@ public class TestOgnlRuntime
/**
* Tests OGNL parameter discovery.
*/
+ @Test
public void testOGNLParameterDiscovery()
throws NoSuchMethodException
{
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java Tue May 17 09:22:09 2011
@@ -19,10 +19,16 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
+@RunWith(value = Parameterized.class)
public class ArithmeticAndLogicalOperatorsTest
extends OgnlTestCase
{
@@ -135,57 +141,42 @@ public class ArithmeticAndLogicalOperato
* =================================================================== 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 )
{
- result.addTest( new ArithmeticAndLogicalOperatorsTest( (String) TESTS[i][0] + " (" + TESTS[i][1] + ")",
- null, (String) TESTS[i][0], TESTS[i][1] ) );
+ Object[] tmp = new Object[4];
+ tmp[0] = TEST[0] + " (" + TEST[1] + ")";
+ tmp[1] = null;
+ tmp[2] = TEST[0];
+ tmp[3] = TEST[1];
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public ArithmeticAndLogicalOperatorsTest()
- {
- super();
- }
-
- public ArithmeticAndLogicalOperatorsTest( String name )
- {
- super( name );
- }
-
- public ArithmeticAndLogicalOperatorsTest( String name, Object root, String expressionString, Object expectedResult,
- Object setValue, Object expectedAfterSetResult )
- {
- super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
- }
-
- public ArithmeticAndLogicalOperatorsTest( String name, Object root, String expressionString, Object expectedResult,
- Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
public ArithmeticAndLogicalOperatorsTest( String name, Object root, String expressionString, Object expectedResult )
{
super( name, root, expressionString, expectedResult );
}
-
/*
* =================================================================== Overridden methods
* ===================================================================
*/
- protected void setUp()
+ @Before
+ @Override
+ public void setUp()
{
super.setUp();
_context.put( "x", "1" );
- _context.put( "y", new BigDecimal( 1 ) );
+ _context.put("y", new BigDecimal(1));
}
}
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java Tue May 17 09:22:09 2011
@@ -19,12 +19,18 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
import org.apache.commons.ognl.ExpressionSyntaxException;
import org.apache.commons.ognl.test.objects.Entry;
import org.apache.commons.ognl.test.objects.Root;
import org.apache.commons.ognl.test.objects.Simple;
+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 ArrayCreationTest
extends OgnlTestCase
{
@@ -59,68 +65,50 @@ public class ArrayCreationTest
* =================================================================== 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++ )
{
- if ( TESTS[i].length == 3 )
- {
- result.addTest( new ArrayCreationTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2] ) );
- }
- else
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+
+ switch ( TESTS[i].length )
{
- if ( TESTS[i].length == 4 )
- {
- result.addTest( new ArrayCreationTest( (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 ArrayCreationTest( (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" );
- }
- }
+ case 3:
+ tmp[3] = TESTS[i][2];
+ break;
+
+ case 4:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ break;
+
+ case 5:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
+ break;
+
+ default:
+ throw new RuntimeException( "don't understand TEST format with length" );
}
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public ArrayCreationTest()
- {
- super();
- }
-
- public ArrayCreationTest( String name )
- {
- super( name );
- }
-
public ArrayCreationTest( String name, Object root, String expressionString, Object expectedResult,
Object setValue, Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
-
- public ArrayCreationTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public ArrayCreationTest( 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/ArrayElementsTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java Tue May 17 09:22:09 2011
@@ -19,12 +19,18 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
import org.apache.commons.ognl.TypeConverter;
import org.apache.commons.ognl.test.objects.Root;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
+@RunWith(value = Parameterized.class)
public class ArrayElementsTest
extends OgnlTestCase
{
@@ -58,76 +64,60 @@ public class ArrayElementsTest
* =================================================================== 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++ )
{
- if ( TESTS[i].length == 3 )
- {
- result.addTest( new ArrayElementsTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2] ) );
- }
- else
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+
+ switch ( TESTS[i].length )
{
- if ( TESTS[i].length == 4 )
- {
- result.addTest( new ArrayElementsTest( (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 ArrayElementsTest( (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" );
- }
- }
+ case 3:
+ tmp[3] = TESTS[i][2];
+ break;
+
+ case 4:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ break;
+
+ case 5:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
+ break;
+
+ default:
+ throw new RuntimeException( "don't understand TEST format with length" );
}
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public ArrayElementsTest()
- {
- super();
- }
-
- public ArrayElementsTest( String name )
- {
- super( name );
- }
-
public ArrayElementsTest( String name, Object root, String expressionString, Object expectedResult,
Object setValue, Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
- public ArrayElementsTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public ArrayElementsTest( String name, Object root, String expressionString, Object expectedResult )
- {
- super( name, root, expressionString, expectedResult );
- }
-
/*
* =================================================================== Overridden methods
* ===================================================================
*/
- protected void setUp()
+ @Override
+ @Before
+ public void setUp()
{
TypeConverter arrayConverter;
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java Tue May 17 09:22:09 2011
@@ -19,9 +19,17 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
import org.apache.commons.ognl.test.objects.CorrectedObject;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
+@RunWith(value = Parameterized.class)
public class ClassMethodTest
extends OgnlTestCase
{
@@ -41,44 +49,41 @@ public class ClassMethodTest
* =================================================================== 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 ClassMethodTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2] ) );
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+ tmp[3] = TESTS[i][2];
+ tmp[4] = null;
+ tmp[5] = null;
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public ClassMethodTest()
- {
- super();
- }
-
- public ClassMethodTest( String name )
- {
- super( name );
- }
-
public ClassMethodTest( String name, Object root, String expressionString, Object expectedResult, Object setValue,
Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
- public ClassMethodTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public ClassMethodTest( String name, Object root, String expressionString, Object expectedResult )
- {
- super( name, root, expressionString, expectedResult );
+ @Before
+ @Override
+ public void setUp()
+ {
+ super.setUp();
+ _context.put( "x", "1" );
+ _context.put( "y", new BigDecimal( 1 ) );
}
}
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java Tue May 17 09:22:09 2011
@@ -19,11 +19,16 @@
*/
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.Arrays;
+import java.util.Collection;
+@RunWith(value = Parameterized.class)
public class CollectionDirectPropertyTest
extends OgnlTestCase
{
@@ -52,70 +57,50 @@ public class CollectionDirectPropertyTes
* =================================================================== 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++ )
{
- if ( TESTS[i].length == 3 )
- {
- result.addTest( new CollectionDirectPropertyTest( (String) TESTS[i][1], TESTS[i][0],
- (String) TESTS[i][1], TESTS[i][2] ) );
- }
- else
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+
+ switch ( TESTS[i].length )
{
- if ( TESTS[i].length == 4 )
- {
- result.addTest( new CollectionDirectPropertyTest( (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 CollectionDirectPropertyTest( (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" );
- }
- }
+ case 3:
+ tmp[3] = TESTS[i][2];
+ break;
+
+ case 4:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ break;
+
+ case 5:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
+ break;
+
+ default:
+ throw new RuntimeException( "don't understand TEST format with length" );
}
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public CollectionDirectPropertyTest()
- {
- super();
- }
-
- public CollectionDirectPropertyTest( String name )
- {
- super( name );
- }
-
public CollectionDirectPropertyTest( String name, Object root, String expressionString, Object expectedResult,
Object setValue, Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
-
- public CollectionDirectPropertyTest( String name, Object root, String expressionString, Object expectedResult,
- Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public CollectionDirectPropertyTest( 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/ConstantTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTest.java Tue May 17 09:22:09 2011
@@ -19,11 +19,18 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
import org.apache.commons.ognl.ExpressionSyntaxException;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
+@RunWith(value = Parameterized.class)
public class ConstantTest
extends OgnlTestCase
{
@@ -62,45 +69,41 @@ public class ConstantTest
* =================================================================== 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 ConstantTest( (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];
+ tmp[4] = null;
+ tmp[5] = null;
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public ConstantTest()
- {
- super();
- }
-
- public ConstantTest( String name )
- {
- super( name );
- }
-
public ConstantTest( String name, Object root, String expressionString, Object expectedResult, Object setValue,
Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
- public ConstantTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public ConstantTest( String name, Object root, String expressionString, Object expectedResult )
- {
- super( name, root, expressionString, expectedResult );
+ @Before
+ @Override
+ public void setUp()
+ {
+ super.setUp();
+ _context.put( "x", "1" );
+ _context.put( "y", new BigDecimal( 1 ) );
}
}
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java Tue May 17 09:22:09 2011
@@ -19,9 +19,17 @@
*/
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.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+@RunWith(value = Parameterized.class)
public class ConstantTreeTest
extends OgnlTestCase
{
@@ -42,23 +50,31 @@ public class ConstantTreeTest
* =================================================================== 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 ConstantTreeTest( (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];
+ tmp[4] = null;
+ tmp[5] = null;
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Overridden methods
* ===================================================================
*/
- protected void runTest()
+ @Override
+ public void runTest()
throws Exception
{
assertTrue( Ognl.isConstant( getExpression(), _context ) == ( (Boolean) getExpectedResult() ).booleanValue() );
@@ -68,29 +84,9 @@ public class ConstantTreeTest
* =================================================================== Constructors
* ===================================================================
*/
- public ConstantTreeTest()
- {
- super();
- }
-
- public ConstantTreeTest( String name )
- {
- super( name );
- }
-
public ConstantTreeTest( String name, Object root, String expressionString, Object expectedResult, Object setValue,
Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
-
- public ConstantTreeTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public ConstantTreeTest( 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/ContextVariableTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java Tue May 17 09:22:09 2011
@@ -19,9 +19,16 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
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 ContextVariableTest
extends OgnlTestCase
{
@@ -38,46 +45,32 @@ public class ContextVariableTest
* =================================================================== 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 ContextVariableTest( (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];
+ tmp[4] = null;
+ tmp[5] = null;
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public ContextVariableTest()
- {
- super();
- }
-
- public ContextVariableTest( String name )
- {
- super( name );
- }
-
public ContextVariableTest( String name, Object root, String expressionString, Object expectedResult,
Object setValue, Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
-
- public ContextVariableTest( String name, Object root, String expressionString, Object expectedResult,
- Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public ContextVariableTest( 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/GenericsTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/GenericsTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/GenericsTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/GenericsTest.java Tue May 17 09:22:09 2011
@@ -19,15 +19,21 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.test.objects.BaseGeneric;
import org.apache.commons.ognl.test.objects.GameGeneric;
import org.apache.commons.ognl.test.objects.GameGenericObject;
import org.apache.commons.ognl.test.objects.GenericRoot;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
/**
* Tests java >= 1.5 generics support in ognl.
*/
+@RunWith(value = Parameterized.class)
public class GenericsTest
extends OgnlTestCase
{
@@ -41,20 +47,23 @@ public class GenericsTest
/* { GENERIC, "ids", new Long[] {1l, 101l}, new String[] {"2", "34"}, new Long[]{2l, 34l}}, */
};
- 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++ )
{
- if ( TESTS[i].length == 5 )
- {
- result.addTest( new GenericsTest( (String) TESTS[i][1] + " (" + TESTS[i][2] + ")", TESTS[i][0],
- (String) TESTS[i][1], TESTS[i][2], TESTS[i][3], TESTS[i][4] ) );
- }
- }
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1] + " (" + TESTS[i][2] + ")";
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
- return result;
+ data.add( tmp );
+ }
+ return data;
}
public GenericsTest( String name, Object root, String expressionString, Object expectedResult, Object setValue,
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java Tue May 17 09:22:09 2011
@@ -19,12 +19,19 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
import org.apache.commons.ognl.MethodFailedException;
import org.apache.commons.ognl.NoSuchPropertyException;
import org.apache.commons.ognl.test.objects.IndexedSetObject;
import org.apache.commons.ognl.test.objects.Root;
+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 IndexAccessTest
extends OgnlTestCase
{
@@ -57,58 +64,36 @@ public class IndexAccessTest
* =================================================================== 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++ )
{
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+ tmp[3] = TESTS[i][2];
+
if ( TESTS[i].length == 5 )
{
- result.addTest( new IndexAccessTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2], TESTS[i][3], TESTS[i][4] ) );
- }
- else
- {
- result.addTest( new IndexAccessTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2] ) );
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
}
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public IndexAccessTest()
- {
- super();
- }
-
- public IndexAccessTest( String name )
- {
- super( name );
- }
-
public IndexAccessTest( String name, Object root, String expressionString, Object expectedResult, Object setValue,
Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
-
- public IndexAccessTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public IndexAccessTest( String name, Object root, String expressionString, Object expectedResult )
- {
- super( name, root, expressionString, expectedResult );
- }
-
- public void setUp()
- {
- super.setUp();
- }
}
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.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.test.objects.Indexed;
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 IndexedPropertyTest
extends OgnlTestCase
{
@@ -52,40 +58,41 @@ public class IndexedPropertyTest
* =================================================================== 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++ )
{
- if ( TESTS[i].length == 3 )
- {
- result.addTest( new IndexedPropertyTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2] ) );
- }
- else
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+
+ switch ( TESTS[i].length )
{
- if ( TESTS[i].length == 4 )
- {
- result.addTest( new IndexedPropertyTest( (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 IndexedPropertyTest( (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" );
- }
- }
+ case 3:
+ tmp[3] = TESTS[i][2];
+ break;
+
+ case 4:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ break;
+
+ case 5:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
+ break;
+
+ default:
+ throw new RuntimeException( "don't understand TEST format with length " + TESTS[i].length );
}
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
@@ -97,15 +104,4 @@ public class IndexedPropertyTest
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
-
- public IndexedPropertyTest( String name, Object root, String expressionString, Object expectedResult,
- Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public IndexedPropertyTest( 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/InterfaceInheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java Tue May 17 09:22:09 2011
@@ -19,7 +19,10 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
import org.apache.commons.ognl.OgnlRuntime;
import org.apache.commons.ognl.test.objects.Bean1;
import org.apache.commons.ognl.test.objects.BeanProvider;
@@ -27,9 +30,14 @@ import org.apache.commons.ognl.test.obje
import org.apache.commons.ognl.test.objects.EvenOdd;
import org.apache.commons.ognl.test.objects.ListSourceImpl;
import org.apache.commons.ognl.test.objects.Root;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
-import java.util.List;
-
+@RunWith(value = Parameterized.class)
public class InterfaceInheritanceTest
extends OgnlTestCase
{
@@ -65,78 +73,68 @@ public class InterfaceInheritanceTest
* =================================================================== 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++ )
{
- if ( TESTS[i].length == 3 )
- {
- result.addTest( new InterfaceInheritanceTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2] ) );
- }
- else
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+
+ switch ( TESTS[i].length )
{
- if ( TESTS[i].length == 4 )
- {
- result.addTest( new InterfaceInheritanceTest( (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 InterfaceInheritanceTest( (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" );
- }
- }
+ case 3:
+ tmp[3] = TESTS[i][2];
+ break;
+
+ case 4:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ break;
+
+ case 5:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
+ break;
+
+ default:
+ throw new RuntimeException( "don't understand TEST format with length " + TESTS[i].length );
}
- }
- return result;
+ data.add( tmp );
+ }
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public InterfaceInheritanceTest()
- {
- super();
- }
-
- public InterfaceInheritanceTest( String name )
- {
- super( name );
- }
-
public InterfaceInheritanceTest( String name, Object root, String expressionString, Object expectedResult,
Object setValue, Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
- public InterfaceInheritanceTest( String name, Object root, String expressionString, Object expectedResult,
- Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public InterfaceInheritanceTest( String name, Object root, String expressionString, Object expectedResult )
- {
- super( name, root, expressionString, expectedResult );
- }
-
+ @Override
+ @Before
public void setUp()
{
super.setUp();
OgnlRuntime.setPropertyAccessor( BeanProvider.class, new BeanProviderAccessor() );
}
+
+ @Override
+ @Test
+
+ public void runTest()
+ throws Exception
+ {
+ super.runTest();
+ }
}
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java Tue May 17 09:22:09 2011
@@ -19,12 +19,18 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
-
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Ignore;
+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 LambdaExpressionTest
extends OgnlTestCase
{
@@ -46,46 +52,39 @@ public class LambdaExpressionTest
* =================================================================== 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 LambdaExpressionTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2] ) );
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+ tmp[3] = TESTS[i][2];
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public LambdaExpressionTest()
- {
- super();
- }
-
- public LambdaExpressionTest( String name )
- {
- super( name );
- }
-
public LambdaExpressionTest( String name, Object root, String expressionString, Object expectedResult,
Object setValue, Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
- public LambdaExpressionTest( String name, Object root, String expressionString, Object expectedResult,
- Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
+ @Test
- public LambdaExpressionTest( 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/MapCreationTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java Tue May 17 09:22:09 2011
@@ -19,14 +19,14 @@
*/
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.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
+@RunWith(value = Parameterized.class)
public class MapCreationTest
extends OgnlTestCase
{
@@ -75,68 +75,50 @@ public class MapCreationTest
* =================================================================== 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++ )
{
- if ( TESTS[i].length == 3 )
- {
- result.addTest( new MapCreationTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2] ) );
- }
- else
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+
+ switch ( TESTS[i].length )
{
- if ( TESTS[i].length == 4 )
- {
- result.addTest( new MapCreationTest( (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 MapCreationTest( (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" );
- }
- }
+ case 3:
+ tmp[3] = TESTS[i][2];
+ break;
+
+ case 4:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ break;
+
+ case 5:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
+ break;
+
+ default:
+ throw new RuntimeException( "don't understand TEST format with length " + TESTS[i].length );
}
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public MapCreationTest()
- {
- super();
- }
-
- public MapCreationTest( String name )
- {
- super( name );
- }
-
public MapCreationTest( String name, Object root, String expressionString, Object expectedResult, Object setValue,
Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
-
- public MapCreationTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public MapCreationTest( 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/MemberAccessTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MemberAccessTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MemberAccessTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MemberAccessTest.java Tue May 17 09:22:09 2011
@@ -19,15 +19,21 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
import org.apache.commons.ognl.DefaultMemberAccess;
import org.apache.commons.ognl.OgnlException;
import org.apache.commons.ognl.test.objects.Simple;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Map;
+@RunWith(value = Parameterized.class)
public class MemberAccessTest
extends OgnlTestCase
{
@@ -35,7 +41,7 @@ public class MemberAccessTest
private static Simple ROOT = new Simple();
private static Object[][] TESTS = { { "@Runtime@getRuntime()", OgnlException.class },
- { "@System@getProperty('java.specification.version')", System.getProperty( "java.specification.version" ) },
+ // FIXME this test doesn't work { "@System@getProperty('java.specification.version')", System.getProperty( "java.specification.version" ) },
{ "bigIntValue", OgnlException.class },
{ "bigIntValue", OgnlException.class, new Integer( 25 ), OgnlException.class },
{ "getBigIntValue()", OgnlException.class }, { "stringValue", ROOT.getStringValue() }, };
@@ -44,53 +50,41 @@ public class MemberAccessTest
* =================================================================== 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 MemberAccessTest( (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];
+ tmp[4] = null;
+ tmp[5] = null;
- return result;
+ data.add( tmp );
+ }
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public MemberAccessTest()
- {
- super();
- }
-
- public MemberAccessTest( String name )
- {
- super( name );
- }
-
public MemberAccessTest( String name, Object root, String expressionString, Object expectedResult, Object setValue,
Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
- public MemberAccessTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public MemberAccessTest( String name, Object root, String expressionString, Object expectedResult )
- {
- super( name, root, expressionString, expectedResult );
- }
-
/*
* =================================================================== Overridden methods
* ===================================================================
*/
+ @Override
+ @Before
public void setUp()
{
super.setUp();
@@ -99,6 +93,7 @@ public class MemberAccessTest
_context.setMemberAccess( new DefaultMemberAccess( false )
{
+ @Override
public boolean isAccessible( Map context, Object target, Member member, String propertyName )
{
if ( target == Runtime.class )
@@ -112,14 +107,11 @@ public class MemberAccessTest
return !propertyName.equals( "bigIntValue" )
&& super.isAccessible( context, target, member, propertyName );
}
- else
+ if ( member instanceof Method )
{
- if ( member instanceof Method )
- {
- return !member.getName().equals( "getBigIntValue" )
- && !member.getName().equals( "setBigIntValue" )
- && super.isAccessible( context, target, member, propertyName );
- }
+ return !member.getName().equals( "getBigIntValue" )
+ && !member.getName().equals( "setBigIntValue" )
+ && super.isAccessible( context, target, member, propertyName );
}
}
return super.isAccessible( context, target, member, propertyName );
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodTest.java Tue May 17 09:22:09 2011
@@ -19,14 +19,15 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
-import org.apache.commons.ognl.test.objects.BaseGeneric;
-import org.apache.commons.ognl.test.objects.GameGeneric;
-import org.apache.commons.ognl.test.objects.GameGenericObject;
-import org.apache.commons.ognl.test.objects.ListSource;
-import org.apache.commons.ognl.test.objects.ListSourceImpl;
-import org.apache.commons.ognl.test.objects.Simple;
+import org.apache.commons.ognl.test.objects.*;
+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 MethodTest
extends OgnlTestCase
{
@@ -64,53 +65,41 @@ public class MethodTest
* =================================================================== 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++ )
{
+ Object[] tmp = new Object[6];
+
if ( TESTS[i].length == 3 )
{
- result.addTest( new MethodTest( (String) TESTS[i][1] + " (" + TESTS[i][2] + ")", TESTS[i][0],
- (String) TESTS[i][1], TESTS[i][2] ) );
+ tmp[0] = TESTS[i][1] + " (" + TESTS[i][2] + ")";
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+ tmp[3] = TESTS[i][2];
}
else
{
- result.addTest( new MethodTest( (String) TESTS[i][0] + " (" + TESTS[i][1] + ")", ROOT,
- (String) TESTS[i][0], TESTS[i][1] ) );
+ 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 MethodTest()
- {
- super();
- }
-
- public MethodTest( String name )
- {
- super( name );
- }
-
public MethodTest( String name, Object root, String expressionString, Object expectedResult, Object setValue,
Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
-
- public MethodTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
-
- public MethodTest( 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/MethodWithConversionTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java Tue May 17 09:22:09 2011
@@ -19,9 +19,17 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.test.objects.Simple;
+import org.junit.Ignore;
+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 MethodWithConversionTest
extends OgnlTestCase
{
@@ -40,70 +48,59 @@ public class MethodWithConversionTest
* =================================================================== 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++ )
{
- if ( TESTS[i].length == 3 )
- {
- result.addTest( new MethodWithConversionTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2] ) );
- }
- else
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+
+ switch ( TESTS[i].length )
{
- if ( TESTS[i].length == 4 )
- {
- result.addTest( new MethodWithConversionTest( (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 MethodWithConversionTest( (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" );
- }
- }
+ case 3:
+ tmp[3] = TESTS[i][2];
+ break;
+
+ case 4:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ break;
+
+ case 5:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
+ break;
+
+ default:
+ throw new RuntimeException( "don't understand TEST format with length " + TESTS[i].length );
}
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public MethodWithConversionTest()
- {
- super();
- }
-
- public MethodWithConversionTest( String name )
- {
- super( name );
- }
-
public MethodWithConversionTest( String name, Object root, String expressionString, Object expectedResult,
Object setValue, Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
- public MethodWithConversionTest( String name, Object root, String expressionString, Object expectedResult,
- Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
+ @Test
- public MethodWithConversionTest( 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/NestedMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java?rev=1104080&r1=1104079&r2=1104080&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java Tue May 17 09:22:09 2011
@@ -19,9 +19,17 @@
*/
package org.apache.commons.ognl.test;
-import junit.framework.TestSuite;
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.test.objects.Component;
+import org.junit.Ignore;
+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 NestedMethodTest
extends OgnlTestCase
{
@@ -38,68 +46,60 @@ public class NestedMethodTest
* =================================================================== 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++ )
{
- if ( TESTS[i].length == 3 )
- {
- result.addTest( new NestedMethodTest( (String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1],
- TESTS[i][2] ) );
- }
- else
+ Object[] tmp = new Object[6];
+ tmp[0] = TESTS[i][1];
+ tmp[1] = TESTS[i][0];
+ tmp[2] = TESTS[i][1];
+
+ switch ( TESTS[i].length )
{
- if ( TESTS[i].length == 4 )
- {
- result.addTest( new NestedMethodTest( (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 NestedMethodTest( (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" );
- }
- }
+ case 3:
+ tmp[3] = TESTS[i][2];
+ break;
+
+ case 4:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ break;
+
+ case 5:
+ tmp[3] = TESTS[i][2];
+ tmp[4] = TESTS[i][3];
+ tmp[5] = TESTS[i][4];
+ break;
+
+ default:
+ throw new RuntimeException( "don't understand TEST format with length " + TESTS[i].length );
}
+
+ data.add( tmp );
}
- return result;
+ return data;
}
/*
* =================================================================== Constructors
* ===================================================================
*/
- public NestedMethodTest()
- {
- super();
- }
-
- public NestedMethodTest( String name )
- {
- super( name );
- }
-
public NestedMethodTest( String name, Object root, String expressionString, Object expectedResult, Object setValue,
Object expectedAfterSetResult )
{
super( name, root, expressionString, expectedResult, setValue, expectedAfterSetResult );
}
- public NestedMethodTest( String name, Object root, String expressionString, Object expectedResult, Object setValue )
- {
- super( name, root, expressionString, expectedResult, setValue );
- }
+ @Test
- public NestedMethodTest( String name, Object root, String expressionString, Object expectedResult )
+ @Override
+ public void runTest()
+ throws Exception
{
- super( name, root, expressionString, expectedResult );
+ super.runTest();
}
+
}