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 12:25:53 UTC
svn commit: r1104112 - in
/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test:
MemberAccessTest.java ProtectedInnerClassTest.java
Author: mcucchiara
Date: Tue May 17 10:25:53 2011
New Revision: 1104112
URL: http://svn.apache.org/viewvc?rev=1104112&view=rev
Log:
OGNL-9 - Upgrade JUnit to version4
Modified:
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MemberAccessTest.java
incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ProtectedInnerClassTest.java
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=1104112&r1=1104111&r2=1104112&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 10:25:53 2011
@@ -41,9 +41,9 @@ public class MemberAccessTest
private static Simple ROOT = new Simple();
private static Object[][] TESTS = { { "@Runtime@getRuntime()", OgnlException.class },
- // FIXME this test doesn't work { "@System@getProperty('java.specification.version')", System.getProperty( "java.specification.version" ) },
+ { "@System@getProperty('java.specification.version')", System.getProperty( "java.specification.version" ) },
{ "bigIntValue", OgnlException.class },
- { "bigIntValue", OgnlException.class, new Integer( 25 ), OgnlException.class },
+ { "bigIntValue", OgnlException.class, 25, OgnlException.class },
{ "getBigIntValue()", OgnlException.class }, { "stringValue", ROOT.getStringValue() }, };
/*
@@ -54,13 +54,13 @@ public class MemberAccessTest
public static Collection<Object[]> data()
{
Collection<Object[]> data = new ArrayList<Object[]>(TESTS.length);
- for ( int i = 0; i < TESTS.length; i++ )
+ for ( Object[] TEST : TESTS )
{
Object[] tmp = new Object[6];
- tmp[0] = TESTS[i][0] + " (" + TESTS[i][1] + ")";
+ tmp[0] = TEST[0] + " (" + TEST[1] + ")";
tmp[1] = ROOT;
- tmp[2] = TESTS[i][0];
- tmp[3] = TESTS[i][1];
+ tmp[2] = TEST[0];
+ tmp[3] = TEST[1];
tmp[4] = null;
tmp[5] = null;
Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ProtectedInnerClassTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ProtectedInnerClassTest.java?rev=1104112&r1=1104111&r2=1104112&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ProtectedInnerClassTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ProtectedInnerClassTest.java Tue May 17 10:25:53 2011
@@ -36,7 +36,7 @@ public class ProtectedInnerClassTest
private static Object[][] TESTS = {
// member access of inner class (Arrays.asList() returned protected inner class)
- // FIXME this test doesn't work { ROOT, "list.size()", ROOT.getList().size() },
+ { ROOT, "list.size()", ROOT.getList().size() },
{ ROOT, "list[0]", ROOT.getList().get( 0 ) }
};
@@ -48,13 +48,13 @@ public class ProtectedInnerClassTest
public static Collection<Object[]> data()
{
Collection<Object[]> data = new ArrayList<Object[]>(TESTS.length);
- for ( int i = 0; i < TESTS.length; i++ )
+ for ( Object[] TEST : TESTS )
{
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[0] = TEST[1];
+ tmp[1] = TEST[0];
+ tmp[2] = TEST[1];
+ tmp[3] = TEST[2];
data.add( tmp );
}