root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Revised assertion refactoring in AbstractExpressionTests

This commit is contained in:
Juergen Hoeller 2018-02-10 18:17:40 +01:00
parent 91965500cb
commit b5bd977d9a
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-expression/src/test/java/org/springframework/expression/spel/AbstractExpressionTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -142,7 +142,7 @@ public abstract class AbstractExpressionTests {
else { else {
assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value); assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
} }
assertNull("Type of the result was not as expected. Expected '" + expectedClassOfResult + assertTrue("Type of the result was not as expected. Expected '" + expectedClassOfResult +
"' but result was of type '" + resultType + "'", expectedClassOfResult.equals(resultType)); "' but result was of type '" + resultType + "'", expectedClassOfResult.equals(resultType));
boolean isWritable = expr.isWritable(eContext); boolean isWritable = expr.isWritable(eContext);

3
spring-expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -111,4 +111,5 @@ public class BooleanExpressionTests extends AbstractExpressionTests {
evaluate("!null", Boolean.TRUE, Boolean.class, false); evaluate("!null", Boolean.TRUE, Boolean.class, false);
evaluate("null ? 'foo' : 'bar'", "bar", String.class, false); evaluate("null ? 'foo' : 'bar'", "bar", String.class, false);
} }
} }

53
spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -111,30 +111,6 @@ public class EvaluationTests extends AbstractExpressionTests {
o = parser.parseExpression("wibble2.bar").getValue(ctx); o = parser.parseExpression("wibble2.bar").getValue(ctx);
} }
@SuppressWarnings("rawtypes")
static class TestClass {
public Foo wibble;
private Foo wibble2;
public Map map;
public Map<String, Integer> mapStringToInteger;
public List<String> list;
public List list2;
private Map map2;
private List<String> foo;
public Map getMap2() { return this.map2; }
public Foo getWibble2() { return this.wibble2; }
public List<String> getFoo() { return this.foo; }
public void setFoo(List<String> newfoo) { this.foo = newfoo; }
}
public static class Foo {
public Foo() {}
public String bar = "hello";
}
@Test @Test
public void testElvis01() { public void testElvis01() {
evaluate("'Andy'?:'Dave'", "Andy", String.class); evaluate("'Andy'?:'Dave'", "Andy", String.class);
@ -1477,6 +1453,32 @@ public class EvaluationTests extends AbstractExpressionTests {
} }
@SuppressWarnings("rawtypes")
static class TestClass {
public Foo wibble;
private Foo wibble2;
public Map map;
public Map<String, Integer> mapStringToInteger;
public List<String> list;
public List list2;
private Map map2;
private List<String> foo;
public Map getMap2() { return this.map2; }
public Foo getWibble2() { return this.wibble2; }
public List<String> getFoo() { return this.foo; }
public void setFoo(List<String> newfoo) { this.foo = newfoo; }
}
public static class Foo {
public String bar = "hello";
public Foo() {}
}
static class MyBeanResolver implements BeanResolver { static class MyBeanResolver implements BeanResolver {
@Override @Override
@ -1487,7 +1489,6 @@ public class EvaluationTests extends AbstractExpressionTests {
} }
throw new AccessException("not heard of "+beanName); throw new AccessException("not heard of "+beanName);
} }
} }
} }