From 5ff8e1672027f17e8c347de98965ba2d4ad4a182 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Thu, 9 Nov 2023 19:55:48 +0100
Subject: [PATCH] Refs #15790 - Update unit tests
---
extension/Tests/Unit/Core/Form/DirtyTest.php | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/extension/Tests/Unit/Core/Form/DirtyTest.php b/extension/Tests/Unit/Core/Form/DirtyTest.php
index 740f7a31b..f8a18f000 100644
--- a/extension/Tests/Unit/Core/Form/DirtyTest.php
+++ b/extension/Tests/Unit/Core/Form/DirtyTest.php
@@ -9,7 +9,7 @@
namespace IMATHUZH\Qfq\Tests\Unit\Core\Form;
use IMATHUZH\Qfq\Core\Database\Database;
-
+
use IMATHUZH\Qfq\Core\Form\Dirty;
use IMATHUZH\Qfq\Core\Store\Session;
use IMATHUZH\Qfq\Core\Store\Sip;
@@ -17,6 +17,8 @@ use IMATHUZH\Qfq\Tests\Unit\Core\Database\AbstractDatabaseTest;
require_once(__DIR__ . '/../Database/AbstractDatabaseTest.php');
+const MSG_RECORD_ALREADY_LOCKED = 'Record already locked';
+
/*
* Open to check
* - FORM_DELETE
@@ -352,7 +354,7 @@ class DirtyTest extends AbstractDatabaseTest {
// Alice lock again
$result = $dirty->process();
- $msg = 'Record already locked ';
+ $msg = MSG_RECORD_ALREADY_LOCKED;
$expected = [API_STATUS => API_ANSWER_STATUS_CONFLICT_ALLOW_FORCE, API_MESSAGE => $msg];
// cut IP, User and Timestamp
@@ -508,7 +510,7 @@ class DirtyTest extends AbstractDatabaseTest {
$result = $dirty->process();
- $msg = 'Record already locked ';
+ $msg = MSG_RECORD_ALREADY_LOCKED;
$expected = [API_STATUS => API_ANSWER_STATUS_CONFLICT_ALLOW_FORCE, API_MESSAGE => $msg];
// cut IP, User and Timestamp
@@ -700,8 +702,8 @@ class DirtyTest extends AbstractDatabaseTest {
// Alice lock again
$result = $dirty->process();
- $msg = 'Record already locked ';
- $expected = [API_STATUS => API_ANSWER_STATUS_CONFLICT, API_MESSAGE => $msg];
+ $msg = MSG_RECORD_ALREADY_LOCKED;
+ $expected = [API_STATUS => API_ANSWER_STATUS_CONFLICT_ALLOW_FORCE, API_MESSAGE => $msg];
// cut IP, User and Timestamp
$result[API_MESSAGE] = substr($result[API_MESSAGE], 0, strlen($msg));
@@ -855,7 +857,7 @@ class DirtyTest extends AbstractDatabaseTest {
$result = $dirty->process();
- $msg = 'Record already locked ';
+ $msg = MSG_RECORD_ALREADY_LOCKED;
$expected = [API_STATUS => API_ANSWER_STATUS_CONFLICT, API_MESSAGE => $msg];
// cut IP, User and Timestamp
@@ -977,7 +979,7 @@ class DirtyTest extends AbstractDatabaseTest {
$result = $dirty->process();
- $msg = 'Record already locked ';
+ $msg = MSG_RECORD_ALREADY_LOCKED;
$expected = [API_STATUS => API_ANSWER_STATUS_CONFLICT_ALLOW_FORCE, API_MESSAGE => $msg];
// cut IP, User and Timestamp
@@ -1065,7 +1067,7 @@ class DirtyTest extends AbstractDatabaseTest {
$result = $dirty->process();
- $msg = 'Record already locked ';
+ $msg = MSG_RECORD_ALREADY_LOCKED;
$expected = [API_STATUS => API_ANSWER_STATUS_CONFLICT, API_MESSAGE => $msg];
// cut IP, User and Timestamp
@@ -1109,7 +1111,7 @@ class DirtyTest extends AbstractDatabaseTest {
$result = $dirty->process();
- $msg = 'Record already locked ';
+ $msg = MSG_RECORD_ALREADY_LOCKED;
$expected = [API_STATUS => API_ANSWER_STATUS_CONFLICT, API_MESSAGE => $msg];
// cut IP, User and Timestamp
--
GitLab