This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-ognl.git
The following commit(s) were added to refs/heads/master by this push:
new d9d6b1f Replace assert by simpler but equivalent calls.
new d33139f Merge pull request #42 from arturobernalg/feature/simplify
d9d6b1f is described below
commit d9d6b1fc28a72bd8610939017802de90ce72f574
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Jun 20 17:24:48 2021 +0200
Replace assert by simpler but equivalent calls.
---
.../org/apache/commons/ognl/TestOgnlRuntime.java | 2 +-
.../apache/commons/ognl/test/ASTPropertyTest.java | 34 +++++++++++-----------
.../apache/commons/ognl/test/ConstantTreeTest.java | 3 +-
.../commons/ognl/test/NumericConversionTest.java | 3 +-
.../ognl/test/SimpleNavigationChainTreeTest.java | 3 +-
.../commons/ognl/test/SimplePropertyTreeTest.java | 3 +-
.../test/accessors/ListPropertyAccessorTest.java | 4 +--
.../ognl/test/enhance/TestExpressionCompiler.java | 2 +-
8 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
b/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
index 3ad0f6a..677ea2c 100644
--- a/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
+++ b/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
@@ -205,7 +205,7 @@ public class TestOgnlRuntime
SetterReturns root = new SetterReturns();
Method m = OgnlRuntime.getWriteMethod( root.getClass(), "value" );
- assertTrue( m != null );
+ assertNotNull(m);
Ognl.setValue( "value", context, root, "12__" );
assertEquals( Ognl.getValue( "value", context, root ), "12__" );
diff --git a/src/test/java/org/apache/commons/ognl/test/ASTPropertyTest.java
b/src/test/java/org/apache/commons/ognl/test/ASTPropertyTest.java
index 76c8b63..bdc8feb 100644
--- a/src/test/java/org/apache/commons/ognl/test/ASTPropertyTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ASTPropertyTest.java
@@ -63,18 +63,18 @@ public class ASTPropertyTest
context.setCurrentNode( pRef );
assertEquals( root.getClass(), context.getCurrentType() );
- assertEquals( null, context.getPreviousType() );
+ assertNull(context.getPreviousType());
assertEquals( root, context.getCurrentObject() );
- assertEquals( null, context.getCurrentAccessor() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getCurrentAccessor());
+ assertNull(context.getPreviousAccessor());
int type = p.getIndexedPropertyType( context, root );
assertEquals( OgnlRuntime.INDEXED_PROPERTY_NONE, type );
assertEquals( root.getClass(), context.getCurrentType() );
- assertEquals( null, context.getPreviousType() );
- assertEquals( null, context.getCurrentAccessor() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getPreviousType());
+ assertNull(context.getCurrentAccessor());
+ assertNull(context.getPreviousAccessor());
}
public void test_Get_Value_Body()
@@ -95,18 +95,18 @@ public class ASTPropertyTest
context.setCurrentNode( pRef );
assertEquals( root.getClass(), context.getCurrentType() );
- assertEquals( null, context.getPreviousType() );
+ assertNull(context.getPreviousType());
assertEquals( root, context.getCurrentObject() );
- assertEquals( null, context.getCurrentAccessor() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getCurrentAccessor());
+ assertNull(context.getPreviousAccessor());
Object value = p.getValue( context, root );
assertEquals( root.get( "nested" ), value );
assertEquals( root.getClass(), context.getCurrentType() );
- assertEquals( null, context.getPreviousType() );
- assertEquals( null, context.getCurrentAccessor() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getPreviousType());
+ assertNull(context.getCurrentAccessor());
+ assertNull(context.getPreviousAccessor());
}
public void test_Get_Source()
@@ -130,14 +130,14 @@ public class ASTPropertyTest
assertEquals( Object.class, context.getCurrentType() );
assertEquals( Map.class, context.getCurrentAccessor() );
assertEquals( root.getClass(), context.getPreviousType() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getPreviousAccessor());
assertEquals( root.get( "nested" ), context.getCurrentObject() );
assert Map.class.isAssignableFrom( context.getCurrentAccessor() );
assertEquals( root.getClass(), context.getPreviousType() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getPreviousAccessor());
}
public void test_Set_Source()
@@ -164,7 +164,7 @@ public class ASTPropertyTest
assert Map.class.isAssignableFrom( context.getCurrentAccessor() );
assertEquals( root.getClass(), context.getPreviousType() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getPreviousAccessor());
}
public void test_Indexed_Object_Type()
@@ -206,7 +206,7 @@ public class ASTPropertyTest
assertEquals( ".getList()", listp.toGetSourceString( context, root ) );
assertEquals( List.class, context.getCurrentType() );
assertEquals( Root.class, context.getCurrentAccessor() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getPreviousAccessor());
assertEquals( root.getClass(), context.getPreviousType() );
assertEquals( root.getList(), context.getCurrentObject() );
@@ -225,7 +225,7 @@ public class ASTPropertyTest
assertEquals( ".getList()", chain.toGetSourceString( context, root ) );
assertEquals( List.class, context.getCurrentType() );
assertEquals( Root.class, context.getCurrentAccessor() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getPreviousAccessor());
assertEquals( Root.class, context.getPreviousType() );
assertEquals( root.getList(), context.getCurrentObject() );
diff --git a/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java
b/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java
index 0f4723d..349a00d 100644
--- a/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java
@@ -24,6 +24,7 @@ import static junit.framework.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collection;
+import junit.framework.Assert;
import org.apache.commons.ognl.Ognl;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -77,7 +78,7 @@ public class ConstantTreeTest
public void runTest()
throws Exception
{
- assertTrue( Ognl.isConstant( getExpression(), _context ) == (
(Boolean) getExpectedResult() ).booleanValue() );
+ Assert.assertEquals(Ognl.isConstant(getExpression(), _context),
((Boolean) getExpectedResult()).booleanValue());
}
/*
diff --git
a/src/test/java/org/apache/commons/ognl/test/NumericConversionTest.java
b/src/test/java/org/apache/commons/ognl/test/NumericConversionTest.java
index 04209e4..a78d8fb 100644
--- a/src/test/java/org/apache/commons/ognl/test/NumericConversionTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/NumericConversionTest.java
@@ -27,6 +27,7 @@ import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collection;
+import junit.framework.Assert;
import org.apache.commons.ognl.OgnlException;
import org.apache.commons.ognl.OgnlOps;
import org.junit.Test;
@@ -213,7 +214,7 @@ public class NumericConversionTest
double scalingFactor = Math.pow( 10, scale ), v1 = ( (Number)
value ).doubleValue() * scalingFactor, v2 =
( (Number) expectedValue ).doubleValue() * scalingFactor;
- assertTrue( (int) v1 == (int) v2 );
+ Assert.assertEquals((int) v1, (int) v2);
}
else
{
diff --git
a/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java
b/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java
index 23b0d93..a2171de 100644
---
a/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java
+++
b/src/test/java/org/apache/commons/ognl/test/SimpleNavigationChainTreeTest.java
@@ -24,6 +24,7 @@ import static junit.framework.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collection;
+import junit.framework.Assert;
import org.apache.commons.ognl.Ognl;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -78,6 +79,6 @@ public class SimpleNavigationChainTreeTest
public void runTest()
throws Exception
{
- assertTrue( Ognl.isSimpleNavigationChain( getExpression(), _context )
== ( (Boolean) getExpectedResult() ).booleanValue() );
+ Assert.assertEquals(Ognl.isSimpleNavigationChain(getExpression(),
_context), ((Boolean) getExpectedResult()).booleanValue());
}
}
diff --git
a/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java
b/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java
index debe179..989c3b8 100644
--- a/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/SimplePropertyTreeTest.java
@@ -24,6 +24,7 @@ import static junit.framework.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collection;
+import junit.framework.Assert;
import org.apache.commons.ognl.Ognl;
import org.junit.Before;
import org.junit.runner.RunWith;
@@ -78,6 +79,6 @@ public class SimplePropertyTreeTest
public void runTest()
throws Exception
{
- assertTrue( Ognl.isSimpleProperty( getExpression(), _context ) == (
(Boolean) getExpectedResult() ).booleanValue() );
+ Assert.assertEquals(Ognl.isSimpleProperty(getExpression(), _context),
((Boolean) getExpectedResult()).booleanValue());
}
}
diff --git
a/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java
b/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java
index aeee9de..57738d7 100644
---
a/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java
+++
b/src/test/java/org/apache/commons/ognl/test/accessors/ListPropertyAccessorTest.java
@@ -56,7 +56,7 @@ public class ListPropertyAccessorTest
assertEquals( List.class, context.getCurrentAccessor() );
assertEquals( Object.class, context.getCurrentType() );
assertEquals( Integer.TYPE, context.getPreviousType() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getPreviousAccessor());
}
@Test
@@ -76,7 +76,7 @@ public class ListPropertyAccessorTest
assertEquals( List.class, context.getCurrentAccessor() );
assertEquals( Object.class, context.getCurrentType() );
assertEquals( Integer.class, context.getPreviousType() );
- assertEquals( null, context.getPreviousAccessor() );
+ assertNull(context.getPreviousAccessor());
}
@Test
diff --git
a/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
b/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
index b3ddf7f..a28152c 100644
---
a/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
+++
b/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
@@ -242,7 +242,7 @@ public class TestExpressionCompiler
GenericRoot root = new GenericRoot();
Node node = Ognl.compileExpression( _context, root, "cracker.param" );
- assertEquals( null, node.getAccessor().get( _context, root ) );
+ assertNull(node.getAccessor().get(_context, root));
node.getAccessor().set( _context, root, 0 );
assertEquals( 0, node.getAccessor().get( _context, root ) );
