Skip to content

Commit

Permalink
Start building against Spring Framework 6.0.10 snapshots
Browse files Browse the repository at this point in the history
This reverts commit bc63c51 as Framework's previous behavior has
been restored.

See gh-35751
  • Loading branch information
wilkinsona committed Jun 6, 2023
1 parent 3eaaf58 commit 036b982
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8

kotlinVersion=1.8.21
nativeBuildToolsVersion=0.9.22
springFrameworkVersion=6.0.9
springFrameworkVersion=6.0.10-SNAPSHOT
tomcatVersion=10.1.8

kotlin.stdlib.default.dependency=false
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.SortedMap;
import java.util.stream.Collectors;

import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -245,7 +244,7 @@ void bindToMapWhenHasExistingMapShouldReplaceOnlyNewContents() {
existing.put("baz", 1001);
Bindable<Map<String, Integer>> target = STRING_INTEGER_MAP.withExistingValue(existing);
Map<String, Integer> result = this.binder.bind("foo", target).get();
assertThat(result).isInstanceOf(HashMap.class);
assertThat(result).isExactlyInstanceOf(HashMap.class);
assertThat(result).hasSize(2);
assertThat(result).containsEntry("bar", 1);
assertThat(result).containsEntry("baz", 1001);
Expand All @@ -254,10 +253,10 @@ void bindToMapWhenHasExistingMapShouldReplaceOnlyNewContents() {
@Test
void bindToMapShouldRespectMapType() {
this.sources.add(new MockConfigurationPropertySource("foo.bar", "1"));
ResolvableType type = ResolvableType.forClassWithGenerics(SortedMap.class, String.class, Integer.class);
ResolvableType type = ResolvableType.forClassWithGenerics(HashMap.class, String.class, Integer.class);
Object defaultMap = this.binder.bind("foo", STRING_INTEGER_MAP).get();
Object customMap = this.binder.bind("foo", Bindable.of(type)).get();
assertThat(customMap).isInstanceOf(SortedMap.class).isNotInstanceOf(defaultMap.getClass());
assertThat(customMap).isExactlyInstanceOf(HashMap.class).isNotInstanceOf(defaultMap.getClass());
}

@Test
Expand Down

0 comments on commit 036b982

Please sign in to comment.