From 1edefe991a6b2be1c53391c7f0b510905c65a93e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 20 Oct 2009 20:14:49 +0000 Subject: [PATCH] fixed getBean signature ambiguity in tests git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2165 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../factory/AbstractBeanFactoryTests.java | 2 +- .../factory/AbstractBeanFactoryTests.java | 2 +- .../web/context/AbstractBeanFactoryTests.java | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java index 98bcb441d5c..a04d1796443 100644 --- a/org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java @@ -55,7 +55,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public void testGetBeanWithNullArg() { try { - getBeanFactory().getBean(null); + getBeanFactory().getBean((String) null); fail("Can't get null bean"); } catch (IllegalArgumentException ex) { diff --git a/org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java index 98bcb441d5c..a04d1796443 100644 --- a/org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java +++ b/org.springframework.web.portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java @@ -55,7 +55,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public void testGetBeanWithNullArg() { try { - getBeanFactory().getBean(null); + getBeanFactory().getBean((String) null); fail("Can't get null bean"); } catch (IllegalArgumentException ex) { diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java index 2d7b2aabd94..cd81c78fa6e 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2009 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.web.context; import java.beans.PropertyEditorSupport; @@ -47,7 +63,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public void testGetBeanWithNullArg() { try { - getBeanFactory().getBean(null); + getBeanFactory().getBean((String) null); fail("Can't get null bean"); } catch (IllegalArgumentException ex) {