From 886cc2cce85bb63d0ddf7777afd5dc6d06655f3c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 23 Apr 2013 13:54:19 +0200 Subject: [PATCH] Fixed general test suite problems found during OpenJDK 8 upgrade Issue: SPR-9639 (cherry picked from commit 19f783b) --- .../jmx/export/MBeanExporterOperationsTests.java | 8 +++++++- .../test/java/org/springframework/test/web/Person.java | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java index f2bee32668..64981ffa38 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ import javax.management.modelmbean.RequiredModelMBean; import javax.management.modelmbean.ModelMBeanInfo; import javax.management.modelmbean.ModelMBeanInfoSupport; +import org.junit.Test; + import org.springframework.jmx.AbstractMBeanServerTests; import org.springframework.jmx.JmxTestBean; import org.springframework.jmx.export.naming.ObjectNamingStrategy; @@ -36,6 +38,7 @@ import static org.junit.Assert.*; */ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests { + @Test public void testRegisterManagedResourceWithUserSuppliedObjectName() throws Exception { ObjectName objectName = ObjectNameManager.getInstance("spring:name=Foo"); @@ -50,6 +53,7 @@ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests { assertEquals("Incorrect name on MBean", name, bean.getName()); } + @Test public void testRegisterExistingMBeanWithUserSuppliedObjectName() throws Exception { ObjectName objectName = ObjectNameManager.getInstance("spring:name=Foo"); ModelMBeanInfo info = new ModelMBeanInfoSupport("myClass", "myDescription", null, null, null, null); @@ -63,6 +67,7 @@ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests { assertEquals(info, infoFromServer); } + @Test public void testRegisterManagedResourceWithGeneratedObjectName() throws Exception { final ObjectName objectNameTemplate = ObjectNameManager.getInstance("spring:type=Test"); @@ -88,6 +93,7 @@ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests { assertObjectNameMatchesTemplate(objectNameTemplate, reg2); } + @Test public void testRegisterManagedResourceWithGeneratedObjectNameWithoutUniqueness() throws Exception { final ObjectName objectNameTemplate = ObjectNameManager.getInstance("spring:type=Test"); diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java b/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java index 53ef980ee2..061c1ba564 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,10 +79,15 @@ public class Person { ObjectUtils.nullSafeEquals(this.someBoolean, otherPerson.someBoolean)); } + @Override + public int hashCode() { + return Person.class.hashCode(); + } + @Override public String toString() { return "Person [name=" + this.name + ", someDouble=" + this.someDouble + ", someBoolean=" + this.someBoolean + "]"; } -} \ No newline at end of file +}