Skip to content

Commit 2499a2c

Browse files
thorstenthorsten
committed
Moved tests from /phpmyfaq/tests/ to /tests
1 parent ce49139 commit 2499a2c

19 files changed

+53
-53
lines changed

‎phpunit.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
syntaxCheck="false">
1212
<testsuites>
1313
<testsuite name="phpMyFAQ Test Suite">
14-
<file>./phpmyfaq/tests/AllTests.php</file>
14+
<file>./tests/AllTests.php</file>
1515
</testsuite>
1616
</testsuites>
1717
</phpunit>

‎phpmyfaq/tests/AllTests.php renamed to ‎tests/AllTests.php

File renamed without changes.

‎phpmyfaq/tests/Category/AllTests.php renamed to ‎tests/Category/AllTests.php

File renamed without changes.

‎phpmyfaq/tests/Database/AbstractTest.php renamed to ‎tests/Database/AbstractTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
require_once 'PHPUnit/Extensions/Database/TestCase.php';
21-
require_once dirname(dirname(__DIR__)) . '/inc/Db.php';
21+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Db.php';
2222

2323
define('SQLPREFIX', '');
2424

‎phpmyfaq/tests/Database/MysqlTest.php renamed to ‎tests/Database/MysqlTest.php

File renamed without changes.

‎phpmyfaq/tests/Database/PostgressTest.php renamed to ‎tests/Database/PostgressTest.php

File renamed without changes.

‎phpmyfaq/tests/Faq/AllTests.php renamed to ‎tests/Faq/AllTests.php

File renamed without changes.

‎phpmyfaq/tests/Instance/AllTests.php renamed to ‎tests/Instance/AllTests.php

File renamed without changes.

‎phpmyfaq/tests/Instance/PMF_Instance_ClientTest.php renamed to ‎tests/Instance/PMF_Instance_ClientTest.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
*/
1919

2020

21-
require_once dirname(dirname(__DIR__)) . '/inc/DB/Driver.php';
22-
require_once dirname(dirname(__DIR__)) . '/inc/DB/Sqlite3.php';
23-
require_once dirname(dirname(__DIR__)) . '/inc/Exception.php';
24-
require_once dirname(dirname(__DIR__)) . '/inc/Configuration.php';
25-
require_once dirname(dirname(__DIR__)) . '/inc/Filesystem.php';
26-
require_once dirname(dirname(__DIR__)) . '/inc/Instance.php';
27-
require_once dirname(dirname(__DIR__)) . '/inc/Instance/Client.php';
21+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/DB/Driver.php';
22+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/DB/Sqlite3.php';
23+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Exception.php';
24+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Configuration.php';
25+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Filesystem.php';
26+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Instance.php';
27+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Instance/Client.php';
2828

2929
/**
3030
* PMF_LinkTest
@@ -59,7 +59,7 @@ protected function setUp ()
5959
$this->dbHandle = new PMF_DB_Sqlite3();
6060
$this->PMF_Configuration = new PMF_Configuration($this->dbHandle);
6161
$this->PMF_Configuration->config['security.useSslOnly'] = 'true';
62-
$this->PMF_Filesystem = new PMF_Filesystem(dirname(dirname(__DIR__)));
62+
$this->PMF_Filesystem = new PMF_Filesystem(dirname(dirname(__DIR__)) . '/phpmyfaq');
6363

6464
$this->PMF_Instance = new PMF_Instance($this->PMF_Configuration);
6565
$this->PMF_Instance_Client = new PMF_Instance_Client($this->PMF_Configuration);

‎phpmyfaq/tests/PMF_LinkTest.php renamed to ‎tests/PMF_LinkTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
*/
1919

2020

21-
require_once dirname(__DIR__) . '/inc/DB/Driver.php';
22-
require_once dirname(__DIR__) . '/inc/DB/Sqlite3.php';
23-
require_once dirname(__DIR__) . '/inc/Exception.php';
24-
require_once dirname(__DIR__) . '/inc/Configuration.php';
25-
require_once dirname(__DIR__) . '/inc/Link.php';
21+
require_once dirname(__DIR__) . '/phpmyfaq/inc/DB/Driver.php';
22+
require_once dirname(__DIR__) . '/phpmyfaq/inc/DB/Sqlite3.php';
23+
require_once dirname(__DIR__) . '/phpmyfaq/inc/Exception.php';
24+
require_once dirname(__DIR__) . '/phpmyfaq/inc/Configuration.php';
25+
require_once dirname(__DIR__) . '/phpmyfaq/inc/Link.php';
2626

2727
/**
2828
* PMF_LinkTest

‎phpmyfaq/tests/Search/AllTests.php renamed to ‎tests/Search/AllTests.php

File renamed without changes.

‎phpmyfaq/tests/Search/Database/AllTests.php renamed to ‎tests/Search/Database/AllTests.php

File renamed without changes.

‎phpmyfaq/tests/Search/Database/PMF_Search_Database_MysqlTest.php renamed to ‎tests/Search/Database/PMF_Search_Database_MysqlTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
* @since 2010-06-06
1818
*/
1919

20-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/Configuration.php';
21-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/functions.php';
22-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/Search.php';
23-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/Search/Database/Mysql.php';
24-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/DB/Driver.php';
25-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/DB/Mysql.php';
20+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/Configuration.php';
21+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/functions.php';
22+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/Search.php';
23+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/Search/Database/Mysql.php';
24+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/DB/Driver.php';
25+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/DB/Mysql.php';
2626

2727
require_once dirname(dirname(__DIR__)) . '/Database/MysqlTest.php';
2828

‎phpmyfaq/tests/Search/Database/PMF_Search_Database_PgsqlTest.php renamed to ‎tests/Search/Database/PMF_Search_Database_PgsqlTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
* @since 2010-06-06
1818
*/
1919

20-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/Configuration.php';
21-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/functions.php';
22-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/Search.php';
23-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/Search/Database/Pgsql.php';
24-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/DB/Driver.php';
25-
require_once dirname(dirname(dirname(__DIR__))) . '/inc/DB/Pgsql.php';
20+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/Configuration.php';
21+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/functions.php';
22+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/Search.php';
23+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/Search/Database/Pgsql.php';
24+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/DB/Driver.php';
25+
require_once dirname(dirname(dirname(__DIR__))) . '/phpmyfaq/inc/DB/Pgsql.php';
2626

2727
require_once dirname(dirname(__DIR__)) . '/Database/PostgressTest.php';
2828

‎phpmyfaq/tests/Search/Database/data.xml renamed to ‎tests/Search/Database/data.xml

File renamed without changes.

‎phpmyfaq/tests/Search/PMF_Search_DatabaseTest.php renamed to ‎tests/Search/PMF_Search_DatabaseTest.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
* @since 2010-06-06
1818
*/
1919

20-
require_once dirname(dirname(__DIR__)) . '/inc/Search/Abstract.php';
21-
require_once dirname(dirname(__DIR__)) . '/inc/Search/Interface.php';
22-
require_once dirname(dirname(__DIR__)) . '/inc/Search/Database.php';
23-
require_once dirname(dirname(__DIR__)) . '/inc/Search/Database/Sqlite.php';
24-
require_once dirname(dirname(__DIR__)) . '/inc/DB/Driver.php';
25-
require_once dirname(dirname(__DIR__)) . '/inc/DB/Sqlite3.php';
26-
require_once dirname(dirname(__DIR__)) . '/inc/Exception.php';
27-
require_once dirname(dirname(__DIR__)) . '/inc/Configuration.php';
28-
require_once dirname(dirname(__DIR__)) . '/inc/String.php';
29-
require_once dirname(dirname(__DIR__)) . '/inc/String/Abstract.php';
30-
require_once dirname(dirname(__DIR__)) . '/inc/String/Mbstring.php';
31-
require_once dirname(dirname(__DIR__)) . '/inc/String/UTF8ToLatinConvertable.php';
20+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Search/Abstract.php';
21+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Search/Interface.php';
22+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Search/Database.php';
23+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Search/Database/Sqlite.php';
24+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/DB/Driver.php';
25+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/DB/Sqlite3.php';
26+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Exception.php';
27+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Configuration.php';
28+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String.php';
29+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String/Abstract.php';
30+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String/Mbstring.php';
31+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String/UTF8ToLatinConvertable.php';
3232

3333
/**
3434
* Category test case

‎phpmyfaq/tests/Search/PMF_Search_FactoryTest.php renamed to ‎tests/Search/PMF_Search_FactoryTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* @since 2010-07-06
1818
*/
1919

20-
require_once dirname(dirname(__DIR__)) . '/inc/Search/Factory.php';
21-
require_once dirname(dirname(__DIR__)) . '/inc/Language.php';
22-
require_once dirname(dirname(__DIR__)) . '/inc/String.php';
23-
require_once dirname(dirname(__DIR__)) . '/inc/String/Abstract.php';
24-
require_once dirname(dirname(__DIR__)) . '/inc/String/Mbstring.php';
20+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Search/Factory.php';
21+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Language.php';
22+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String.php';
23+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String/Abstract.php';
24+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String/Mbstring.php';
2525

2626
/**
2727
* Category test case

‎phpmyfaq/tests/Search/PMF_Search_ResultsetTest.php renamed to ‎tests/Search/PMF_Search_ResultsetTest.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
* @since 2010-07-24
1818
*/
1919

20-
require_once dirname(dirname(__DIR__)) . '/inc/Language.php';
21-
require_once dirname(dirname(__DIR__)) . '/inc/String.php';
22-
require_once dirname(dirname(__DIR__)) . '/inc/String/Abstract.php';
23-
require_once dirname(dirname(__DIR__)) . '/inc/String/Mbstring.php';
24-
require_once dirname(dirname(__DIR__)) . '/inc/Search/Resultset.php';
25-
require_once dirname(dirname(__DIR__)) . '/inc/DB/Driver.php';
26-
require_once dirname(dirname(__DIR__)) . '/inc/DB/Sqlite3.php';
27-
require_once dirname(dirname(__DIR__)) . '/inc/Exception.php';
28-
require_once dirname(dirname(__DIR__)) . '/inc/Configuration.php';
20+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Language.php';
21+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String.php';
22+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String/Abstract.php';
23+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/String/Mbstring.php';
24+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Search/Resultset.php';
25+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/DB/Driver.php';
26+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/DB/Sqlite3.php';
27+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Exception.php';
28+
require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/Configuration.php';
2929

3030
/**
3131
* Category test case

‎phpmyfaq/tests/dtrace/fstat.d renamed to ‎tests/dtrace/fstat.d

File renamed without changes.

0 commit comments

Comments
 (0)