This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-ognl.git
commit 15e311f1866bb968709c6d5c73cadb1bcae8ebaa
Author: Gary Gregory <ggreg...@rocketsoftware.com>
AuthorDate: Fri Jun 23 15:42:10 2023 -0400
[test] Throw a specialized RuntimeException instead of
RuntimeException
---
.../org/apache/commons/ognl/test/ArrayCreationTest.java | 10 ++++++----
.../org/apache/commons/ognl/test/ArrayElementsTest.java | 12 +++++++-----
.../commons/ognl/test/CollectionDirectPropertyTest.java | 12 +++++++-----
.../commons/ognl/test/CompilingPropertyAccessor.java | 2 +-
.../org/apache/commons/ognl/test/IndexedPropertyTest.java | 10 ++++++----
.../apache/commons/ognl/test/InterfaceInheritanceTest.java | 12 +++++++-----
.../java/org/apache/commons/ognl/test/MapCreationTest.java | 13 ++++++++++---
.../apache/commons/ognl/test/MethodWithConversionTest.java | 10 ++++++----
.../org/apache/commons/ognl/test/NestedMethodTest.java | 10 ++++++----
.../java/org/apache/commons/ognl/test/NullHandlerTest.java | 10 ++++++----
.../commons/ognl/test/NumberFormatExceptionTest.java | 14 ++++++++------
.../commons/ognl/test/ObjectIndexedPropertyTest.java | 10 ++++++----
.../java/org/apache/commons/ognl/test/OperatorTest.java | 10 ++++++----
.../java/org/apache/commons/ognl/test/Performance.java | 2 +-
.../org/apache/commons/ognl/test/PrimitiveArrayTest.java | 10 ++++++----
.../commons/ognl/test/PrimitiveNullHandlingTest.java | 4 +++-
.../org/apache/commons/ognl/test/PrivateAccessorTest.java | 10 ++++++----
17 files changed, 98 insertions(+), 63 deletions(-)
diff --git a/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
b/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
index c1a7024..f25ce12 100644
--- a/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.ExpressionSyntaxException;
import org.apache.commons.ognl.test.objects.Entry;
import org.apache.commons.ognl.test.objects.Root;
@@ -26,9 +31,6 @@ 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
@@ -93,7 +95,7 @@ public class ArrayCreationTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length" );
+ fail( "don't understand TEST format with length" );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
b/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
index ae6b19f..0b1b5f6 100644
--- a/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
@@ -18,16 +18,18 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+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
@@ -91,7 +93,7 @@ public class ArrayElementsTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length" );
+ fail( "don't understand TEST format with length" );
}
data.add( tmp );
diff --git
a/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
b/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
index e9fd304..ea48ab1 100644
---
a/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
+++
b/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
@@ -18,15 +18,17 @@
*/
package org.apache.commons.ognl.test;
-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 static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.commons.ognl.test.objects.Root;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
@RunWith(value = Parameterized.class)
public class CollectionDirectPropertyTest
extends OgnlTestCase
@@ -84,7 +86,7 @@ public class CollectionDirectPropertyTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length" );
+ fail( "don't understand TEST format with length" );
}
data.add( tmp );
diff --git
a/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java
b/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java
index 46a481b..ede1b34 100644
--- a/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java
+++ b/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java
@@ -55,7 +55,7 @@ public class CompilingPropertyAccessor
}
catch ( Exception ex )
{
- throw new RuntimeException( ex );
+ throw new IllegalStateException( ex );
}
};
diff --git
a/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
b/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
index b0386f0..6cbf0b0 100644
--- a/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
@@ -18,15 +18,17 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
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
@@ -85,7 +87,7 @@ public class IndexedPropertyTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
diff --git
a/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
b/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
index 78a793d..5baaa15 100644
--- a/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
@@ -18,6 +18,12 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+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;
@@ -31,10 +37,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
@RunWith(value = Parameterized.class)
public class InterfaceInheritanceTest
extends OgnlTestCase
@@ -99,7 +101,7 @@ public class InterfaceInheritanceTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java
b/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java
index 56101a6..1647cf2 100644
--- a/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/MapCreationTest.java
@@ -18,13 +18,20 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
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.*;
-
@RunWith(value = Parameterized.class)
public class MapCreationTest
extends OgnlTestCase
@@ -102,7 +109,7 @@ public class MapCreationTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
diff --git
a/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
b/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
index 4d3d4e9..cd5d4bf 100644
--- a/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/MethodWithConversionTest.java
@@ -18,15 +18,17 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+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 MethodWithConversionTest
extends OgnlTestCase
@@ -74,7 +76,7 @@ public class MethodWithConversionTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
b/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
index 0546803..5ea24c4 100644
--- a/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/NestedMethodTest.java
@@ -18,15 +18,17 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.test.objects.Component;
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 NestedMethodTest
extends OgnlTestCase
@@ -72,7 +74,7 @@ public class NestedMethodTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
b/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
index b5d74ae..eed7410 100644
--- a/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/NullHandlerTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.OgnlRuntime;
import org.apache.commons.ognl.test.objects.CorrectedObject;
import org.junit.Before;
@@ -26,9 +31,6 @@ 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 NullHandlerTest
extends OgnlTestCase
@@ -72,7 +74,7 @@ public class NullHandlerTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
diff --git
a/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java
b/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java
index de9959e..249d189 100644
--- a/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/NumberFormatExceptionTest.java
@@ -18,17 +18,19 @@
*/
package org.apache.commons.ognl.test;
-import org.apache.commons.ognl.OgnlException;
-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 static org.junit.Assert.fail;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collection;
+import org.apache.commons.ognl.OgnlException;
+import org.apache.commons.ognl.test.objects.Simple;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
@RunWith(value = Parameterized.class)
public class NumberFormatExceptionTest
extends OgnlTestCase
@@ -91,7 +93,7 @@ public class NumberFormatExceptionTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + TEST.length );
+ fail( "don't understand TEST format with length " +
TEST.length );
}
data.add( tmp );
diff --git
a/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java
b/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java
index 2c1002f..c1e3254 100644
--- a/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ObjectIndexedPropertyTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.OgnlException;
import org.apache.commons.ognl.test.objects.Bean1;
import org.apache.commons.ognl.test.objects.ObjectIndexed;
@@ -25,9 +30,6 @@ 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 ObjectIndexedPropertyTest
extends OgnlTestCase
@@ -94,7 +96,7 @@ public class ObjectIndexedPropertyTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
b/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
index 652f79e..0d8ffa5 100644
--- a/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/OperatorTest.java
@@ -18,13 +18,15 @@
*/
package org.apache.commons.ognl.test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collection;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
@RunWith(value = Parameterized.class)
public class OperatorTest
extends OgnlTestCase
@@ -70,7 +72,7 @@ public class OperatorTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
diff --git a/src/test/java/org/apache/commons/ognl/test/Performance.java
b/src/test/java/org/apache/commons/ognl/test/Performance.java
index 1eb711f..4271b37 100644
--- a/src/test/java/org/apache/commons/ognl/test/Performance.java
+++ b/src/test/java/org/apache/commons/ognl/test/Performance.java
@@ -322,7 +322,7 @@ public class Performance
{
return _iterations >= MAX_ITERATIONS;
}
- throw new RuntimeException( "no maximums specified" );
+ throw new IllegalStateException( "no maximums specified" );
}
/*
diff --git a/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java
b/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java
index 502fc86..245f0eb 100644
--- a/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/PrimitiveArrayTest.java
@@ -18,14 +18,16 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
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 PrimitiveArrayTest
extends OgnlTestCase
@@ -80,7 +82,7 @@ public class PrimitiveArrayTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + TEST.length );
+ fail( "don't understand TEST format with length " +
TEST.length );
}
data.add( tmp );
diff --git
a/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java
b/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java
index 8b8fcc6..be08a02 100644
--- a/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/PrimitiveNullHandlingTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collection;
@@ -87,7 +89,7 @@ public class PrimitiveNullHandlingTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
diff --git
a/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
b/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
index 1f9b1c7..bdc84d0 100644
--- a/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/PrivateAccessorTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.commons.ognl.test;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.apache.commons.ognl.DefaultMemberAccess;
import org.apache.commons.ognl.test.objects.Root;
import org.junit.Before;
@@ -26,9 +31,6 @@ 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 PrivateAccessorTest
extends OgnlTestCase
@@ -80,7 +82,7 @@ public class PrivateAccessorTest
break;
default:
- throw new RuntimeException( "don't understand TEST format
with length " + element.length );
+ fail( "don't understand TEST format with length " +
element.length );
}
data.add( tmp );
