Polishing

(cherry picked from commit efc5b47)

Author: jhoeller

spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java

@@ -46,8 +46,7 @@
 import static org.junit.Assert.*;
 
 /**
- * Checks the behaviour of the SpelCompiler.
- * This should cover compilation all compiled node types.
+ * Checks SpelCompiler behavior. This should cover compilation all compiled node types.
  *
  * @author Andy Clement
  * @since 4.1
@@ -320,9 +319,8 @@ public void realLiteral() throws Exception {
 		double resultI = expression.getValue(new TestClass1(), Double.TYPE);
 		assertCanCompile(expression);
 		double resultC = expression.getValue(new TestClass1(), Double.TYPE);
-		assertEquals(3.4d, resultI,0.1d);
-		assertEquals(3.4d, resultC,0.1d);
-
+		assertEquals(3.4d, resultI, 0.1d);
+		assertEquals(3.4d, resultC, 0.1d);
 		assertEquals(3.4d, expression.getValue());
 	}
 
@@ -455,13 +453,12 @@ public void intLiteral() throws Exception {
 		assertCanCompile(expression);
 		assertEquals(new Integer(42), expression.getValue(Integer.class));
 
-		// Code gen is different for -1 .. 6 because there are bytecode instructions specifically for those
-		// values
+		// Code gen is different for -1 .. 6 because there are bytecode instructions specifically for those values
 
 		// Not an int literal but an opminus with one operand:
-//		expression = parser.parseExpression("-1");
-//		assertCanCompile(expression);
-//		assertEquals(-1, expression.getValue());
+		// expression = parser.parseExpression("-1");
+		// assertCanCompile(expression);
+		// assertEquals(-1, expression.getValue());
 		expression = parser.parseExpression("0");
 		assertCanCompile(expression);
 		assertEquals(0, expression.getValue());
@@ -506,8 +503,8 @@ public void floatLiteral() throws Exception {
 		float resultI = expression.getValue(new TestClass1(), Float.TYPE);
 		assertCanCompile(expression);
 		float resultC = expression.getValue(new TestClass1(), Float.TYPE);
-		assertEquals(3.4f, resultI,0.1f);
-		assertEquals(3.4f, resultC,0.1f);
+		assertEquals(3.4f, resultI, 0.1f);
+		assertEquals(3.4f, resultC, 0.1f);
 
 		assertEquals(3.4f, expression.getValue());
 	}
@@ -3293,10 +3290,10 @@ public void constructorReference() throws Exception {
 		assertCanCompile(expression);
 		Object o = expression.getValue();
 		assertEquals(testclass8,o.getClass().getName());
-		TestClass8 tc8 = (TestClass8)o;
+		TestClass8 tc8 = (TestClass8) o;
 		assertEquals(42, tc8.i);
 		assertEquals("123", tc8.s);
-		assertEquals(4.0d, tc8.d,0.5d);
+		assertEquals(4.0d, tc8.d, 0.5d);
 		assertEquals(true, tc8.z);
 
 		// no-arg ctor
@@ -4351,15 +4348,16 @@ public void mixingItUp_propertyAccessIndexerOpLtTernaryRootNull() throws Excepti
 
 		expression = parser.parseExpression("DR[0].three");
 		Object v = expression.getValue(payload);
-		assertEquals("Lorg/springframework/expression/spel/SpelCompilationCoverageTests$Three", getAst().getExitDescriptor());
+		assertEquals("Lorg/springframework/expression/spel/SpelCompilationCoverageTests$Three",
+				getAst().getExitDescriptor());
 
 		Expression expression = parser.parseExpression("DR[0].three.four lt 0.1d?#root:null");
 		v = expression.getValue(payload);
 
 		SpelExpression sExpr = (SpelExpression) expression;
 		Ternary ternary = (Ternary) sExpr.getAST();
 		OpLT oplt = (OpLT) ternary.getChild(0);
-		CompoundExpression cExpr = (CompoundExpression)oplt.getLeftOperand();
+		CompoundExpression cExpr = (CompoundExpression) oplt.getLeftOperand();
 		String cExprExitDescriptor = cExpr.getExitDescriptor();
 		assertEquals("D", cExprExitDescriptor);
 		assertEquals("Z", oplt.getExitDescriptor());
@@ -4599,14 +4597,16 @@ public void compilerWithGenerics_12040_3() {
 
 	@Test
 	public void indexerMapAccessor_12045() throws Exception {
-		SpelParserConfiguration spc = new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE,getClass().getClassLoader());
+		SpelParserConfiguration spc = new SpelParserConfiguration(
+				SpelCompilerMode.IMMEDIATE,getClass().getClassLoader());
 		SpelExpressionParser sep = new SpelExpressionParser(spc);
 		expression=sep.parseExpression("headers[command]");
 		MyMessage root = new MyMessage();
 		assertEquals("wibble", expression.getValue(root));
-		// This next call was failing because the isCompilable check in Indexer did not check on the key being compilable
-		// (and also generateCode in the Indexer was missing the optimization that it didn't need necessarily need to call
-		// generateCode for that accessor)
+		// This next call was failing because the isCompilable check in Indexer
+		// did not check on the key being compilable (and also generateCode in the
+		// Indexer was missing the optimization that it didn't need necessarily
+		// need to call generateCode for that accessor)
 		assertEquals("wibble", expression.getValue(root));
 		assertCanCompile(expression);