@@ -386,4 +386,101 @@ public void csrfToken_same_session_shouldBeSame() {
386386 "getCsrfToken() should always return the same value for the same session" ,
387387 token1 , token2 );
388388 }
389+
390+ @ Test
391+ public void valueUnbound_explicitVaadinSessionClose_wrappedSessionIsNotCleanedUp () {
392+ ReentrantLock lock = Mockito .mock (ReentrantLock .class );
393+ Mockito .when (lock .isHeldByCurrentThread ()).thenReturn (true );
394+ mockService = new MockVaadinServletService () {
395+ @ Override
396+ protected Lock getSessionLock (WrappedSession wrappedSession ) {
397+ return lock ;
398+ }
399+
400+ };
401+
402+ VaadinSession vaadinSession = new VaadinSession (mockService ) {
403+ @ Override
404+ public boolean hasLock () {
405+ return true ;
406+ }
407+ };
408+
409+ vaadinSession .setAttribute (VaadinSession .CLOSE_SESSION_EXPLICITLY ,
410+ true );
411+
412+ WrappedSession httpSession = Mockito .mock (WrappedSession .class );
413+ vaadinSession .refreshTransients (httpSession , mockService );
414+
415+ VaadinSession .setCurrent (vaadinSession );
416+ mockService .setCurrentInstances (Mockito .mock (VaadinRequest .class ),
417+ Mockito .mock (VaadinResponse .class ));
418+
419+ try {
420+ vaadinSession
421+ .valueUnbound (Mockito .mock (HttpSessionBindingEvent .class ));
422+
423+ Assert .assertNotNull (vaadinSession .getSession ());
424+ } finally {
425+ CurrentInstance .clearAll ();
426+ }
427+ }
428+
429+ @ Test
430+ public void valueUnbound_implicitVaadinSessionClose_wrappedSessionIsCleanedUp () {
431+ ReentrantLock lock = Mockito .mock (ReentrantLock .class );
432+ Mockito .when (lock .isHeldByCurrentThread ()).thenReturn (true );
433+ mockService = new MockVaadinServletService () {
434+ @ Override
435+ protected Lock getSessionLock (WrappedSession wrappedSession ) {
436+ return lock ;
437+ }
438+
439+ };
440+
441+ VaadinSession vaadinSession = new VaadinSession (mockService ) {
442+ @ Override
443+ public boolean hasLock () {
444+ return true ;
445+ }
446+ };
447+
448+ WrappedSession httpSession = Mockito .mock (WrappedSession .class );
449+ vaadinSession .refreshTransients (httpSession , mockService );
450+
451+ VaadinSession .setCurrent (vaadinSession );
452+ mockService .setCurrentInstances (Mockito .mock (VaadinRequest .class ),
453+ Mockito .mock (VaadinResponse .class ));
454+
455+ try {
456+ vaadinSession
457+ .valueUnbound (Mockito .mock (HttpSessionBindingEvent .class ));
458+
459+ Assert .assertNull (vaadinSession .getSession ());
460+ } finally {
461+ CurrentInstance .clearAll ();
462+ }
463+ }
464+
465+ @ Test
466+ public void setState_closedState_sessionFieldIsCleanedUp () {
467+ ReentrantLock lock = Mockito .mock (ReentrantLock .class );
468+ Mockito .when (lock .isHeldByCurrentThread ()).thenReturn (true );
469+ mockService = new MockVaadinServletService () {
470+ @ Override
471+ protected Lock getSessionLock (WrappedSession wrappedSession ) {
472+ return lock ;
473+ }
474+ };
475+
476+ VaadinSession vaadinSession = new VaadinSession (mockService );
477+ WrappedSession httpSession = Mockito .mock (WrappedSession .class );
478+ vaadinSession .refreshTransients (httpSession , mockService );
479+
480+ vaadinSession .setState (VaadinSessionState .CLOSING );
481+ vaadinSession .setState (VaadinSessionState .CLOSED );
482+
483+ Assert .assertNull (vaadinSession .getSession ());
484+ }
485+
389486}
0 commit comments