Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 88b1170

Browse filesBrowse files
author
Drak
committed
[HttpFoundation] Refactor tests.
1 parent 2257a3d commit 88b1170
Copy full SHA for 88b1170
Expand file treeCollapse file tree

8 files changed

+126
-93
lines changed

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractSessionStorageTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractSessionStorageTest.php
+37-54Lines changed: 37 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,12 @@
22

33
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
44

5-
use Symfony\Component\HttpFoundation\Session\Storage\AbstractSessionStorage;
5+
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
6+
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler;
7+
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
68
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
79
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
810

9-
/**
10-
* Turn AbstractSessionStorage into something concrete because
11-
* certain mocking features are broken in PHPUnit-Mock-Objects < 1.1.2
12-
* @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/73
13-
*/
14-
class ConcreteSessionStorage extends AbstractSessionStorage
15-
{
16-
}
17-
18-
class CustomHandlerSessionStorage extends AbstractSessionStorage implements \SessionHandlerInterface
19-
{
20-
public function open($path, $id)
21-
{
22-
}
23-
24-
public function close()
25-
{
26-
}
27-
28-
public function read($id)
29-
{
30-
}
31-
32-
public function write($id, $data)
33-
{
34-
}
35-
36-
public function destroy($id)
37-
{
38-
}
39-
40-
public function gc($lifetime)
41-
{
42-
}
43-
}
44-
4511
/**
4612
* Test class for AbstractSessionStorage.
4713
*
@@ -51,14 +17,14 @@ public function gc($lifetime)
5117
*
5218
* @runTestsInSeparateProcesses
5319
*/
54-
class AbstractSessionStorageTest extends \PHPUnit_Framework_TestCase
20+
class SessionStorageTest extends \PHPUnit_Framework_TestCase
5521
{
5622
/**
5723
* @return AbstractSessionStorage
5824
*/
59-
protected function getStorage($options = array())
25+
protected function getStorage(array $options = array())
6026
{
61-
$storage = new CustomHandlerSessionStorage($options);
27+
$storage = new SessionStorage($options);
6228
$storage->registerBag(new AttributeBag);
6329

6430
return $storage;
@@ -112,31 +78,19 @@ public function testRegenerateDestroy()
11278
$this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
11379
}
11480

115-
public function testCustomSaveHandlers()
116-
{
117-
$storage = new CustomHandlerSessionStorage();
118-
$this->assertEquals('user', ini_get('session.save_handler'));
119-
}
120-
121-
public function testNativeSaveHandlers()
122-
{
123-
$storage = new ConcreteSessionStorage();
124-
$this->assertNotEquals('user', ini_get('session.save_handler'));
125-
}
126-
12781
public function testDefaultSessionCacheLimiter()
12882
{
12983
ini_set('session.cache_limiter', 'nocache');
13084

131-
$storage = new ConcreteSessionStorage();
85+
$storage = new SessionStorage();
13286
$this->assertEquals('', ini_get('session.cache_limiter'));
13387
}
13488

13589
public function testExplicitSessionCacheLimiter()
13690
{
13791
ini_set('session.cache_limiter', 'nocache');
13892

139-
$storage = new ConcreteSessionStorage(array('cache_limiter' => 'public'));
93+
$storage = new SessionStorage(array('cache_limiter' => 'public'));
14094
$this->assertEquals('public', ini_get('session.cache_limiter'));
14195
}
14296

@@ -160,4 +114,33 @@ public function testCookieOptions()
160114

161115
$this->assertEquals($options, $gco);
162116
}
117+
118+
public function testSetSaveHandler()
119+
{
120+
$storage = $this->getStorage();
121+
$storage->setSaveHandler(new \StdClass());
122+
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy', $storage->getSaveHandler());
123+
}
124+
125+
public function testSetSaveHandlerPHP53()
126+
{
127+
if (version_compare(phpversion(), '5.4.0', '>=')) {
128+
$this->markTestSkipped('Test skipped, for PHP 5.3 only.');
129+
}
130+
131+
$storage = $this->getStorage();
132+
$storage->setSaveHandler(new NativeFileSessionHandler());
133+
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy', $storage->getSaveHandler());
134+
}
135+
136+
public function testSetSaveHandlerPHP54()
137+
{
138+
if (version_compare(phpversion(), '5.4.0', '<')) {
139+
$this->markTestSkipped('Test skipped, for PHP 5.4+ only.');
140+
}
141+
142+
$storage = $this->getStorage();
143+
$storage->setSaveHandler(new NullSessionHandler());
144+
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
145+
}
163146
}

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcacheSessionStorageTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcacheSessionStorageTest.php
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
3+
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;
44

5-
use Symfony\Component\HttpFoundation\Session\Storage\MemcacheSessionStorage;
5+
use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcacheSessionHandler;
66

7-
class MemcacheSessionStorageTest extends \PHPUnit_Framework_TestCase
7+
class MemcacheSessionHandlerTest extends \PHPUnit_Framework_TestCase
88
{
99
/**
1010
* @var MemcacheSessionStorage
@@ -20,7 +20,7 @@ protected function setUp()
2020
}
2121

2222
$this->memcache = $this->getMock('Memcache');
23-
$this->storage = new MemcacheSessionStorage($this->memcache);
23+
$this->storage = new MemcacheSessionHandler($this->memcache);
2424
}
2525

2626
protected function tearDown()
@@ -42,7 +42,7 @@ public function testConstructingWithServerPool()
4242
{
4343
$mock = $this->getMock('Memcache');
4444

45-
$storage = new MemcacheSessionStorage($mock, array(
45+
$storage = new MemcacheSessionHandler($mock, array(
4646
'serverpool' => array(
4747
array('host' => '127.0.0.2'),
4848
array('host' => '127.0.0.3',

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcachedSessionStorageTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcachedSessionStorageTest.php
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

3-
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
3+
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;
44

5-
use Symfony\Component\HttpFoundation\Session\Storage\MemcachedSessionStorage;
5+
use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler;
66

7-
class MemcacheddSessionStorageTest extends \PHPUnit_Framework_TestCase
7+
class MemcacheddSessionHandlerTest extends \PHPUnit_Framework_TestCase
88
{
99
/**
10-
* @var MemcachedSessionStorage
10+
* @var MemcachedSessionHandler
1111
*/
1212
protected $storage;
1313

@@ -20,7 +20,7 @@ protected function setUp()
2020
}
2121

2222
$this->memcached = $this->getMock('Memcached');
23-
$this->storage = new MemcachedSessionStorage($this->memcached);
23+
$this->storage = new MemcachedSessionHandler($this->memcached);
2424
}
2525

2626
protected function tearDown()

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileSessionStorageTest.php

Copy file name to clipboard
+23-6Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
22

3-
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
3+
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;
44

5-
use Symfony\Component\HttpFoundation\Session\Storage\NativeFileSessionStorage;
5+
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler;
6+
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
67

78
/**
89
* Test class for NativeFileSessionStorage.
@@ -11,13 +12,29 @@
1112
*
1213
* @runTestsInSeparateProcesses
1314
*/
14-
class NativeFileSessionStorageTest extends \PHPUnit_Framework_TestCase
15+
class NativeFileSessionHandlerTest extends \PHPUnit_Framework_TestCase
1516
{
16-
public function testSaveHandlers()
17+
public function testConstruct()
1718
{
18-
$storage = new NativeFileSessionStorage(sys_get_temp_dir(), array('name' => 'TESTING'));
19-
$this->assertEquals('files', ini_get('session.save_handler'));
19+
$storage = new SessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler(sys_get_temp_dir()));
20+
21+
if (version_compare(phpversion(), '5.4.0', '<')) {
22+
$this->assertEquals('files', $storage->getSaveHandler()->getSaveHandlerName());
23+
$this->assertEquals('files', ini_get('session.save_handler'));
24+
} else {
25+
$this->assertEquals('files', $storage->getSaveHandler()->getSaveHandlerName());
26+
$this->assertEquals('user', ini_get('session.save_handler'));
27+
}
28+
2029
$this->assertEquals(sys_get_temp_dir(), ini_get('session.save_path'));
2130
$this->assertEquals('TESTING', ini_get('session.name'));
2231
}
32+
33+
public function testConstructDefault()
34+
{
35+
$path = ini_get('session.save_path');
36+
$storage = new SessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler());
37+
38+
$this->assertEquals($path, ini_get('session.save_path'));
39+
}
2340
}

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorageTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorageTest.php
+15-6Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,35 @@
11
<?php
22

3-
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
3+
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;
44

5-
use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcacheSessionStorage;
5+
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeMemcacheSessionHandler;
6+
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
67

78
/**
8-
* Test class for NativeMemcacheSessionStorage.
9+
* Test class for NativeMemcacheSessionHandler.
910
*
1011
* @author Drak <drak@zikula.org>
1112
*
1213
* @runTestsInSeparateProcesses
1314
*/
14-
class NativeMemcacheSessionStorageTest extends \PHPUnit_Framework_TestCase
15+
class NativeMemcacheSessionHandlerTest extends \PHPUnit_Framework_TestCase
1516
{
1617
public function testSaveHandlers()
1718
{
1819
if (!extension_loaded('memcache')) {
1920
$this->markTestSkipped('Skipped tests SQLite extension is not present');
2021
}
2122

22-
$storage = new NativeMemcacheSessionStorage('tcp://127.0.0.1:11211?persistent=0', array('name' => 'TESTING'));
23-
$this->assertEquals('memcache', ini_get('session.save_handler'));
23+
$storage = new SessionStorage(array('name' => 'TESTING'), new NativeMemcacheSessionHandler('tcp://127.0.0.1:11211?persistent=0'));
24+
25+
if (version_compare(phpversion(), '5.4.0', '<')) {
26+
$this->assertEquals('memcache', $storage->getSaveHandler()->getSaveHandlerName());
27+
$this->assertEquals('memcache', ini_get('session.save_handler'));
28+
} else {
29+
$this->assertEquals('memcache', $storage->getSaveHandler()->getSaveHandlerName());
30+
$this->assertEquals('user', ini_get('session.save_handler'));
31+
}
32+
2433
$this->assertEquals('tcp://127.0.0.1:11211?persistent=0', ini_get('session.save_path'));
2534
$this->assertEquals('TESTING', ini_get('session.name'));
2635
}

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorageTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorageTest.php
+14-6Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?php
22

3-
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
3+
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;
44

5-
use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcachedSessionStorage;
5+
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeMemcachedSessionHandler;
6+
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
67

78
/**
8-
* Test class for NativeMemcachedSessionStorage.
9+
* Test class for NativeMemcachedSessionHandler.
910
*
1011
* @author Drak <drak@zikula.org>
1112
*
1213
* @runTestsInSeparateProcesses
1314
*/
14-
class NativeMemcachedSessionStorageTest extends \PHPUnit_Framework_TestCase
15+
class NativeMemcachedSessionHandlerTest extends \PHPUnit_Framework_TestCase
1516
{
1617
public function testSaveHandlers()
1718
{
@@ -22,9 +23,16 @@ public function testSaveHandlers()
2223
// test takes too long if memcached server is not running
2324
ini_set('memcached.sess_locking', '0');
2425

25-
$storage = new NativeMemcachedSessionStorage('127.0.0.1:11211', array('name' => 'TESTING'));
26+
$storage = new SessionStorage(array('name' => 'TESTING'), new NativeMemcachedSessionHandler('127.0.0.1:11211'));
27+
28+
if (version_compare(phpversion(), '5.4.0', '<')) {
29+
$this->assertEquals('memcached', $storage->getSaveHandler()->getSaveHandlerName());
30+
$this->assertEquals('memcached', ini_get('session.save_handler'));
31+
} else {
32+
$this->assertEquals('memcached', $storage->getSaveHandler()->getSaveHandlerName());
33+
$this->assertEquals('user', ini_get('session.save_handler'));
34+
}
2635

27-
$this->assertEquals('memcached', ini_get('session.save_handler'));
2836
$this->assertEquals('127.0.0.1:11211', ini_get('session.save_path'));
2937
$this->assertEquals('TESTING', ini_get('session.name'));
3038
}

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorageTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorageTest.php
+15-5Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
22

3-
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
3+
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;
44

5-
use Symfony\Component\HttpFoundation\Session\Storage\NativeSqliteSessionStorage;
5+
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSqliteSessionHandler;
6+
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
67

78
/**
89
* Test class for NativeSqliteSessionStorage.
@@ -11,16 +12,25 @@
1112
*
1213
* @runTestsInSeparateProcesses
1314
*/
14-
class NativeSqliteSessionStorageTest extends \PHPUnit_Framework_TestCase
15+
class NativeSqliteSessionHandlerTest extends \PHPUnit_Framework_TestCase
1516
{
1617
public function testSaveHandlers()
1718
{
1819
if (!extension_loaded('sqlite')) {
1920
$this->markTestSkipped('Skipped tests SQLite extension is not present');
2021
}
2122

22-
$storage = new NativeSqliteSessionStorage(sys_get_temp_dir().'/sqlite.db', array('name' => 'TESTING'));
23-
$this->assertEquals('sqlite', ini_get('session.save_handler'));
23+
$storage = new SessionStorage(array('name' => 'TESTING'), new NativeSqliteSessionHandler(sys_get_temp_dir().'/sqlite.db'));
24+
25+
if (version_compare(phpversion(), '5.4.0', '<')) {
26+
$this->assertEquals('sqlite', $storage->getSaveHandler()->getSaveHandlerName());
27+
$this->assertEquals('sqlite', ini_get('session.save_handler'));
28+
} else {
29+
$this->assertEquals('sqlite', $storage->getSaveHandler()->getSaveHandlerName());
30+
$this->assertEquals('user', ini_get('session.save_handler'));
31+
}
32+
33+
2434
$this->assertEquals(sys_get_temp_dir().'/sqlite.db', ini_get('session.save_path'));
2535
$this->assertEquals('TESTING', ini_get('session.name'));
2636
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.