keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switched back to origin TestCase structure

Browse source
This commit is contained in:
Philipp Holzer 2018-07-09 21:48:47 +02:00
parent dbc38d4263
commit 8c2258dd2e
No known key found for this signature in database
GPG key ID: 58160D7D6AF942B6
4 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/ApiTest.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Test; namespace Friendica\Test;
use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Network\BadRequestException; use Friendica\Network\BadRequestException;
@ -25,8 +26,13 @@ class ApiTest extends DatabaseTest
*/ */
protected function setUp() protected function setUp()
{ {
global $a;
parent::setUp(); parent::setUp();
// Reusable App object
$this->app = new App(__DIR__.'/../');
$a = $this->app;
// User data that the test database is populated with // User data that the test database is populated with
$this->selfUser = [ $this->selfUser = [
'id' => 42, 'id' => 42,
@ -56,6 +62,13 @@ class ApiTest extends DatabaseTest
'authenticated' => true, 'authenticated' => true,
'uid' => $this->selfUser['id'] 'uid' => $this->selfUser['id']
]; ];
// Default config
Config::set('config', 'hostname', 'localhost');
Config::set('system', 'throttle_limit_day', 100);
Config::set('system', 'throttle_limit_week', 100);
Config::set('system', 'throttle_limit_month', 100);
Config::set('system', 'theme', 'system_theme');
} }
/** /**

28
tests/DatabaseTest.php
View file

@ -6,8 +6,6 @@
namespace Friendica\Test; namespace Friendica\Test;
use dba; use dba;
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use PHPUnit_Extensions_Database_DB_IDatabaseConnection; use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
use PHPUnit\DbUnit\DataSet\YamlDataSet; use PHPUnit\DbUnit\DataSet\YamlDataSet;
@ -19,35 +17,9 @@ use PHPUnit\Framework\TestCase;
*/ */
abstract class DatabaseTest extends TestCase abstract class DatabaseTest extends TestCase
{ {
/**
* @var \Friendica\App
*/
protected $app;
use TestCaseTrait; use TestCaseTrait;
/**
* Creates basic instances for testing with databases
*
* @throws \Exception
*/
protected function setUp()
{
global $a;
parent::setUp();
// Reusable App object
$this->app = new App(__DIR__.'/../');
$a = $this->app;
// Default config
Config::set('config', 'hostname', 'localhost');
Config::set('system', 'throttle_limit_day', 100);
Config::set('system', 'throttle_limit_week', 100);
Config::set('system', 'throttle_limit_month', 100);
Config::set('system', 'theme', 'system_theme');
}
/** /**
* Renames an eventually existing .htconfig.php to .htconfig.php.tmp * Renames an eventually existing .htconfig.php to .htconfig.php.tmp
* Creates a new .htconfig.php for bin/worker.php execution * Creates a new .htconfig.php for bin/worker.php execution

14
tests/src/Core/Cache/CacheTest.php
View file

@ -2,6 +2,8 @@
namespace Friendica\Test\src\Core\Cache; namespace Friendica\Test\src\Core\Cache;
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Test\DatabaseTest; use Friendica\Test\DatabaseTest;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -16,8 +18,20 @@ abstract class CacheTest extends DatabaseTest
protected function setUp() protected function setUp()
{ {
global $a;
parent::setUp(); parent::setUp();
$this->instance = $this->getInstance(); $this->instance = $this->getInstance();
// Reusable App object
$this->app = new App(__DIR__.'/../');
$a = $this->app;
// Default config
Config::set('config', 'hostname', 'localhost');
Config::set('system', 'throttle_limit_day', 100);
Config::set('system', 'throttle_limit_week', 100);
Config::set('system', 'throttle_limit_month', 100);
Config::set('system', 'theme', 'system_theme');
} }
function testSimple() { function testSimple() {

15
tests/src/Core/Lock/LockTest.php
View file

@ -2,7 +2,10 @@
namespace Friendica\Test\src\Core\Lock; namespace Friendica\Test\src\Core\Lock;
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Test\DatabaseTest; use Friendica\Test\DatabaseTest;
use PHPUnit\Framework\TestCase;
abstract class LockTest extends DatabaseTest abstract class LockTest extends DatabaseTest
{ {
@ -15,8 +18,20 @@ abstract class LockTest extends DatabaseTest
protected function setUp() protected function setUp()
{ {
global $a;
parent::setUp(); parent::setUp();
$this->instance = $this->getInstance(); $this->instance = $this->getInstance();
// Reusable App object
$this->app = new App(__DIR__.'/../');
$a = $this->app;
// Default config
Config::set('config', 'hostname', 'localhost');
Config::set('system', 'throttle_limit_day', 100);
Config::set('system', 'throttle_limit_week', 100);
Config::set('system', 'throttle_limit_month', 100);
Config::set('system', 'theme', 'system_theme');
} }
public function testLock() { public function testLock() {