@@ -376,4 +376,55 @@ public void csrfToken_same_session_shouldBeSame() {
376376 "getCsrfToken() should always return the same value for the same session" ,
377377 token1 , token2 );
378378 }
379+
380+ @ Test
381+ public void valueUnbound_wrappedSessionIsNotCleanedUp () {
382+ ReentrantLock lock = Mockito .mock (ReentrantLock .class );
383+ Mockito .when (lock .isHeldByCurrentThread ()).thenReturn (true );
384+ mockService = new MockVaadinServletService () {
385+ @ Override
386+ protected Lock getSessionLock (WrappedSession wrappedSession ) {
387+ return lock ;
388+ }
389+ };
390+
391+ VaadinSession vaadinSession = new VaadinSession (mockService );
392+
393+ WrappedSession httpSession = Mockito .mock (WrappedSession .class );
394+ vaadinSession .refreshTransients (httpSession , mockService );
395+
396+ VaadinSession .setCurrent (vaadinSession );
397+ mockService .setCurrentInstances (Mockito .mock (VaadinRequest .class ),
398+ Mockito .mock (VaadinResponse .class ));
399+
400+ try {
401+ vaadinSession
402+ .valueUnbound (Mockito .mock (HttpSessionBindingEvent .class ));
403+
404+ Assert .assertNotNull (vaadinSession .getSession ());
405+ } finally {
406+ CurrentInstance .clearAll ();
407+ }
408+ }
409+
410+ @ Test
411+ public void setState_closedState_sessionAttributeIsCleanedUp () {
412+ ReentrantLock lock = Mockito .mock (ReentrantLock .class );
413+ Mockito .when (lock .isHeldByCurrentThread ()).thenReturn (true );
414+ mockService = new MockVaadinServletService () {
415+ @ Override
416+ protected Lock getSessionLock (WrappedSession wrappedSession ) {
417+ return lock ;
418+ }
419+ };
420+
421+ VaadinSession vaadinSession = new VaadinSession (mockService );
422+ WrappedSession httpSession = Mockito .mock (WrappedSession .class );
423+ vaadinSession .refreshTransients (httpSession , mockService );
424+
425+ vaadinSession .setState (VaadinSessionState .CLOSING );
426+ vaadinSession .setState (VaadinSessionState .CLOSED );
427+
428+ Assert .assertNull (vaadinSession .getSession ());
429+ }
379430}
0 commit comments