Refactor obscure service names to be clearer

This commit is contained in:
Dane Everitt 2017-08-27 15:10:51 -05:00
parent a91d84ecfe
commit 67ac36f5ce
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
25 changed files with 96 additions and 341 deletions

View file

@ -32,11 +32,11 @@ use Pterodactyl\Models\Server;
use GuzzleHttp\Exception\RequestException;
use Illuminate\Database\ConnectionInterface;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Services\Servers\ReinstallService;
use Pterodactyl\Services\Servers\ReinstallServerService;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
class ReinstallServiceTest extends TestCase
class ReinstallServerServiceTest extends TestCase
{
/**
* @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
@ -64,7 +64,7 @@ class ReinstallServiceTest extends TestCase
protected $server;
/**
* @var \Pterodactyl\Services\Servers\ReinstallService
* @var \Pterodactyl\Services\Servers\ReinstallServerService
*/
protected $service;
@ -88,7 +88,7 @@ class ReinstallServiceTest extends TestCase
$this->server = factory(Server::class)->make(['node_id' => 1]);
$this->service = new ReinstallService(
$this->service = new ReinstallServerService(
$this->database,
$this->daemonServerRepository,
$this->repository,

View file

@ -32,7 +32,7 @@ use phpmock\phpunit\PHPMock;
use Illuminate\Database\DatabaseManager;
use GuzzleHttp\Exception\RequestException;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Services\Servers\CreationService;
use Pterodactyl\Services\Servers\ServerCreationService;
use Pterodactyl\Services\Servers\VariableValidatorService;
use Pterodactyl\Services\Servers\UsernameGenerationService;
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
@ -42,7 +42,7 @@ use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
class CreationServiceTest extends TestCase
class ServerCreationServiceTest extends TestCase
{
use PHPMock;
@ -106,7 +106,7 @@ class CreationServiceTest extends TestCase
protected $serverVariableRepository;
/**
* @var \Pterodactyl\Services\Servers\CreationService
* @var \Pterodactyl\Services\Servers\ServerCreationService
*/
protected $service;
@ -161,7 +161,7 @@ class CreationServiceTest extends TestCase
$this->getFunctionMock('\\Ramsey\\Uuid\\Uuid', 'uuid4')
->expects($this->any())->willReturn('s');
$this->service = new CreationService(
$this->service = new ServerCreationService(
$this->allocationRepository,
$this->daemonServerRepository,
$this->database,

View file

@ -32,13 +32,13 @@ use Pterodactyl\Models\Server;
use GuzzleHttp\Exception\RequestException;
use Illuminate\Database\ConnectionInterface;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Services\Servers\DeletionService;
use Pterodactyl\Services\Servers\ServerDeletionService;
use Pterodactyl\Services\Database\DatabaseManagementService;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
class DeletionServiceTest extends TestCase
class ServerDeletionServiceTest extends TestCase
{
/**
* @var \Illuminate\Database\ConnectionInterface
@ -76,7 +76,7 @@ class DeletionServiceTest extends TestCase
protected $repository;
/**
* @var \Pterodactyl\Services\Servers\DeletionService
* @var \Pterodactyl\Services\Servers\ServerDeletionService
*/
protected $service;
@ -101,7 +101,7 @@ class DeletionServiceTest extends TestCase
$this->repository = m::mock(ServerRepositoryInterface::class);
$this->writer = m::mock(Writer::class);
$this->service = new DeletionService(
$this->service = new ServerDeletionService(
$this->connection,
$this->daemonServerRepository,
$this->databaseRepository,
@ -118,7 +118,7 @@ class DeletionServiceTest extends TestCase
{
$response = $this->service->withForce(true);
$this->assertInstanceOf(DeletionService::class, $response);
$this->assertInstanceOf(ServerDeletionService::class, $response);
}
/**