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

alignment with 3.0.7 backports (SPR-8674)

Browse Source
This commit is contained in:
Juergen Hoeller
2011-12-01 18:51:36 +00:00
parent 71e0a506b9
commit 33b53b7cca
6 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,7 +200,7 @@ public class CollectionToCollectionConverterTests {
@Test(expected=ConverterNotFoundException.class)
public void elementTypesNotConvertible() throws Exception {
List<Resource> resources = new ArrayList<Resource>();
List<String> resources = new ArrayList<String>();
resources.add(null);
resources.add(null);
TypeDescriptor sourceType = new TypeDescriptor(getClass().getField("strings"));

25
org.springframework.core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
View File

@@ -1,10 +1,20 @@
package org.springframework.core.convert.support;
/*
* Copyright 2002-2011 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.
*/
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
package org.springframework.core.convert.support;
import java.util.Arrays;
import java.util.HashMap;
@@ -14,10 +24,13 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.convert.ConversionFailedException;
import org.springframework.core.convert.ConverterNotFoundException;
import org.springframework.core.convert.TypeDescriptor;
import static org.junit.Assert.*;
public class MapToMapConverterTests {
private GenericConversionService conversionService = new GenericConversionService();