summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/Controller/ContentNegotiationTest.php2
-rw-r--r--tests/ControllerTest.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/Controller/ContentNegotiationTest.php b/tests/Controller/ContentNegotiationTest.php
index d5e142d..4775306 100644
--- a/tests/Controller/ContentNegotiationTest.php
+++ b/tests/Controller/ContentNegotiationTest.php
@@ -38,7 +38,7 @@ class ContentNegotiationTest extends \PHPUnit_Framework_TestCase
$trait->expects($this->once())->method('getRequest')->will($this->returnValue($request));
$trait->expects($this->once())->method('getNegotiator')->with($this->equalTo($type))->will($this->returnValue($negotiator));
- $buildClass = $this->callProtectedMethod($trait, 'getNegotiatorName', [$type]);
+ $buildClass = $this->callPrivateMethod($trait, 'getNegotiatorName', [$type]);
$result = $trait->{$method}($priorities);
$this->assertEquals($buildClass, $negotiatorClass, "Obtained wrong negotiator class");
diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
index b980d48..b0f357f 100644
--- a/tests/ControllerTest.php
+++ b/tests/ControllerTest.php
@@ -5,14 +5,14 @@ namespace Jasny;
use Jasny\Controller;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
-use Jasny\Controller\TestHelper;
+use Jasny\Controller\TestHelper as ControllerTestHelper;
/**
* @covers Jasny\Controller
*/
class ControllerTest extends \PHPUnit_Framework_TestCase
{
- use TestHelper;
+ use ControllerTestHelper;
/**
* Test running controller