RPJosh
/
nc-gpxedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CICI

merge-requests/12/merge
Julien Veyssier 2018-01-15 14:17:10 +01:00
parent 566387bd11
commit d80ab2f893
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controller/utilscontroller.php
View File

@ -209,7 +209,8 @@ class UtilsController extends Controller {
// first we check it does not already exist
$sqlts = 'SELECT servername FROM *PREFIX*gpxedit_tile_servers ';
$sqlts .= 'WHERE '.$this->dbdblquotes.'user'.$this->dbdblquotes.'=\''.$this->userId.'\' ';
$sqlts .= 'AND servername='.$this->db_quote_escape_string($servername).' AND type='.$this->db_quote_escape_string($type).' ';
$sqlts .= 'AND servername='.$this->db_quote_escape_string($servername).' ';
$sqlts .= 'AND type='.$this->db_quote_escape_string($type).' ';
$req = $this->dbconnection->prepare($sqlts);
$req->execute();
$ts = null;

BIN
tests/.bootstrap.php.swp
View File

Binary file not shown.

6
tests/bootstrap.php
View File

@ -19,8 +19,8 @@ if (version_compare(implode('.', \OCP\Util::getVersion()), '8.2', '>=')) {
\OC_App::loadApp('gpxedit');
}
if(!class_exists('PHPUnit_Framework_TestCase')) {
require_once('PHPUnit/Autoload.php');
}
//if(!class_exists('PHPUnit_Framework_TestCase')) {
// require_once('PHPUnit/Autoload.php');
//}
OC_Hook::clear();

BIN
tests/php/controller/.pageControllerTest.php.swp
View File

Binary file not shown.

15
tests/php/controller/pageControllerTest.php
View File

@ -19,7 +19,8 @@ namespace OCA\GpxEdit\Controller;
use \OCA\GpxEdit\AppInfo\Application;
class PageControllerTest extends \PHPUnit_Framework_TestCase {
//class PageControllerTest extends \PHPUnit_Framework_TestCase {
class PageControllerTest extends \PHPUnit\Framework\TestCase {
private $appName;
private $request;
@ -44,14 +45,14 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase {
$c = $this->container;
// CREATE DUMMY USERS
$c->getServer()->getUserManager()->createUser('test', 'T0T0T0');
$c->getServer()->getUserManager()->createUser('test2', 'T0T0T0');
$c->getServer()->getUserManager()->createUser('testUser', 'T0T0T0');
$c->getServer()->getUserManager()->createUser('testUser2', 'T0T0T0');
$this->controller = new UtilsController(
$this->appName,
$this->request,
'test',
$c->query('ServerContainer')->getUserFolder($c->query('UserId')),
$c->query('ServerContainer')->getUserFolder('testUser'),
$c->query('ServerContainer')->getConfig(),
//$c->getServer()->getShareManager(),
$c->getServer()->getAppManager()
@ -59,14 +60,14 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase {
}
public function tearDown() {
$user = $this->container->getServer()->getUserManager()->get('test');
$user = $this->container->getServer()->getUserManager()->get('testUser');
$user->delete();
$user = $this->container->getServer()->getUserManager()->get('test2');
$user = $this->container->getServer()->getUserManager()->get('testUser2');
$user->delete();
}
public function testSession() {
$resp = $this->controller->addTileServer('plop', 'http://plop.org', 'type',
$resp = $this->controller->addTileServer('superserver', 'http://plop.org', 'type',
'layers', 'version', 'tformat', '0.5', 'true',
'13', '16', 'attr');