From 652b55e92f479c65cb8d31b590273b5b5da85e1d Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 29 Jan 2018 11:12:40 +0100
Subject: [PATCH] FEAT #30 Priority Unit test + Move to src
---
composer.json | 3 ++-
core/Test/PriorityControllerTest.php | 20 ++++++++++++-------
rest/index.php | 10 +++++-----
.../controllers}/PriorityController.php | 4 ++--
.../app/priority/models}/PriorityModel.php | 4 +---
.../models}/PriorityModelAbstract.php | 6 ++++--
6 files changed, 27 insertions(+), 20 deletions(-)
rename {core/Controllers => src/app/priority/controllers}/PriorityController.php (97%)
mode change 100755 => 100644
rename {core/Models => src/app/priority/models}/PriorityModel.php (79%)
mode change 100755 => 100644
rename {core/Models => src/app/priority/models}/PriorityModelAbstract.php (97%)
mode change 100755 => 100644
diff --git a/composer.json b/composer.json
index 82ea0468463..5ab93742a53 100755
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,9 @@
"Basket\\" : "src/app/basket/",
"Contact\\" : "src/app/contact/",
"History\\" : "src/app/history/",
- "Status\\" : "src/app/status/",
+ "Priority\\" : "src/app/priority/",
"Resource\\" : "src/app/resource/",
+ "Status\\" : "src/app/status/",
"Core\\" : "core/",
"Apps\\" : "apps/maarch_entreprise/",
diff --git a/core/Test/PriorityControllerTest.php b/core/Test/PriorityControllerTest.php
index f5aa6ac9d73..0ea0a4d71d8 100644
--- a/core/Test/PriorityControllerTest.php
+++ b/core/Test/PriorityControllerTest.php
@@ -1,6 +1,12 @@
<?php
-namespace MaarchTest;
+/**
+ * Copyright Maarch since 2008 under licence GPLv3.
+ * See LICENCE.txt file at the root folder for more details.
+ * This file is part of Maarch software.
+ *
+ */
+
use PHPUnit\Framework\TestCase;
class PriorityControllerTest extends TestCase
@@ -10,7 +16,7 @@ class PriorityControllerTest extends TestCase
public function testCreate()
{
- $priorityController = new \Core\Controllers\PriorityController();
+ $priorityController = new \Priority\controllers\PriorityController();
// CREATE
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'POST']);
@@ -46,7 +52,7 @@ class PriorityControllerTest extends TestCase
public function testGet()
{
- $priorityController = new \Core\Controllers\PriorityController();
+ $priorityController = new \Priority\controllers\PriorityController();
// GET
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
@@ -60,7 +66,7 @@ class PriorityControllerTest extends TestCase
public function testUpdate()
{
- $priorityController = new \Core\Controllers\PriorityController();
+ $priorityController = new \Priority\controllers\PriorityController();
// UPDATE
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'PUT']);
@@ -77,7 +83,7 @@ class PriorityControllerTest extends TestCase
$response = $priorityController->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
$responseBody = json_decode((string)$response->getBody());
- $this->assertSame(_UPDATED_PRIORITY, $responseBody->success);
+ $this->assertSame('success', $responseBody->success);
// READ
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
@@ -94,7 +100,7 @@ class PriorityControllerTest extends TestCase
public function testDelete()
{
- $priorityController = new \Core\Controllers\PriorityController();
+ $priorityController = new \Priority\controllers\PriorityController();
// DELETE
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'DELETE']);
@@ -102,7 +108,7 @@ class PriorityControllerTest extends TestCase
$response = $priorityController->delete($request, new \Slim\Http\Response(), ['id' => self::$id]);
$responseBody = json_decode((string)$response->getBody());
- $this->assertSame(_DELETED_PRIORITY, $responseBody->success);
+ $this->assertInternalType('array', $responseBody->priorities);
// READ
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
diff --git a/rest/index.php b/rest/index.php
index cc2eed13d96..96220d3a00b 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -215,11 +215,11 @@ $app->put('/parameters/{id}', \Core\Controllers\ParametersController::class . ':
$app->delete('/parameters/{id}', \Core\Controllers\ParametersController::class . ':delete');
//Priorities
-$app->get('/priorities', \Core\Controllers\PriorityController::class . ':get');
-$app->post('/priorities', \Core\Controllers\PriorityController::class . ':create');
-$app->get('/priorities/{id}', \Core\Controllers\PriorityController::class . ':getById');
-$app->put('/priorities/{id}', \Core\Controllers\PriorityController::class . ':update');
-$app->delete('/priorities/{id}', \Core\Controllers\PriorityController::class . ':delete');
+$app->get('/priorities', \Priority\controllers\PriorityController::class . ':get');
+$app->post('/priorities', \Priority\controllers\PriorityController::class . ':create');
+$app->get('/priorities/{id}', \Priority\controllers\PriorityController::class . ':getById');
+$app->put('/priorities/{id}', \Priority\controllers\PriorityController::class . ':update');
+$app->delete('/priorities/{id}', \Priority\controllers\PriorityController::class . ':delete');
//History
$app->get('/administration/history/eventDate/{date}', \History\controllers\HistoryController::class . ':getForAdministration');
diff --git a/core/Controllers/PriorityController.php b/src/app/priority/controllers/PriorityController.php
old mode 100755
new mode 100644
similarity index 97%
rename from core/Controllers/PriorityController.php
rename to src/app/priority/controllers/PriorityController.php
index f04ae5e8b6f..e3f8b414030
--- a/core/Controllers/PriorityController.php
+++ b/src/app/priority/controllers/PriorityController.php
@@ -1,10 +1,10 @@
<?php
-namespace Core\Controllers;
+namespace Priority\controllers;
use Core\Models\ServiceModel;
+use Priority\models\PriorityModel;
use Respect\Validation\Validator;
-use Core\Models\PriorityModel;
use Slim\Http\Request;
use Slim\Http\Response;
diff --git a/core/Models/PriorityModel.php b/src/app/priority/models/PriorityModel.php
old mode 100755
new mode 100644
similarity index 79%
rename from core/Models/PriorityModel.php
rename to src/app/priority/models/PriorityModel.php
index 9549075ca3a..3ae29faf4eb
--- a/core/Models/PriorityModel.php
+++ b/src/app/priority/models/PriorityModel.php
@@ -10,12 +10,10 @@
/**
* @brief Priority Model
* @author dev@maarch.org
- * @ingroup core
*/
-namespace Core\Models;
+namespace Priority\models;
class PriorityModel extends PriorityModelAbstract
{
- // Do your stuff in this class
}
\ No newline at end of file
diff --git a/core/Models/PriorityModelAbstract.php b/src/app/priority/models/PriorityModelAbstract.php
old mode 100755
new mode 100644
similarity index 97%
rename from core/Models/PriorityModelAbstract.php
rename to src/app/priority/models/PriorityModelAbstract.php
index ca6ad436f17..d3da4dfb6d7
--- a/core/Models/PriorityModelAbstract.php
+++ b/src/app/priority/models/PriorityModelAbstract.php
@@ -9,10 +9,12 @@
/**
* @brief Priority Abstract Model
* @author dev@maarch.org
- * @ingroup core
*/
-namespace Core\Models;
+namespace Priority\models;
+
+use Core\Models\DatabaseModel;
+use Core\Models\ValidatorModel;
abstract class PriorityModelAbstract
{
--
GitLab