From f4a9460bc6780ddebefab8039dc69311534aa463 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Sat, 21 Nov 2009 18:36:40 +0000 Subject: [PATCH] moved test case where it belongs git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2493 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../core/convert/support/DefaultConversionTests.java | 9 --------- .../support/GenericConversionServiceTests.java | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/org.springframework.core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java index bc48cb5d59f..7f601f11b96 100644 --- a/org.springframework.core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java +++ b/org.springframework.core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java @@ -712,15 +712,6 @@ public class DefaultConversionTests { getClass().getField("genericMap2"))); assertEquals(new Long(1), result.get(1L)); } - - @Test - public void genericConverterDelegatingBackToConversionServiceConverterNotFound() { - try { - conversionService.convert("1", Integer[].class); - } catch (ConversionFailedException e) { - assertTrue(e.getCause() instanceof ConverterNotFoundException); - } - } @Test @SuppressWarnings("unchecked") diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index 8f549e9ab7a..f38083f7b96 100644 --- a/org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -129,5 +129,16 @@ public class GenericConversionServiceTests { Integer three = conversionService.convert("3", int.class); assertEquals(3, three.intValue()); } + + @Test + public void genericConverterDelegatingBackToConversionServiceConverterNotFound() { + try { + conversionService.addGenericConverter(new ObjectToArrayConverter(conversionService)); + conversionService.convert("1", Integer[].class); + fail("Should hace failed"); + } catch (ConversionFailedException e) { + assertTrue(e.getCause() instanceof ConverterNotFoundException); + } + } }