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

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2023-07-12 11:50:11 +02:00
parent 2e3fbac9a0 68f2b0ca59
commit 16b9640af2
32 changed files with 185 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
View File

@@ -79,15 +79,15 @@ public class SessionScopeTests {
String name = "sessionScopedObject";
assertThat(session.getAttribute(name)).isNull();
TestBean bean = (TestBean) this.beanFactory.getBean(name);
assertThat(count.intValue()).isEqualTo(1);
assertThat(count.get()).isEqualTo(1);
assertThat(bean).isEqualTo(session.getAttribute(name));
assertThat(this.beanFactory.getBean(name)).isSameAs(bean);
assertThat(count.intValue()).isEqualTo(1);
assertThat(count.get()).isEqualTo(1);
// should re-propagate updated attribute
requestAttributes.requestCompleted();
assertThat(bean).isEqualTo(session.getAttribute(name));
assertThat(count.intValue()).isEqualTo(2);
assertThat(count.get()).isEqualTo(2);
}
@Test
@@ -108,12 +108,12 @@ public class SessionScopeTests {
String name = "sessionScopedObject";
assertThat(session.getAttribute(name)).isNull();
TestBean bean = (TestBean) this.beanFactory.getBean(name);
assertThat(count.intValue()).isEqualTo(1);
assertThat(count.get()).isEqualTo(1);
// should re-propagate updated attribute
requestAttributes.requestCompleted();
assertThat(bean).isEqualTo(session.getAttribute(name));
assertThat(count.intValue()).isEqualTo(2);
assertThat(count.get()).isEqualTo(2);
}
@Test