Fix codacy errors

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-05-29 00:16:35 +02:00
parent 19a90809f9
commit 4623688852
6 changed files with 36 additions and 23 deletions

View File

@@ -24,7 +24,7 @@
/**
* @group DB
*/
class BoardDatabaseTest extends \PHPUnit_Framework_TestCase
class BoardDatabaseTest extends \Test\TestCase
{
const TEST_USER1 = "test-share-user1";
const TEST_USER2 = "test-share-user2";
@@ -61,6 +61,7 @@ class BoardDatabaseTest extends \PHPUnit_Framework_TestCase
\OC::$server->getGroupManager()->addBackend($groupBackend);
}
public function setUp() {
parent::setUp();
\OC::$server->getUserSession()->login(self::TEST_USER1, self::TEST_USER1);
$this->boardService = \OC::$server->query("\OCA\Deck\Service\BoardService");
}
@@ -80,5 +81,6 @@ class BoardDatabaseTest extends \PHPUnit_Framework_TestCase
}
public function tearDown() {
parent::tearDown();
}
}

View File

@@ -107,7 +107,10 @@ class BoardMapperTest extends MapperTestUtility {
public function testFind() {
$actual = $this->boardMapper->find($this->boards[0]->getId());
$expected = $this->boards[0];
/** @var Board $expected */
$expected = clone $this->boards[0];
$expected->setShared(-1);
$expected->resetUpdatedFields();
$this->assertEquals($expected, $actual);
}
@@ -129,9 +132,9 @@ class BoardMapperTest extends MapperTestUtility {
public function testFindAll() {
$actual = $this->boardMapper->findAll();
$this->assertAttributeEquals($this->boards[0]->getId(), 'id', $actual[0]);
$this->assertAttributeEquals($this->boards[1]->getId(), 'id', $actual[1]);
$this->assertAttributeEquals($this->boards[2]->getId(), 'id', $actual[2]);
$this->assertEquals($this->boards[0]->getId(), $actual[0]->getId());
$this->assertEquals($this->boards[1]->getId(), $actual[1]->getId());
$this->assertEquals($this->boards[2]->getId(), $actual[2]->getId());
}
public function testFindAllToDelete() {
@@ -148,8 +151,9 @@ class BoardMapperTest extends MapperTestUtility {
public function testFindWithLabels() {
$actual = $this->boardMapper->find($this->boards[0]->getId(), true, false);
$expected = $this->boards[0];
$this->assertEquals($expected, $actual);
/** @var Board $expected */
$expected = $this->boards[0];
$this->assertEquals($expected->getLabels(), $actual->getLabels());
}
public function testFindWithAcl() {

View File

@@ -31,8 +31,14 @@ use OCA\Deck\Db\Label;
use OCA\Deck\Db\LabelMapper;
use OCA\Deck\Db\Stack;
use OCA\Deck\Db\StackMapper;
use Test\TestCase;
use \Test\TestCase;
/**
* Class StackServiceTest
*
* @package OCA\Deck\Service
* @group DB
*/
class StackServiceTest extends TestCase {
/** @var StackService */