Skip to content

Fix SessionMiddlewareTest and cover new case with reopening #33668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 1 commit into from
Aug 25, 2022
Merged

Fix SessionMiddlewareTest and cover new case with reopening #33668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected function setUp(): void {
* @UseSession
*/
public function testSessionNotClosedOnBeforeController() {
$session = $this->getSessionMock(0);
$session = $this->getSessionMock(0, 1);

$this->reflector->reflect($this, __FUNCTION__);
$middleware = new SessionMiddleware($this->reflector, $session);
Expand All @@ -53,8 +53,20 @@ public function testSessionClosedOnAfterController() {
$middleware->afterController($this->controller, __FUNCTION__, new Response());
}

/**
* @UseSession
*/
public function testSessionReopenedAndClosedOnBeforeController() {
$session = $this->getSessionMock(1, 1);

$this->reflector->reflect($this, __FUNCTION__);
$middleware = new SessionMiddleware($this->reflector, $session);
$middleware->beforeController($this->controller, __FUNCTION__);
$middleware->afterController($this->controller, __FUNCTION__, new Response());
}

public function testSessionClosedOnBeforeController() {
$session = $this->getSessionMock(1);
$session = $this->getSessionMock(0);

$this->reflector->reflect($this, __FUNCTION__);
$middleware = new SessionMiddleware($this->reflector, $session);
Expand All @@ -72,13 +84,15 @@ public function testSessionNotClosedOnAfterController() {
/**
* @return mixed
*/
private function getSessionMock($expectedCloseCount) {
private function getSessionMock(int $expectedCloseCount, int $expectedReopenCount = 0) {
$session = $this->getMockBuilder('\OC\Session\Memory')
->disableOriginalConstructor()
->getMock();

$session->expects($this->exactly($expectedCloseCount))
->method('close');
$session->expects($this->exactly($expectedReopenCount))
->method('reopen');
return $session;
}
}