mirror/provision_sccp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UnitTests

Browse Source 
Split ResolveResult from Resolve.php
Split up Device.php

Signed-off-by: Diederik de Groot <ddegroot@talon.nl>
This commit is contained in:
Diederik de Groot
2020-03-22 14:06:33 +01:00
parent 5064cb3e36
commit 729dccb7f8
20 changed files with 376 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/resolverTest.php
View File

@@ -1,25 +1,32 @@
<?php declare(strict_types=1);
use PHPUnit\Framework\TestCase;
include_once "lib/resolve.php";
use SCCP\Resolve as Resolve;
require(implode(DIRECTORY_SEPARATOR, array(
__DIR__,
'..',
'vendor',
'autoload.php'
)));
use PHPUnit\Framework\TestCase;
use PROVISION\ConfigParser as ConfigParser;
use PROVISION\Resolve as Resolve;
use PROVISION\ResolveResult as ResolveResult;
final class ResolverTest extends TestCase
{
private function getConfig()
{
global $base_path;
$configParser = new SCCP\Config\ConfigParser($base_path, "config.ini");
$base_path = realpath(__DIR__ . DIRECTORY_SEPARATOR . "..");
$configParser = new ConfigParser($base_path, "config.ini");
return $configParser->getConfiguration();
}
public function testCanBeCreated(): void
{
//global $config;
$config = $this->getConfig();
$resolve = new \SCCP\Resolve\Resolve($config);
$resolve = new Resolve($config);
$this->assertInstanceOf(
\SCCP\Resolve\Resolve::class,
Resolve::class,
$resolve
);
}
@@ -30,17 +37,16 @@ final class ResolverTest extends TestCase
Array('request' => 'Spain/g3-tones.xml', 'expected' => '/data/locales/countries/Spain/g3-tones.xml'),
Array('request' => '320x196x4/Chan-SCCP-b.png', 'expected' => '/data/wallpapers/320x196x4/Chan-SCCP-b.png'),
Array('request' => 'XMLDefault.cnf.xml', 'expected' => '/data/settings/XMLDefault.cnf.xml'),
Array('request' => '../XMLDefault.cnf.xml', 'expected' => Resolve\ResolveResult::RequestContainsPathWalk),
Array('request' => 'XMLDefault.cnf.xml/../../text.xml', 'expected' => Resolve\ResolveResult::RequestContainsPathWalk),
Array('request' => '../XMLDefault.cnf.xml', 'expected' => ResolveResult::RequestContainsPathWalk),
Array('request' => 'XMLDefault.cnf.xml/../../text.xml', 'expected' => ResolveResult::RequestContainsPathWalk),
);
public function testCanResolveFiles(): void
{
global $base_path;
$config = $this->getConfig();
//global $config;
$resolve = new \SCCP\Resolve\Resolve($config);
$resolve = new Resolve($config);
foreach($this->test_cases as $test) {
try {
$result = $resolve->resolve($test['request']);