Skip to content

Commit e71d0c3

Browse files
committed
Let JUnit handle exception
1 parent 9f9ead5 commit e71d0c3

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

src/test/java/org/apache/commons/jexl3/Issues200Test.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -665,10 +665,11 @@ public void test278() throws Exception {
665665

666666
@Test
667667
public void test279() throws Exception {
668-
final Log logger = null; //LogFactory.getLog(Issues200Test.class);
668+
final Log logger = null; // LogFactory.getLog(Issues200Test.class);
669669
Object result;
670670
JexlScript script;
671671
final JexlContext ctxt = new Context279();
672+
// @formatter:off
672673
final String[] srcs = {
673674
"var z = null; identity(z[0]);",
674675
"var z = null; z.0;",
@@ -690,8 +691,9 @@ public void test279() throws Exception {
690691
"var z = { 'y' : [null, null] }; z.y[1].foo()",
691692
"var z = { 'y' : [null, null] }; z.y.1.foo()"
692693
};
694+
// @formatter:on
693695
for (int i = 0; i < 2; ++i) {
694-
for (final boolean strict : new boolean[]{true, false}) {
696+
for (final boolean strict : new boolean[] { true, false }) {
695697
final JexlEngine jexl = new JexlBuilder().safe(false).strict(strict).create();
696698
for (final String src : srcs) {
697699
script = jexl.createScript(src);
@@ -741,12 +743,7 @@ public void test279b() throws Exception {
741743
script = jexl.createScript(src);
742744
result = script.execute(ctxt, "abc");
743745
assertEquals("a", result);
744-
result = null;
745-
try {
746-
result = script.execute(ctxt, (Object) null);
747-
} catch (final JexlException xany) {
748-
assertNotNull(xany.getMessage());
749-
}
746+
result = script.execute(ctxt, (Object) null);
750747
assertNull(result);
751748
}
752749

@@ -755,6 +752,7 @@ public void test285() throws Exception {
755752
final List<String> out = new ArrayList<>(6);
756753
final JexlContext ctxt = new MapContext();
757754
ctxt.set("$out", out);
755+
// @formatter:off
758756
final String src = "for(var b: ['g','h','i']) {\n"
759757
+ " var c = b;\n"
760758
+ " $out.add(c);\n"
@@ -765,7 +763,7 @@ public void test285() throws Exception {
765763
+ "}"
766764
+ " \n"
767765
+ "$out.size()";
768-
766+
// @formatter:on
769767
final JexlFeatures features = new JexlFeatures();
770768
features.lexical(true);
771769
final JexlEngine jexl = new JexlBuilder()

0 commit comments

Comments
 (0)