Skip to content

Commit 3ceb92d

Browse files
committed
chore: Moved Files
1 parent be27f55 commit 3ceb92d

9 files changed

Lines changed: 34 additions & 63 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ clover.xml
88
vendor/*
99
composer.lock
1010
.php-cs-fixer.cache
11+
json-output/json-file.json

tests/WebFiori/Tests/Json/JsonConverterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
namespace WebFiori\Tests\Json;
44

55
use WebFiori\Json\Json;
6-
use jsonx\tests\Obj0;
7-
use jsonx\tests\Obj1;
6+
use WebFiori\Tests\Obj0;
7+
use WebFiori\Tests\Obj1;
88
use PHPUnit\Framework\TestCase;
99
use WebFiori\Json\Property;
1010
use WebFiori\Json\JsonConverter;

tests/WebFiori/Tests/Json/JsonTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
namespace WebFiori\Tests\Json;
33

44
use WebFiori\Json\Json;
5-
use jsonx\tests\Obj0;
6-
use jsonx\tests\Obj1;
5+
use WebFiori\Tests\Obj0;
6+
use WebFiori\Tests\Obj1;
77
use PHPUnit\Framework\TestCase;
88

99
class JsonTest extends TestCase {

tests/WebFiori/Tests/Json/PropertyTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
namespace WebFiori\Tests\Json;
33

44
use WebFiori\Json\Json;
5-
use jsonx\tests\Obj0;
6-
use jsonx\tests\Obj1;
5+
use WebFiori\Tests\Obj0;
6+
use WebFiori\Tests\Obj1;
77
use PHPUnit\Framework\TestCase;
88
use WebFiori\Json\Property;
99

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace jsonx\tests;
2+
namespace WebFiori\Tests;
33

44
/*
55
* To change this license header, choose License Headers in Project Properties.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace jsonx\tests;
2+
namespace WebFiori\Tests;
33

44
use WebFiori\Json\JsonI;
55
use WebFiori\Json\Json;

tests/bootstrap.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
4+
ini_set('display_startup_errors', 1);
5+
ini_set('display_errors', 1);
6+
error_reporting(-1);
7+
$testsDirName = 'tests';
8+
$rootDir = substr(__DIR__, 0, strlen(__DIR__) - strlen($testsDirName));
9+
$DS = DIRECTORY_SEPARATOR;
10+
$rootDirTrimmed = trim($rootDir,'/\\');
11+
echo 'Include Path: \''.get_include_path().'\''."\n";
12+
13+
if (explode($DS, $rootDirTrimmed)[0] == 'home') {
14+
//linux.
15+
$rootDir = $DS.$rootDirTrimmed.$DS;
16+
} else {
17+
$rootDir = $rootDirTrimmed.$DS;
18+
}
19+
define('ROOT', $rootDir);
20+
echo 'Root Directory: \''.$rootDir.'\'.'."\n";
21+
require_once ROOT.$DS.'vendor/autoload.php';

tests/loader.php

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit colors="true" bootstrap="tests/loader.php">
2+
<phpunit colors="true" bootstrap="bootstrap.php">
33
<php>
44
</php>
55
<filter>
66
<whitelist addUncoveredFilesFromWhitelist="true">
7-
<directory>./webfiori/json</directory>
7+
<directory>../WebFiori/Json</directory>
88
</whitelist>
99
</filter>
1010
<logging>
1111
<log type="coverage-clover" target="clover.xml"/>
1212
</logging>
1313
<testsuites>
1414
<testsuite name="Json Tests">
15-
<directory>./tests/webfiori/tests/json</directory>
15+
<directory>./WebFiori/Tests/Json</directory>
1616
</testsuite>
1717
</testsuites>
18-
</phpunit>
18+
</phpunit>

0 commit comments

Comments
 (0)