Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPR-8718 Revert fix from earlier for now (need a different approach).

Browse Source
This commit is contained in:
Rossen Stoyanchev
2011-09-26 17:58:49 +00:00
parent 5309e43ea0
commit 3d50d416eb
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
View File

@@ -24,7 +24,6 @@ import java.util.Locale;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.MutablePropertyValues;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
@@ -69,8 +68,6 @@ public class NumberFormattingTests {
LocaleContextHolder.setLocale(null); LocaleContextHolder.setLocale(null);
} }
// TODO [SPR-8718] determine why changes to GenericConversionService broke this test
@Ignore("Disabled until SPR-8718 is resolved")
@Test @Test
public void testDefaultNumberFormatting() { public void testDefaultNumberFormatting() {
MutablePropertyValues propertyValues = new MutablePropertyValues(); MutablePropertyValues propertyValues = new MutablePropertyValues();

7
org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
View File

@@ -485,7 +485,7 @@ public class GenericConversionService implements ConfigurableConversionService {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private final class ConverterAdapter implements ConditionalGenericConverter { private final class ConverterAdapter implements GenericConverter {
private final ConvertiblePair typeInfo; private final ConvertiblePair typeInfo;
@@ -500,11 +500,6 @@ public class GenericConversionService implements ConfigurableConversionService {
return Collections.singleton(this.typeInfo); return Collections.singleton(this.typeInfo);
} }
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
return (typeInfo.getTargetType().equals(targetType.getObjectType()) &&
typeInfo.getSourceType().isAssignableFrom(sourceType.getObjectType()));
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
if (source == null) { if (source == null) {
return convertNullSource(sourceType, targetType); return convertNullSource(sourceType, targetType);

2
org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
View File

@@ -37,6 +37,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.core.convert.ConversionFailedException; import org.springframework.core.convert.ConversionFailedException;
import org.springframework.core.convert.ConverterNotFoundException; import org.springframework.core.convert.ConverterNotFoundException;
@@ -209,6 +210,7 @@ public class GenericConversionServiceTests {
// SPR-8718 // SPR-8718
@Test(expected=ConverterNotFoundException.class) @Test(expected=ConverterNotFoundException.class)
@Ignore("TODO")
public void convertSuperTarget() { public void convertSuperTarget() {
conversionService.addConverter(new ColorConverter()); conversionService.addConverter(new ColorConverter());
conversionService.convert("#000000", SystemColor.class); conversionService.convert("#000000", SystemColor.class);