Skip to content

Commit b75e069

Browse files
codemashercodemasher
committed
updated tests
1 parent a105de2 commit b75e069

28 files changed

+113
-91
lines changed

‎tests/Includes/Modules/HTML5TestBase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
*
44
* @filesource HTML5TestBase.php
55
* @created 04.03.2016
6-
* @package chillerlan\BBCodeTest\normal\Modules\HTML5
6+
* @package chillerlan\bbcodeTest\normal\Modules\HTML5
77
* @author Smiley <smiley@chillerlan.net>
88
* @copyright 2015 Smiley
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\Includes\Modules;
12+
namespace chillerlan\bbcodeTest\Includes\Modules;
1313

1414
use chillerlan\bbcode\Modules\Html5\Html5BaseModule;
1515

@@ -19,5 +19,5 @@
1919
class HTML5TestBase extends ModuleTestBase{
2020

2121
protected $baseModule = Html5BaseModule::class;
22-
22+
2323
}

‎tests/Includes/Modules/MarkdownTestBase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
*
44
* @filesource MarkdownTestBase.php
55
* @created 04.03.2016
6-
* @package chillerlan\BBCodeTest\normal\Modules\Markdown
6+
* @package chillerlan\bbcodeTest\normal\Modules\Markdown
77
* @author Smiley <smiley@chillerlan.net>
88
* @copyright 2015 Smiley
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\Includes\Modules;
12+
namespace chillerlan\bbcodeTest\Includes\Modules;
1313

1414
use chillerlan\bbcode\Modules\Markdown\MarkdownBaseModule;
1515

‎tests/Includes/Modules/ModuleTestBase.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
*
44
* @filesource ModuleTestBase.php
55
* @created 04.03.2016
6-
* @package chillerlan\BBCodeTest\normal\Modules
6+
* @package chillerlan\bbcodeTest\normal\Modules
77
* @author Smiley <smiley@chillerlan.net>
88
* @copyright 2015 Smiley
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\Includes\Modules;
12+
namespace chillerlan\bbcodeTest\Includes\Modules;
1313

1414
use chillerlan\bbcode\Parser;
1515
use chillerlan\bbcode\ParserOptions;
16+
use PHPUnit\Framework\TestCase;
1617

17-
class ModuleTestBase extends \PHPUnit_Framework_TestCase{
18+
class ModuleTestBase extends TestCase{
1819

1920
/**
2021
* @todo TRAVIS REMINDER!
@@ -41,7 +42,7 @@ protected function setUp(){
4142

4243
public function emptyTagDataProvider($tag){
4344
$this->setUp();
44-
45+
4546
return array_map(function($v){
4647
return [$v];
4748
}, array_keys($this->parser->getTagmap()));

‎tests/critical/Modules/HTML5ModuleTestCritical.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
*
44
* @filesource HTML5ModuleTestCritical.php
55
* @created 10.02.2016
6-
* @package chillerlan\BBCodeTest
6+
* @package chillerlan\bbcodeTest
77
* @author Smiley <smiley@chillerlan.net>
88
* @copyright 2015 Smiley
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\critical\Modules;
12+
namespace chillerlan\bbcodeTest\critical\Modules;
1313

1414
use chillerlan\bbcode\Modules\Html5\Code;
1515
use chillerlan\bbcode\ParserOptions;
16-
use chillerlan\BBCodeTest\Includes\Modules\HTML5TestBase;
16+
use chillerlan\bbcodeTest\Includes\Modules\HTML5TestBase;
1717

1818
/**
1919
* Class HTML5ModuleTestCritical
@@ -85,7 +85,7 @@ public function testNesting($limit, $resultfile){
8585

8686
public function codeSampleDataProvider(){
8787
$this->setUp();
88-
88+
8989
return array_map(function($v){
9090
return [$v];
9191
}, array_keys($this->parser->getTagmap(), Code::class));

‎tests/critical/Modules/MarkdownModuleTestCritical.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
*
44
* @filesource MarkdownModuleTestCritical.php
55
* @created 02.03.2016
6-
* @package chillerlan\BBCodeTest\critical\Modules
6+
* @package chillerlan\bbcodeTest\critical\Modules
77
* @author Smiley <smiley@chillerlan.net>
88
* @copyright 2015 Smiley
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\critical\Modules;
12+
namespace chillerlan\bbcodeTest\critical\Modules;
1313

1414
use chillerlan\bbcode\Modules\Markdown\Code;
15-
use chillerlan\BBCodeTest\Includes\Modules\MarkdownTestBase;
15+
use chillerlan\bbcodeTest\Includes\Modules\MarkdownTestBase;
1616

1717
class MarkdownModuleTestCritical extends MarkdownTestBase{
1818

‎tests/normal/LanguageBaseTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@
33
*
44
* @filesource LanguageBaseTest.php
55
* @created 12.02.2016
6-
* @package chillerlan\BBCodeTest\normal\Language
6+
* @package chillerlan\bbcodeTest\normal\Language
77
* @author Smiley <smiley@chillerlan.net>
88
* @copyright 2015 Smiley
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\normal\Language;
12+
namespace chillerlan\bbcodeTest\normal\Language;
1313

1414
use chillerlan\bbcode\Language\Chinese;
1515
use chillerlan\bbcode\Language\English;
1616
use chillerlan\bbcode\Language\French;
1717
use chillerlan\bbcode\Language\German;
1818
use chillerlan\bbcode\Language\Spanish;
1919
use ReflectionClass;
20+
use PHPUnit\Framework\TestCase;
2021

21-
class LanguageBaseTest extends \PHPUnit_Framework_TestCase{
22+
class LanguageBaseTest extends TestCase{
2223

2324
const LANGUAGES = [
2425
Chinese::class,

‎tests/normal/Modules/BaseModuleTest.php

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\normal\Modules;
12+
namespace chillerlan\bbcodeTest\normal\Modules;
1313

1414
use chillerlan\bbcode\Modules\BaseModuleInfo;
1515
use chillerlan\bbcode\Modules\BaseModuleInterface;
@@ -22,8 +22,9 @@
2222
use chillerlan\bbcode\Modules\Text\TextBaseModule;
2323
use chillerlan\bbcode\Parser;
2424
use chillerlan\bbcode\ParserOptions;
25+
use PHPUnit\Framework\TestCase;
2526

26-
class BaseModuleTest extends \PHPUnit_Framework_TestCase{
27+
class BaseModuleTest extends TestCase{
2728

2829
/**
2930
* @var \chillerlan\bbcode\Modules\BaseModuleInterface
@@ -86,14 +87,26 @@ public function testMimickParserSetoptions($base_module){
8687
// mimicking Parser::setOptions() here
8788
$this->baseModule = new $base_module;
8889

89-
foreach($this->baseModule->getInfo()->modules as $module){
90-
$this->module = new $module;
91-
$this->assertInstanceOf(ModuleInterface::class, $this->module);
92-
93-
foreach($this->module->getTags()->tags as $tag){
94-
$this->assertContains($tag, $tags);
90+
$modules = $this->baseModule->getInfo()->modules;
91+
if(!empty($modules)){
92+
foreach($modules as $module){
93+
$this->module = new $module;
94+
$this->assertInstanceOf(ModuleInterface::class, $this->module);
95+
96+
$module_tags = $this->module->getTags()->tags;
97+
if(!empty($module_tags)){
98+
foreach($module_tags as $tag){
99+
$this->assertContains($tag, $tags);
100+
}
101+
}
102+
else{
103+
$this->markTestSkipped('no tags in module '.get_class($this->module));
104+
}
95105
}
96106
}
107+
else{
108+
$this->markTestSkipped('nada '.get_class($this->baseModule));
109+
}
97110

98111
}
99112

‎tests/normal/Modules/DB/DBModuleTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@
33
*
44
* @filesource DBModuleTest.php
55
* @created 02.03.2016
6-
* @package chillerlan\BBCodeTest\normal\Modules
6+
* @package chillerlan\bbcodeTest\normal\Modules
77
* @author Smiley <smiley@chillerlan.net>
88
* @copyright 2015 Smiley
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\normal\Modules\DB;
12+
namespace chillerlan\bbcodeTest\normal\Modules\DB;
1313

1414
use chillerlan\bbcode\Modules\DB\DBBaseModule;
1515
use chillerlan\bbcode\Parser;
1616
use chillerlan\bbcode\ParserOptions;
1717
use chillerlan\Database\DBOptions;
1818
use chillerlan\Database\Drivers\MySQLi\MySQLiDriver;
19+
use PHPUnit\Framework\TestCase;
1920

20-
class DBModuleTest extends \PHPUnit_Framework_TestCase{
21+
class DBModuleTest extends TestCase{
2122

2223
/**
2324
* @var \chillerlan\bbcode\Parser

‎tests/normal/Modules/HTML5/ContainerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
*
44
* @filesource ContainerTest.php
55
* @created 04.03.2016
6-
* @package chillerlan\BBCodeTest\normal\Modules\HTML5
6+
* @package chillerlan\bbcodeTest\normal\Modules\HTML5
77
* @author Smiley <smiley@chillerlan.net>
88
* @copyright 2015 Smiley
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\normal\Modules\HTML5;
12+
namespace chillerlan\bbcodeTest\normal\Modules\HTML5;
1313

14-
use chillerlan\BBCodeTest\Includes\Modules\HTML5TestBase;
14+
use chillerlan\bbcodeTest\Includes\Modules\HTML5TestBase;
1515

1616
class ContainerTest extends HTML5TestBase{
1717

‎tests/normal/Modules/HTML5/ExpanderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
*
44
* @filesource ExpanderTest.php
55
* @created 04.03.2016
6-
* @package chillerlan\BBCodeTest\normal\Modules\HTML5
6+
* @package chillerlan\bbcodeTest\normal\Modules\HTML5
77
* @author Smiley <smiley@chillerlan.net>
88
* @copyright 2015 Smiley
99
* @license MIT
1010
*/
1111

12-
namespace chillerlan\BBCodeTest\normal\Modules\HTML5;
12+
namespace chillerlan\bbcodeTest\normal\Modules\HTML5;
1313

14-
use chillerlan\BBCodeTest\Includes\Modules\HTML5TestBase;
14+
use chillerlan\bbcodeTest\Includes\Modules\HTML5TestBase;
1515

1616
/**
1717
* Class ExpanderTest

0 commit comments

Comments
 (0)