Skip to content
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.

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

Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase #396

Merged
merged 1 commit into from
Dec 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"require-dev": {
"php": ">=5.5.17",
"phpunit/phpunit": "^4.8"
"phpunit/phpunit": "^4.8.35"
},
"suggest": {
"php-64bit": ">=5.5.9"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
use Google\Auth\FetchAuthTokenInterface;
use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `AdWordsGuzzleLogMessageFormatterProvider`.
Expand All @@ -30,14 +30,14 @@
* @small
*/
class AdWordsGuzzleLogMessageFormatterProviderTest
extends PHPUnit_Framework_TestCase {
extends TestCase {

private $adWordsGuzzleLogMessageFormatter;
private $reportDownloadResult;
private $awql;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$fetchAuthTokenInterfaceStub = $this
Expand Down
6 changes: 3 additions & 3 deletions tests/Google/AdsApi/AdWords/AdWordsHeaderHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
namespace Google\AdsApi\AdWords;

use Google\Auth\FetchAuthTokenInterface;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `AdWordsHeaderHandler`.
*
* @see AdWordsHeaderHandler
* @small
*/
class AdWordsHeaderHandlerTest extends PHPUnit_Framework_TestCase {
class AdWordsHeaderHandlerTest extends TestCase {

private $adWordsHeaderHandler;
private $adWordsSessionBuilder;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$this->adWordsHeaderHandler = new AdWordsHeaderHandler();
Expand Down
6 changes: 3 additions & 3 deletions tests/Google/AdsApi/AdWords/AdWordsNormalizerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
use Google\AdsApi\AdWords\Testing\FakeBudget;
use Google\AdsApi\AdWords\Testing\FakeMoney;
use Google\AdsApi\AdWords\Testing\FakeMutateResult;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
use Symfony\Component\Serializer\Serializer;
Expand All @@ -32,12 +32,12 @@
* @see AdWordsNormalizer
* @small
*/
class AdWordsNormalizerTest extends PHPUnit_Framework_TestCase {
class AdWordsNormalizerTest extends TestCase {

private $serializer;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$this->serializer = new Serializer(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use Google\Auth\FetchAuthTokenInterface;
use Monolog\Handler\NullHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Integration test for `AdWordsServices`.
Expand All @@ -39,7 +39,7 @@
* @see AdWordsServices
* @large
*/
class AdWordsServicesIntegrationTest extends PHPUnit_Framework_TestCase {
class AdWordsServicesIntegrationTest extends TestCase {

private static $WSDL_FILE_DIR;

Expand All @@ -50,7 +50,7 @@ class AdWordsServicesIntegrationTest extends PHPUnit_Framework_TestCase {
private $adWordsServices;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
self::$WSDL_FILE_DIR = __DIR__ . '/../../../../';
Expand Down
6 changes: 3 additions & 3 deletions tests/Google/AdsApi/AdWords/AdWordsSessionBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
use Monolog\Handler\NullHandler;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;

/**
Expand All @@ -30,13 +30,13 @@
* @see AdWordsSessionBuilder
* @small
*/
class AdWordsSessionBuilderTest extends PHPUnit_Framework_TestCase {
class AdWordsSessionBuilderTest extends TestCase {

private $adWordsSessionBuilder;
private $fetchAuthTokenInterfaceMock;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$this->adWordsSessionBuilder = new AdWordsSessionBuilder();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
namespace Google\AdsApi\AdWords;

use Google\AdsApi\Common\Testing\FakeSoapPayloadsAndLogsProvider;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `AdWordsSoapLogMessageFormatterProvider`.
Expand All @@ -26,15 +26,15 @@
* @small
*/
class AdWordsSoapLogMessageFormatterProviderTest
extends PHPUnit_Framework_TestCase {
extends TestCase {

private $adWordsSoapLogMessageFormatter;
private $requestHttpHeadersMock;
private $requestSoapXmlMock;
private $responseSoapXmlMock;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$this->adWordsSoapLogMessageFormatter =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
use GuzzleHttp\Psr7\Response;
use Monolog\Handler\NullHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `BatchJobUploadStatus`.
*
* @see BatchJobUploadStatus
* @small
*/
class BatchJobUploadStatusTest extends PHPUnit_Framework_TestCase {
class BatchJobUploadStatusTest extends TestCase {

private static $DUMMY_UPLOAD_URL = 'https://www.googleapis.com/upload';
private static $DUMMY_RESUMABLE_UPLOAD_URL =
Expand All @@ -43,7 +43,7 @@ class BatchJobUploadStatusTest extends PHPUnit_Framework_TestCase {
private $adWordsSession;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$fetchAuthTokenInterfaceStub = $this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
use GuzzleHttp\Psr7\Response;
use Monolog\Handler\NullHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `BatchJobsDelegate`.
*
* @see BatchJobsDelegate
* @small
*/
class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
class BatchJobsDelegateTest extends TestCase {

private static $DUMMY_UPLOAD_URL = 'https://www.googleapis.com/upload';
private static $DUMMY_RESUMABLE_UPLOAD_URL =
Expand All @@ -50,7 +50,7 @@ class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
private $adWordsSession;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$fetchAuthTokenInterfaceStub = $this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
use GuzzleHttp\Psr7\Response;
use Monolog\Handler\NullHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `BatchJobsDelegate`.
*
* @see BatchJobsDelegate
* @small
*/
class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
class BatchJobsDelegateTest extends TestCase {

private static $DUMMY_UPLOAD_URL = 'https://www.googleapis.com/upload';
private static $DUMMY_RESUMABLE_UPLOAD_URL =
Expand All @@ -50,7 +50,7 @@ class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
private $adWordsSession;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$fetchAuthTokenInterfaceStub = $this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
use GuzzleHttp\Psr7\Response;
use Monolog\Handler\NullHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `BatchJobsDelegate`.
*
* @see BatchJobsDelegate
* @small
*/
class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
class BatchJobsDelegateTest extends TestCase {

private static $DUMMY_UPLOAD_URL = 'https://www.googleapis.com/upload';
private static $DUMMY_RESUMABLE_UPLOAD_URL =
Expand All @@ -50,7 +50,7 @@ class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
private $adWordsSession;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$fetchAuthTokenInterfaceStub = $this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
use GuzzleHttp\Psr7\Response;
use Monolog\Handler\NullHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `BatchJobsDelegate`.
*
* @see BatchJobsDelegate
* @small
*/
class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
class BatchJobsDelegateTest extends TestCase {

private static $DUMMY_UPLOAD_URL = 'https://www.googleapis.com/upload';
private static $DUMMY_RESUMABLE_UPLOAD_URL =
Expand All @@ -50,7 +50,7 @@ class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
private $adWordsSession;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$fetchAuthTokenInterfaceStub = $this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

use Google\AdsApi\AdWords\Testing\Reporting\ReportDownloadResultTestProvider;
use GuzzleHttp\Psr7\Response;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use RuntimeException;

/**
Expand All @@ -27,13 +27,13 @@
* @see ReportDownloadResultDelegate
* @small
*/
class ReportDownloadResultDelegateTest extends PHPUnit_Framework_TestCase {
class ReportDownloadResultDelegateTest extends TestCase {

private $fakeReport;
private $reportDownloadResultDelegate;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$this->fakeReport =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@
use GuzzleHttp\Psr7\Response;
use Monolog\Handler\NullHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `ReportDownloader`.
*
* @see ReportDownloader
* @small
*/
class ReportDownloaderTest extends PHPUnit_Framework_TestCase {
class ReportDownloaderTest extends TestCase {

private $adWordsSession;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$fetchAuthTokenInterfaceStub = $this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
use GuzzleHttp\ClientInterface;
use Monolog\Handler\NullHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `RequestOptionsFactory`.
*
* @see RequestOptionsFactory
* @small
*/
class RequestOptionsFactoryTest extends PHPUnit_Framework_TestCase {
class RequestOptionsFactoryTest extends TestCase {

private static $DEFAULT_TIMEOUT_IN_SECONDS = 120;

Expand All @@ -45,7 +45,7 @@ class RequestOptionsFactoryTest extends PHPUnit_Framework_TestCase {
private $libraryMetadataProviderMock;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$fetchAuthTokenInterfaceMock = $this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@
use GuzzleHttp\Psr7\Response;
use Monolog\Handler\NullHandler;
use Monolog\Logger;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Unit tests for `ReportDownloader`.
*
* @see ReportDownloader
* @small
*/
class ReportDownloaderTest extends PHPUnit_Framework_TestCase {
class ReportDownloaderTest extends TestCase {

private $adWordsSession;

/**
* @see PHPUnit_Framework_TestCase::setUp
* @see PHPUnit\Framework\TestCase::setUp
*/
protected function setUp() {
$fetchAuthTokenInterfaceStub = $this
Expand Down
Loading