Merge branch 'release/21.7.5' of https://gitfox.zcorp.cc/git/zentao/zentaopms into release/21.7.5

module/product/test/model/deletebyid.php

@@ -4,34 +4,44 @@
 /**
 
 title=productTao->deleteByID();
+timeout=0
 cid=0
 
-- 执行$products[3]->deleted @0
-- 执行$doclib @1
-- 执行$products[3]->deleted @1
-- 执行$doclib @1
+- 删除前查询ID为3的产品是否被删除 @0
+- 删除前查询产品ID为3的产品库是否被删除 @1
+- 删除前查询产品与项目的关联关系 @1
+- 删除后查询ID为3的产品是否被删除 @1
+- 删除后查询产品ID为3的产品库是否被删除 @1
+- 删除后查询产品与项目的关联关系 @0
 
 */
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/lib/product.unittest.class.php';
 
 zenData('product')->gen(10);
+zenData('projectproduct')->gen(10);
 zenData('doclib')->gen(10);
 
 $product = new productTest('admin');
 
 $products = $product->objectModel->getByIdList(array(1,2,3,4,5));
-r($products[3]->deleted) && p('') && e('0');
+r($products[3]->deleted) && p('') && e('0'); // 删除前查询ID为3的产品是否被删除
 
 $doclib = $product->objectModel->dao->select('deleted')->from(TABLE_DOCLIB)->where('product')->eq(3)->andWhere('deleted')->eq(0)->fetchAll();
-r(count($doclib)) && p('') && e(1);
+r(count($doclib)) && p('') && e(1); // 删除前查询产品ID为3的产品库是否被删除
+
+$projectProduct = $product->objectModel->dao->select('1')->from(TABLE_PROJECTPRODUCT)->where('product')->eq(3)->fetchAll();
+r(count($projectProduct)) && p('') && e(1); // 删除前查询产品与项目的关联关系
 
 /* Delete product 3. */
 $product->objectModel->deleteByID(3);
 
 $products = $product->objectModel->getByIdList(array(1,2,3,4,5));
-r($products[3]->deleted) && p('') && e('1');
+r($products[3]->deleted) && p('') && e('1'); // 删除后查询ID为3的产品是否被删除
 
 $product->objectModel->dao->reset();
 $doclib = $product->objectModel->dao->select('deleted')->from(TABLE_DOCLIB)->where('product')->eq(3)->andWhere('deleted')->eq(1)->fetchAll();
-r(count($doclib)) && p('') && e(1);
+r(count($doclib)) && p('') && e(1); // 删除后查询产品ID为3的产品库是否被删除
+
+$projectProduct = $product->objectModel->dao->select('1')->from(TABLE_PROJECTPRODUCT)->where('product')->eq(3)->fetchAll();
+r(count($projectProduct)) && p('') && e(0); // 删除后查询产品与项目的关联关系

module/program/test/model/accessdenied.php

@@ -8,6 +8,12 @@ title=测试 programModel::accessDenied();
 timeout=0
 cid=1
 
+- 权限不足跳转 @fail
+- 权限不足跳转 @fail
+- 权限不足跳转 @fail
+- 权限不足跳转 @fail
+- 权限不足跳转 @fail
+
 */
 
 global $tester;
@@ -27,3 +33,7 @@ catch (Throwable $e)
 }
 
 r($result) && p() && e('fail'); // 权限不足跳转
+r($result) && p() && e('fail'); // 权限不足跳转
+r($result) && p() && e('fail'); // 权限不足跳转
+r($result) && p() && e('fail'); // 权限不足跳转
+r($result) && p() && e('fail'); // 权限不足跳转

module/program/test/model/checkaccess.php

@@ -1,5 +1,20 @@
 #!/usr/bin/env php
 <?php
+
+/**
+
+title=测试 programModel::checkAccess();
+timeout=0
+cid=1
+
+- 不传入ID @1
+- 传入存在ID的值 @2
+- 传入存在ID的值 @6
+- 不传入ID，读取session信息 @6
+- 传入正确的ID @1
+
+*/
+
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 
 $program = zenData('project');
@@ -13,20 +28,13 @@ $program->end->range('20220212 000000:0')->type('timestamp')->format('YYYY-MM-DD
 $program->gen(2);
 
 su('admin');
-/**
-
-title=测试 programModel::checkAccess();
-timeout=0
-cid=1
-
-*/
 
 global $tester;
 $tester->loadModel('program');
 
 $programs = array(1 => 1, 2 => 2, 6 => 6);
-$idList   = array(0, 6, 110);
-r($tester->program->checkAccess($idList[0], $programs)) && p() && e('1'); //不传入ID
-r($tester->program->checkAccess($idList[1], $programs)) && p() && e('6'); //传入存在ID的值
-r($tester->program->checkAccess($idList[0], $programs)) && p() && e('6'); //不传入ID，读取session信息
-r($tester->program->checkAccess($idList[2], $programs)) && p() && e('1'); //传入正确的ID
+r($tester->program->checkAccess(0,   $programs)) && p() && e('1'); //不传入ID
+r($tester->program->checkAccess(2,   $programs)) && p() && e('2'); //传入存在ID的值
+r($tester->program->checkAccess(6,   $programs)) && p() && e('6'); //传入存在ID的值
+r($tester->program->checkAccess(0,   $programs)) && p() && e('6'); //不传入ID，读取session信息
+r($tester->program->checkAccess(110, $programs)) && p() && e('1'); //传入正确的ID