From 9882ce41e01096a9d8a1c28be17538fef208d60e Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 15 Apr 2024 17:21:57 +0800 Subject: [PATCH] * Add lang in test case. --- .../test/lib/createproduct.ui.class.php | 33 +++++++++++-------- module/product/test/ui/createproduct.php | 13 ++++---- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/module/product/test/lib/createproduct.ui.class.php b/module/product/test/lib/createproduct.ui.class.php index 0847ac46da..5dda2a1758 100644 --- a/module/product/test/lib/createproduct.ui.class.php +++ b/module/product/test/lib/createproduct.ui.class.php @@ -1,4 +1,7 @@ login(); $form = $this->initForm('product', 'create'); $form->dom->name->setValue($productName); $form->dom->btn($this->lang->save)->click(); @@ -28,24 +30,25 @@ class createProductTester extends tester */ public function createDefault($productName) { - $this->login(); - /* 提交表单。 */ $form = $this->initForm('product', 'create'); $form->dom->name->setValue($productName); $form->dom->btn($this->lang->save)->click(); $form->wait(1); - if($this->response('method') != 'browse') return $this->failed($form->dom->getFormTips()); + if($this->response('method') != 'browse') + { + if($this->checkFormTips('product')) return $this->success('表单提示信息正确'); + return $this->failed('表单提示信息不正确'); + } /* 跳转到产品需求页面，点击设置菜单查看产品设置页面。 */ $browsePage = $this->loadPage('product', 'browse'); $browsePage->dom->settings->click(); $viewPage = $this->loadPage('product', 'view'); - $this->app->loadLang('product'); if($viewPage->dom->productName->getText() != $productName) return $this->failed('名称错误'); - if($viewPage->dom->type->getText() != $this->lang->product->typeList['normal']) return $this->failed('类型错误'); - if($viewPage->dom->acl->getText() != $this->lang->product->abbr->aclList['open']) return $this->failed('权限错误'); + if($viewPage->dom->type->getText() != $this->lang->product->typeList->normal) return $this->failed('类型错误'); + if($viewPage->dom->acl->getText() != $this->lang->product->abbr->aclList->open) return $this->failed('权限错误'); return $this->success(); } @@ -60,24 +63,26 @@ class createProductTester extends tester public function createMultiBranch($name) { /* 提交表单。 */ - $this->login(); $form = $this->initForm('product', 'create'); $form->dom->name->setValue($name); - $form->dom->type->picker('多分支'); + $form->dom->type->picker($this->lang->product->typeList->branch); $form->dom->btn($this->lang->save)->click(); $form->wait(1); - if($this->response('method') != 'browse') return $this->failed($form->dom->getFormTips()); + if($this->response('method') != 'browse') + { + if($this->checkFormTips('product')) return $this->success('表单提示信息正确'); + return $this->failed('表单提示信息不正确'); + } /* 跳转到产品需求页面，点击设置菜单查看产品设置页面。 */ $browsePage = $this->loadPage('product', 'browse'); $browsePage->dom->settings->click(); - $viewPage = $this->loadPage('product', 'view'); - $this->app->loadLang('product'); + $viewPage = $this->loadPage('product', 'view'); if($viewPage->dom->productName->getText() != $name) return $this->failed('名称错误'); - if($viewPage->dom->type->getText() != $this->lang->product->typeList['branch']) return $this->failed('类型错误'); - if($viewPage->dom->branchProductACL->getText() != $this->lang->product->abbr->aclList['open']) return $this->failed('权限错误'); + if($viewPage->dom->type->getText() != $this->lang->product->typeList->branch) return $this->failed('类型错误'); + if($viewPage->dom->branchProductACL->getText() != $this->lang->product->abbr->aclList->open) return $this->failed('权限错误'); return $this->success(); } diff --git a/module/product/test/ui/createproduct.php b/module/product/test/ui/createproduct.php index 408896ff4d..9f33d43819 100755 --- a/module/product/test/ui/createproduct.php +++ b/module/product/test/ui/createproduct.php @@ -15,9 +15,10 @@ SUCCESS chdir(__DIR__); include '../lib/createproduct.ui.class.php'; -zdTable('product')->config('product', false, 2)->gen(10); +//zdTable('product')->config('product', false, 2)->gen(10); //zendata::loadYaml('product', false, 2)->createFor('product', 10); $tester = new createProductTester(); +$tester->login(); $products = array(); $products['null'] = ''; @@ -25,10 +26,10 @@ $products['default'] = '默认产品'; $products['normal'] = '正常产品'; $products['branch'] = '多分支产品产品'; -r($tester->createDefault($products['null'])) && p('message:nameTip') && e('『产品名称』不能为空。'); // 缺少产品名称，创建失败 -r($tester->createDefault($products['default'])) && p('status') && e('SUCCESS'); // 使用默认选项创建产品 -r($tester->createDefault($products['default'])) && p('message:nameTip') && e('『产品名称』已经有『默认产品』这条记录了。'); // 创建重复名称的产品 -r($tester->checkLocating($products['normal'])) && p('module,method') && e('product,browse'); // 创建正常产品后的跳转链接检查 -r($tester->createMultiBranch($products['branch'])) && p('status') && e('SUCCESS'); // 创建正常产品成功 +r($tester->createDefault($products['null'])) && p('message') && e('表单提示信息正确'); // 缺少产品名称，创建失败 +r($tester->createDefault($products['default'])) && p('status') && e('SUCCESS'); // 使用默认选项创建产品 +r($tester->createDefault($products['default'])) && p('message') && e('表单提示信息正确'); // 创建重复名称的产品 +r($tester->checkLocating($products['normal'])) && p('module,method') && e('product,browse'); // 创建正常产品后的跳转链接检查 +r($tester->createMultiBranch($products['branch'])) && p('status') && e('SUCCESS'); // 创建正常产品成功 $tester->closeBrowser();