From 3a619e3e193fd6995bd9117fedf739133dce535b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 17 Oct 2016 15:20:13 +0200 Subject: [PATCH] Do not reset the list after adding cached entries Signed-off-by: Joas Schilling --- apps/workflowengine/lib/Manager.php | 1 - apps/workflowengine/tests/ManagerTest.php | 94 +++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 apps/workflowengine/tests/ManagerTest.php diff --git a/apps/workflowengine/lib/Manager.php b/apps/workflowengine/lib/Manager.php index 9140ef73ea7..e93498b5075 100644 --- a/apps/workflowengine/lib/Manager.php +++ b/apps/workflowengine/lib/Manager.php @@ -300,7 +300,6 @@ class Manager implements IManager { ->where($query->expr()->in('id', $query->createNamedParameter($checkIds, IQueryBuilder::PARAM_INT_ARRAY))); $result = $query->execute(); - $checks = []; while ($row = $result->fetch()) { $this->checks[(int) $row['id']] = $row; $checks[(int) $row['id']] = $row; diff --git a/apps/workflowengine/tests/ManagerTest.php b/apps/workflowengine/tests/ManagerTest.php new file mode 100644 index 00000000000..9136bf0e7cd --- /dev/null +++ b/apps/workflowengine/tests/ManagerTest.php @@ -0,0 +1,94 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\WorkflowEngine\Tests; + + +use OCA\WorkflowEngine\Manager; +use OCP\IDBConnection; +use OCP\IL10N; +use OCP\IServerContainer; +use Test\TestCase; + +/** + * Class ManagerTest + * + * @package OCA\WorkflowEngine\Tests + * @group DB + */ +class ManagerTest extends TestCase { + + /** @var Manager */ + protected $manager; + /** @var IDBConnection */ + protected $db; + + protected function setUp() { + parent::setUp(); + + $this->db = \OC::$server->getDatabaseConnection(); + $container = $this->createMock(IServerContainer::class); + $l = $this->createMock(IL10N::class); + $l->method('t') + ->will($this->returnCallback(function($text, $parameters = []) { + return vsprintf($text, $parameters); + })); + + $this->manager = new Manager( + \OC::$server->getDatabaseConnection(), + $container, + $l + ); + $this->clearChecks(); + } + + protected function tearDown() { + $this->clearChecks(); + parent::tearDown(); + } + + public function clearChecks() { + $query = $this->db->getQueryBuilder(); + $query->delete('flow_checks') + ->execute(); + } + + public function testChecks() { + $check1 = $this->invokePrivate($this->manager, 'addCheck', ['Test', 'equal', 1]); + $check2 = $this->invokePrivate($this->manager, 'addCheck', ['Test', '!equal', 2]); + + $data = $this->manager->getChecks([$check1]); + $this->assertArrayHasKey($check1, $data); + $this->assertArrayNotHasKey($check2, $data); + + $data = $this->manager->getChecks([$check1, $check2]); + $this->assertArrayHasKey($check1, $data); + $this->assertArrayHasKey($check2, $data); + + $data = $this->manager->getChecks([$check2, $check1]); + $this->assertArrayHasKey($check1, $data); + $this->assertArrayHasKey($check2, $data); + + $data = $this->manager->getChecks([$check2]); + $this->assertArrayNotHasKey($check1, $data); + $this->assertArrayHasKey($check2, $data); + } +} -- 2.39.5