Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 937737088 for ; Fri, 14 Oct 2011 07:45:12 +0000 (UTC) Received: (qmail 13336 invoked by uid 500); 14 Oct 2011 07:45:10 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 13244 invoked by uid 500); 14 Oct 2011 07:45:10 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 13237 invoked by uid 99); 14 Oct 2011 07:45:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 07:45:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 07:45:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DA8E723889DE for ; Fri, 14 Oct 2011 07:44:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1183235 - /commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ Date: Fri, 14 Oct 2011 07:44:42 -0000 To: commits@commons.apache.org From: grobmeier@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111014074442.DA8E723889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: grobmeier Date: Fri Oct 14 07:44:41 2011 New Revision: 1183235 URL: http://svn.apache.org/viewvc?rev=1183235&view=rev Log: OGNL-21: fixed unused imports, some dead code, unused variables Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java Fri Oct 14 07:44:41 2011 @@ -19,17 +19,16 @@ */ package org.apache.commons.ognl.test; -import org.apache.commons.ognl.TypeConverter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; + 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 @@ -119,10 +118,9 @@ public class ArrayElementsTest @Before public void setUp() { - TypeConverter arrayConverter; - super.setUp(); /** + * TypeConverter arrayConverter; * arrayConverter = new DefaultTypeConverter() { public Object convertValue(Map context, Object target, Member * member, String propertyName, Object value, Class toType) { if (value.getClass().isArray()) { if * (!toType.isArray()) { value = Array.get(value, 0); } } return super.convertValue(context, target, member, Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java Fri Oct 14 07:44:41 2011 @@ -19,15 +19,14 @@ */ package org.apache.commons.ognl.test; +import java.util.ArrayList; +import java.util.Collection; + 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 Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java Fri Oct 14 07:44:41 2011 @@ -54,8 +54,6 @@ public class CorrectedObjectNullHandler public Object nullPropertyValue( Map context, Object target, Object property ) { - Object result = null; - if ( property.equals( "stringValue" ) ) { return defaultValue; Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java Fri Oct 14 07:44:41 2011 @@ -19,18 +19,17 @@ */ package org.apache.commons.ognl.test; +import java.util.ArrayList; +import java.util.Collection; + 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 Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java Fri Oct 14 07:44:41 2011 @@ -31,7 +31,6 @@ import org.apache.commons.ognl.test.obje 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; Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java Fri Oct 14 07:44:41 2011 @@ -24,7 +24,6 @@ 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; Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java Fri Oct 14 07:44:41 2011 @@ -23,7 +23,6 @@ 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; Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java Fri Oct 14 07:44:41 2011 @@ -23,7 +23,6 @@ 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; Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java Fri Oct 14 07:44:41 2011 @@ -25,7 +25,6 @@ import java.util.Collection; import org.apache.commons.ognl.OgnlRuntime; import org.apache.commons.ognl.test.objects.CorrectedObject; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/OperatorTest.java Fri Oct 14 07:44:41 2011 @@ -19,14 +19,13 @@ */ package org.apache.commons.ognl.test; -import org.junit.Test; +import java.util.ArrayList; +import java.util.Collection; + 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 OperatorTest extends OgnlTestCase Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/Performance.java Fri Oct 14 07:44:41 2011 @@ -58,8 +58,6 @@ public class Performance private int _iterations; - private Serializable _mvelCompiled; - private String _expressionString; private boolean _isMvel = false; @@ -392,6 +390,7 @@ public class Performance startTest(); do { + @SuppressWarnings( "unused" ) int result = 100 + 20 * 5; } while ( !done() ); @@ -440,6 +439,7 @@ public class Performance startTest(); do { + @SuppressWarnings( "unused" ) boolean result = _root.getBean2().getBean3().getValue() < 24; } while ( !done() ); Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java Fri Oct 14 07:44:41 2011 @@ -25,7 +25,6 @@ import java.util.Collection; import org.apache.commons.ognl.DefaultMemberAccess; 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; @@ -40,7 +39,7 @@ public class PrivateAccessorTest private static Object[][] TESTS = { // Using private get/set methods - { ROOT, "getPrivateAccessorIntValue()", new Integer( 67 ) }, + { ROOT, "getPrivateAccessorIntValue()", new Integer( 67 ) }, { ROOT, "privateAccessorIntValue", new Integer( 67 ) }, { ROOT, "privateAccessorIntValue", new Integer( 67 ), new Integer( 100 ) }, { ROOT, "privateAccessorIntValue2", new Integer( 67 ) }, Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/PropertyTest.java Fri Oct 14 07:44:41 2011 @@ -29,8 +29,6 @@ import org.apache.commons.ognl.test.obje import org.apache.commons.ognl.test.objects.FirstBean; import org.apache.commons.ognl.test.objects.PropertyHolder; import org.apache.commons.ognl.test.objects.Root; -import org.junit.Ignore; -import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; Modified: commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java?rev=1183235&r1=1183234&r2=1183235&view=diff ============================================================================== --- commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java (original) +++ commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/QuotingTest.java Fri Oct 14 07:44:41 2011 @@ -22,7 +22,6 @@ package org.apache.commons.ognl.test; import java.util.ArrayList; import java.util.Collection; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized;