From dfc5b482c90c262c71d4d208d21dabdfc2e50f13 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 15 Dec 2011 23:47:45 +0100 Subject: [PATCH] IntelliJ IDEA 11 project setup --- .../test/util/ReflectionTestUtilsTests.java | 15 +- spring-framework.ipr | 2351 +++++++++-------- 2 files changed, 1217 insertions(+), 1149 deletions(-) diff --git a/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java index f707fdc40c..f4d25452ad 100644 --- a/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java +++ b/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java @@ -203,21 +203,24 @@ public class ReflectionTestUtilsTests { @Test public void invokeMethodWithAutoboxingAndUnboxing() { - int difference = invokeMethod(component, "subtract", 5, 2); - assertEquals("subtract(5, 2)", 3, difference); + // IntelliJ IDEA 11 won't accept int assignment here + Integer difference = invokeMethod(component, "subtract", 5, 2); + assertEquals("subtract(5, 2)", 3, difference.intValue()); } @Ignore("[SPR-8644] findMethod() does not currently support var-args") @Test public void invokeMethodWithPrimitiveVarArgs() { - int sum = invokeMethod(component, "add", 1, 2, 3, 4); - assertEquals("add(1,2,3,4)", 10, sum); + // IntelliJ IDEA 11 won't accept int assignment here + Integer sum = invokeMethod(component, "add", 1, 2, 3, 4); + assertEquals("add(1,2,3,4)", 10, sum.intValue()); } @Test public void invokeMethodWithPrimitiveVarArgsAsSingleArgument() { - int sum = invokeMethod(component, "add", new int[] { 1, 2, 3, 4 }); - assertEquals("add(1,2,3,4)", 10, sum); + // IntelliJ IDEA 11 won't accept int assignment here + Integer sum = invokeMethod(component, "add", new int[] { 1, 2, 3, 4 }); + assertEquals("add(1,2,3,4)", 10, sum.intValue()); } @Test diff --git a/spring-framework.ipr b/spring-framework.ipr index b5ce1ca485..afc4643b98 100644 --- a/spring-framework.ipr +++ b/spring-framework.ipr @@ -1,1143 +1,1208 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://www.w3.org/1999/xhtml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://www.w3.org/1999/xhtml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +