nextcloud
/
maps
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

beginning to implement photosController tests 

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
This commit is contained in:
Julien Veyssier 2019-08-11 15:52:43 +02:00
Родитель a907c916f7
Коммит fa0bbfb954
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4141FEE162030638
10 изменённых файлов: 222 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
lib/Controller/ContactsController.php
Просмотреть файл

@ -77,7 +77,7 @@ class ContactsController extends Controller {
'BOOKID'=>$c['addressbook-key'],
'BOOKURI'=>$addressBookUri,
'GEO'=>$geo,
'GROUPS'=>$c['CATEGORIES']
'GROUPS'=>$c['CATEGORIES'] ?? null
]);
}
}
@ -105,7 +105,7 @@ class ContactsController extends Controller {
'BOOKID'=>$c['addressbook-key'],
'BOOKURI'=>$addressBookUri,
'GEO'=>$geo,
'GROUPS'=>$c['CATEGORIES']
'GROUPS'=>$c['CATEGORIES'] ?? null
]);
}
}

3
lib/Controller/PhotosController.php
Просмотреть файл

@ -27,7 +27,8 @@ class PhotosController extends Controller {
private $photofilesService;
private $logger;
public function __construct($AppName, ILogger $logger, IRequest $request, GeophotoService $GeophotoService, PhotofilesService $photofilesService, $UserId){
public function __construct($AppName, ILogger $logger, IRequest $request, GeophotoService $GeophotoService,
PhotofilesService $photofilesService, $UserId){
parent::__construct($AppName, $request);
$this->logger = $logger;
$this->userId = $UserId;

7
lib/Service/DevicesService.php
Просмотреть файл

@ -16,12 +16,7 @@ use OCP\IL10N;
use OCP\ILogger;
use OCP\DB\QueryBuilder\IQueryBuilder;
function endswith($string, $test) {
$strlen = strlen($string);
$testlen = strlen($test);
if ($testlen > $strlen) return false;
return substr_compare($string, $test, $strlen - $testlen, $testlen) === 0;
}
require_once('Utils.php');
class DevicesService {

7
lib/Service/FavoritesService.php
Просмотреть файл

@ -18,12 +18,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
use OC\Archive\ZIP;
function endswith($string, $test) {
$strlen = strlen($string);
$testlen = strlen($test);
if ($testlen > $strlen) return false;
return substr_compare($string, $test, $strlen - $testlen, $testlen) === 0;
}
require_once('Utils.php');
class FavoritesService {

4
lib/Service/GeophotoService.php
Просмотреть файл

@ -38,7 +38,9 @@ class GeophotoService {
private $timeorderedPointSets;
private $devicesService;
public function __construct (ILogger $logger, IRootFolder $root, IL10N $l10n, GeophotoMapper $photoMapper, IPreview $preview, TracksService $tracksService, DevicesService $devicesService, $userId) {
public function __construct (ILogger $logger, IRootFolder $root, IL10N $l10n,
GeophotoMapper $photoMapper, IPreview $preview,
TracksService $tracksService, DevicesService $devicesService, $userId) {
$this->root = $root;
$this->l10n = $l10n;
$this->photoMapper = $photoMapper;

3
lib/Service/PhotofilesService.php
Просмотреть файл

@ -47,7 +47,8 @@ class PhotofilesService {
private $shareManager;
private $logger;
public function __construct (ILogger $logger, IRootFolder $root, IL10N $l10n, GeophotoMapper $photoMapper, IManager $shareManager) {
public function __construct (ILogger $logger, IRootFolder $root, IL10N $l10n,
GeophotoMapper $photoMapper, IManager $shareManager) {
$this->root = $root;
$this->l10n = $l10n;
$this->photoMapper = $photoMapper;

11
lib/Service/Utils.php Normal file
Просмотреть файл

@ -0,0 +1,11 @@
<?php
namespace OCA\Maps\Service;
function endswith($string, $test) {
$strlen = strlen($string);
$testlen = strlen($test);
if ($testlen > $strlen) return false;
return substr_compare($string, $test, $strlen - $testlen, $testlen) === 0;
}
?>

200
tests/Unit/Controller/PhotosControllerTest.php Normal file
Просмотреть файл

@ -0,0 +1,200 @@
<?php
/**
* Nextcloud - maps
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
*
* @author Julien Veyssier <eneiluj@posteo.net>
* @copyright Julien Veyssier 2019
*/
namespace OCA\Maps\Controller;
use \OCA\Maps\AppInfo\Application;
use OCA\Maps\Service\GeophotoService;
use OCA\Maps\Service\PhotofilesService;
use OCA\Maps\Service\TracksService;
use OCA\Maps\Service\DevicesService;
use OCA\Maps\DB\GeophotoMapper;
use OCP\AppFramework\Http\TemplateResponse;
class PhotosControllerTest extends \PHPUnit\Framework\TestCase {
private $appName;
private $request;
private $contacts;
private $container;
private $config;
private $app;
private $photosController;
private $photosController2;
private $utilsController;
public static function setUpBeforeClass(): void {
$app = new Application();
$c = $app->getContainer();
// clear test users
$user = $c->getServer()->getUserManager()->get('test');
if ($user !== null) {
$user->delete();
}
$user = $c->getServer()->getUserManager()->get('test2');
if ($user !== null) {
$user->delete();
}
$user = $c->getServer()->getUserManager()->get('test3');
if ($user !== null) {
$user->delete();
}
// CREATE DUMMY USERS
$u1 = $c->getServer()->getUserManager()->createUser('test', 'tatotitoTUTU');
$u1->setEMailAddress('toto@toto.net');
$u2 = $c->getServer()->getUserManager()->createUser('test2', 'plopinoulala000');
$u3 = $c->getServer()->getUserManager()->createUser('test3', 'yeyeahPASSPASS');
$c->getServer()->getGroupManager()->createGroup('group1test');
$c->getServer()->getGroupManager()->get('group1test')->addUser($u1);
$c->getServer()->getGroupManager()->createGroup('group2test');
$c->getServer()->getGroupManager()->get('group2test')->addUser($u2);
}
protected function setUp(): void {
$this->appName = 'maps';
$this->request = $this->getMockBuilder('\OCP\IRequest')
->disableOriginalConstructor()
->getMock();
$this->contacts = $this->getMockBuilder('OCP\Contacts\IManager')
->disableOriginalConstructor()
->getMock();
$this->app = new Application();
$this->container = $this->app->getContainer();
$c = $this->container;
$this->config = $c->query('ServerContainer')->getConfig();
$this->photosController = new PhotosController(
$this->appName,
$c->query('ServerContainer')->getLogger(),
$this->request,
new GeoPhotoService(
$c->query('ServerContainer')->getLogger(),
$c->query('ServerContainer')->getRootFolder(),
$c->query('ServerContainer')->getL10N($c->query('AppName')),
new GeophotoMapper(
$c->query('ServerContainer')->getDatabaseConnection()
),
$c->query('ServerContainer')->getPreviewManager(),
new TracksService(
$c->query('ServerContainer')->getLogger(),
$c->query('ServerContainer')->getL10N($c->query('AppName')),
$c->query('ServerContainer')->getRootFolder(),
$c->query('ServerContainer')->getShareManager()
),
new DevicesService(
$c->query('ServerContainer')->getLogger(),
$c->query('ServerContainer')->getL10N($c->query('AppName'))
),
'test'
),
new PhotoFilesService(
$c->query('ServerContainer')->getLogger(),
$c->query('ServerContainer')->getRootFolder(),
$c->query('ServerContainer')->getL10N($c->query('AppName')),
new GeophotoMapper(
$c->query('ServerContainer')->getDatabaseConnection()
),
$c->query('ServerContainer')->getShareManager()
),
'test'
);
$this->photosController2 = new PhotosController(
$this->appName,
$c->query('ServerContainer')->getLogger(),
$this->request,
new GeoPhotoService(
$c->query('ServerContainer')->getLogger(),
$c->query('ServerContainer')->getRootFolder(),
$c->query('ServerContainer')->getL10N($c->query('AppName')),
new GeophotoMapper(
$c->query('ServerContainer')->getDatabaseConnection()
),
$c->query('ServerContainer')->getPreviewManager(),
new TracksService(
$c->query('ServerContainer')->getLogger(),
$c->query('ServerContainer')->getL10N($c->query('AppName')),
$c->query('ServerContainer')->getRootFolder(),
$c->query('ServerContainer')->getShareManager()
),
new DevicesService(
$c->query('ServerContainer')->getLogger(),
$c->query('ServerContainer')->getL10N($c->query('AppName'))
),
'test'
),
new PhotoFilesService(
$c->query('ServerContainer')->getLogger(),
$c->query('ServerContainer')->getRootFolder(),
$c->query('ServerContainer')->getL10N($c->query('AppName')),
new GeophotoMapper(
$c->query('ServerContainer')->getDatabaseConnection()
),
$c->query('ServerContainer')->getShareManager()
),
'test'
);
$this->utilsController = new UtilsController(
$this->appName,
$this->request,
'test',
$c->query('ServerContainer')->getUserFolder('test'),
$c->query('ServerContainer')->getConfig(),
$c->getServer()->getAppManager()
);
}
public static function tearDownAfterClass(): void {
$app = new Application();
$c = $app->getContainer();
$user = $c->getServer()->getUserManager()->get('test');
$user->delete();
$user = $c->getServer()->getUserManager()->get('test2');
$user->delete();
$user = $c->getServer()->getUserManager()->get('test3');
$user->delete();
$c->getServer()->getGroupManager()->get('group1test')->delete();
$c->getServer()->getGroupManager()->get('group2test')->delete();
}
protected function tearDown(): void {
// in case there was a failure and something was not deleted
}
public function testAddGetPhotos() {
$userfolder = $this->container->query('ServerContainer')->getUserFolder('test');
$content1 = file_get_contents('tests/test_files/nc.jpg');
$userfolder->newFolder('dir');
//$userfolder->newFile('dir/nc.jpg')->putContent($content1);
$content2 = file_get_contents('tests/test_files/nut.jpg');
//$userfolder->newFile('dir/nut.jpg')->putContent($content2);
//var_dump($userfolder->get('dir')->getDirectoryListing());
$resp = $this->photosController->getPhotosFromDb();
$status = $resp->getStatus();
$this->assertEquals(200, $status);
$data = $resp->getData();
//$this->assertEquals(27, $data);
var_dump($data);
$this->assertEquals(true, 1===1);
}
}

Двоичные данные
tests/test_files/nc.jpg Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 1.9 KiB

Двоичные данные
tests/test_files/nut.jpg Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 7.3 KiB