Merge pull request #104 from FriendsOfSymfony/more-tests

add some more tests

Author: ddeboer

src/UserContext/HashGenerator.php

@@ -11,6 +11,8 @@
 
 namespace FOS\HttpCache\UserContext;
 
+use FOS\HttpCache\Exception\InvalidArgumentException;
+
 /**
  * Generate a hash for a UserContext by getting all the parameters needed across all registered services
  */
@@ -26,12 +28,12 @@ class HashGenerator
  *
  * @param ContextProviderInterface[] $providers
  *
- * @throws \InvalidArgumentException If no providers are supplied
+ * @throws InvalidArgumentException If no providers are supplied
  */
  public function __construct(array $providers)
  {
  if (0 === count($providers)) {
- throw new \InvalidArgumentException('You must supply at least one provider');
+ throw new InvalidArgumentException('You must supply at least one provider');
  }
 
  foreach ($providers as $provider) {

tests/Unit/CacheInvalidatorTest.php

@@ -19,14 +19,15 @@
 use FOS\HttpCache\Exception\UnsupportedProxyOperationException;
 use FOS\HttpCache\ProxyClient\Varnish;
 use \Mockery;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class CacheInvalidatorTest extends \PHPUnit_Framework_TestCase
 {
  public function testSupportsTrue()
  {
- $httpCache = new Varnish(array('localhost'));
+ $proxyClient = new Varnish(array('localhost'));
 
- $cacheInvalidator = new CacheInvalidator($httpCache);
+ $cacheInvalidator = new CacheInvalidator($proxyClient);
 
  $this->assertTrue($cacheInvalidator->supports(CacheInvalidator::PATH));
  $this->assertTrue($cacheInvalidator->supports(CacheInvalidator::REFRESH));
@@ -35,9 +36,9 @@ public function testSupportsTrue()
 
  public function testSupportsFalse()
  {
- $httpCache = \Mockery::mock('\FOS\HttpCache\ProxyClient\ProxyClientInterface');
+ $proxyClient = \Mockery::mock('\FOS\HttpCache\ProxyClient\ProxyClientInterface');
 
- $cacheInvalidator = new CacheInvalidator($httpCache);
+ $cacheInvalidator = new CacheInvalidator($proxyClient);
 
  $this->assertFalse($cacheInvalidator->supports(CacheInvalidator::PATH));
  $this->assertFalse($cacheInvalidator->supports(CacheInvalidator::REFRESH));
@@ -49,21 +50,21 @@ public function testSupportsFalse()
  */
  public function testSupportsInvalid()
  {
- $httpCache = \Mockery::mock('\FOS\HttpCache\ProxyClient\ProxyClientInterface');
+ $proxyClient = \Mockery::mock('\FOS\HttpCache\ProxyClient\ProxyClientInterface');
 
- $cacheInvalidator = new CacheInvalidator($httpCache);
+ $cacheInvalidator = new CacheInvalidator($proxyClient);
 
  $cacheInvalidator->supports('garbage');
  }
 
  public function testInvalidatePath()
  {
- $httpCache = \Mockery::mock('\FOS\HttpCache\ProxyClient\Invalidation\PurgeInterface')
+ $purge = \Mockery::mock('\FOS\HttpCache\ProxyClient\Invalidation\PurgeInterface')
  ->shouldReceive('purge')->once()->with('/my/route')
  ->shouldReceive('flush')->once()
  ->getMock();
 
- $cacheInvalidator = new CacheInvalidator($httpCache);
+ $cacheInvalidator = new CacheInvalidator($purge);
 
  $cacheInvalidator
  ->invalidatePath('/my/route')
@@ -74,12 +75,12 @@ public function testInvalidatePath()
  public function testRefreshPath()
  {
  $headers = array('X' => 'Y');
- $httpCache = \Mockery::mock('\FOS\HttpCache\ProxyClient\Invalidation\RefreshInterface')
+ $refresh = \Mockery::mock('\FOS\HttpCache\ProxyClient\Invalidation\RefreshInterface')
  ->shouldReceive('refresh')->once()->with('/my/route', $headers)
  ->shouldReceive('flush')->never()
  ->getMock();
 
- $cacheInvalidator = new CacheInvalidator($httpCache);
+ $cacheInvalidator = new CacheInvalidator($refresh);
 
  $cacheInvalidator
  ->refreshPath('/my/route', $headers)
@@ -142,8 +143,8 @@ public function testInvalidateTagsCustomHeader()
 
  public function testMethodException()
  {
- $proxy = \Mockery::mock('\FOS\HttpCache\ProxyClient\ProxyClientInterface');
- $cacheInvalidator = new CacheInvalidator($proxy);
+ $proxyClient = \Mockery::mock('\FOS\HttpCache\ProxyClient\ProxyClientInterface');
+ $cacheInvalidator = new CacheInvalidator($proxyClient);
  try {
  $cacheInvalidator->invalidatePath('/');
  $this->fail('Expected exception');
@@ -187,11 +188,11 @@ public function testProxyClientExceptionsAreLogged()
  $exceptions = new ExceptionCollection();
  $exceptions->add($unreachableException)->add($responseException);
 
- $httpCache = \Mockery::mock('\FOS\HttpCache\ProxyClient\ProxyClientInterface')
+ $proxyClient = \Mockery::mock('\FOS\HttpCache\ProxyClient\ProxyClientInterface')
  ->shouldReceive('flush')->once()->andThrow($exceptions)
  ->getMock();
 
- $cacheInvalidator = new CacheInvalidator($httpCache);
+ $cacheInvalidator = new CacheInvalidator($proxyClient);
 
  $logger = \Mockery::mock('\Psr\Log\LoggerInterface')
  ->shouldReceive('log')->once()
@@ -212,4 +213,14 @@ public function testProxyClientExceptionsAreLogged()
  ->flush()
  ;
  }
+
+ public function testEventDispatcher()
+ {
+ $proxyClient = new Varnish(array('localhost'));
+
+ $cacheInvalidator = new CacheInvalidator($proxyClient);
+ $eventDispatcher = new EventDispatcher();
+ $cacheInvalidator->setEventDispatcher($eventDispatcher);
+ $this->assertSame($eventDispatcher, $cacheInvalidator->getEventDispatcher());
+ }
 }

tests/Unit/ProxyClient/VarnishTest.php

@@ -45,6 +45,25 @@ public function testBanEverything()
  $this->assertEquals('fos.lo', $headers->get('Host'));
  }
 
+ public function testBanHeaders()
+ {
+ $varnish = new Varnish(array('http://127.0.0.1:123'), 'fos.lo', $this->client);
+ $varnish->setDefaultBanHeaders(
+ array('A' => 'B')
+ );
+ $varnish->setDefaultBanHeader('Test', '.*');
+ $varnish->ban(array())->flush();
+
+ $requests = $this->getRequests();
+ $this->assertCount(1, $requests);
+ $this->assertEquals('BAN', $requests[0]->getMethod());
+
+ $headers = $requests[0]->getHeaders();
+ $this->assertEquals('.*', $headers->get('Test'));
+ $this->assertEquals('B', $headers->get('A'));
+ $this->assertEquals('fos.lo', $headers->get('Host'));
+ }
+
  public function testBanPath()
  {
  $varnish = new Varnish(array('http://127.0.0.1:123'), 'fos.lo', $this->client);
@@ -62,6 +81,17 @@ public function testBanPath()
  $this->assertEquals('text/html', $headers->get('X-Content-Type'));
  }
 
+ /**
+ * @expectedException \FOS\HttpCache\Exception\InvalidArgumentException
+ */
+ public function testBanPathEmptyHost()
+ {
+ $varnish = new Varnish(array('http://127.0.0.1:123'), 'fos.lo', $this->client);
+
+ $hosts = array();
+ $varnish->banPath('/articles/.*', 'text/html', $hosts);
+ }
+
  public function testPurge()
  {
  $self = $this; // For PHP 5.3

tests/Unit/UserContext/HashGeneratorTest.php

@@ -25,6 +25,14 @@ public function testGenerateHash()
 
  $this->assertEquals($expectedHash, $hashGenerator->generateHash());
  }
+
+ /**
+ * @expectedException \FOS\HttpCache\Exception\InvalidArgumentException
+ */
+ public function testConstructorError()
+ {
+ new HashGenerator(array());
+ }
 }
 
 class FooProvider implements ContextProviderInterface

tests/Unit/UserContext/UserContextTest.php

@@ -40,5 +40,14 @@ public function testSetParameters()
  $this->assertFalse($userContext->hasParameter('authenticated'));
  $this->assertTrue($userContext->hasParameter('foo'));
  $this->assertTrue($userContext->hasParameter('roles'));
+
+ $parameters = array();
+ foreach($userContext as $name => $value) {
+ $parameters[$name] = $value;
+ }
+ $this->assertEquals(
+ array('roles' => array('ROLE_USER'), 'foo' => 'bar'),
+ $parameters
+ );
  }
 }