From f7891a08a3a716d7337142dff0a695c1bdc2a096 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Sat, 7 May 2022 15:23:33 +0800
Subject: [PATCH] * unit test entry

---
 test/class/entry.class.php   | 113 ++++++++++++-----------------------
 test/model/entry/getbyid.php |   6 +-
 2 files changed, 40 insertions(+), 79 deletions(-)

diff --git a/test/class/entry.class.php b/test/class/entry.class.php
index d1e41f7de9..9d7c4b1266 100644
--- a/test/class/entry.class.php
+++ b/test/class/entry.class.php
@@ -17,14 +17,10 @@ class entryTest
     public function getByIdTest($entryID)
     {
         $object = $this->objectModel->getById($entryID);
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            return $object;
-        }
+
+        if(dao::isError()) return dao::getError();
+
+        return $object;
     }
 
     /**
@@ -37,14 +33,10 @@ class entryTest
     public function getByCodeTest($code)
     {
         $object = $this->objectModel->getByCode($code);
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            return $object;
-        }
+
+        if(dao::isError()) return dao::getError();
+
+        return $object;
     }
 
     /**
@@ -57,14 +49,10 @@ class entryTest
     public function getByKeyTest($key)
     {
         $object = $this->objectModel->getByKey($key);
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            return $object;
-        }
+
+        if(dao::isError()) return dao::getError();
+
+        return $object;
     }
 
     /**
@@ -78,14 +66,10 @@ class entryTest
     public function getListTest($orderBy = 'id_desc', $pager = null)
     {
         $objects = $this->objectModel->getList($orderBy, $pager);
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            return $objects;
-        }
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
     }
 
     /**
@@ -100,14 +84,10 @@ class entryTest
     public function getLogsTest($id, $orderBy = 'date_desc', $pager = null)
     {
         $object = $this->objectModel->getLogs($id, $orderBy, $paper);
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            return $object;
-        }
+
+        if(dao::isError()) return dao::getError();
+
+        return $object;
     }
 
     /**
@@ -131,15 +111,11 @@ class entryTest
 
         $objectID = $this->objectModel->create();
         unset($_POST);
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            $object = $this->objectModel->getById($objectID);
-            return $object;
-        }
+
+        if(dao::isError()) return dao::getError();
+
+        $object = $this->objectModel->getById($objectID);
+        return $object;
     }
 
     /**
@@ -172,14 +148,8 @@ class entryTest
         if($change == array()) $change = '没有数据更新';
         unset($_POST);
 
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            return $change;
-        }
+        if(dao::isError()) return dao::getError();
+        return $change;
     }
 
     /**
@@ -193,15 +163,11 @@ class entryTest
     public function updateCalledTimeTest($code, $time)
     {
         $this->objectModel->updateCalledTime($code, $time);
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            $object = $this->objectModel->getByCode($code);
-            return $object;
-        }
+
+        if(dao::isError()) return dao::getError();
+
+        $object = $this->objectModel->getByCode($code);
+        return $object;
     }
 
     /**
@@ -215,17 +181,12 @@ class entryTest
     public function saveLogTest($entryID, $url)
     {
         $this->objectModel->saveLog($entryID, $url);
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-           global $tester;
-           $object = $tester->dbh->query("SELECT * FROM " . TABLE_LOG  ." WHERE objectID = $entryID AND objectType = 'entry'")->fetch();
-           return $object;
-        }
 
+        if(dao::isError()) return dao::getError();
+
+        global $tester;
+        $object = $tester->dbh->query("SELECT * FROM " . TABLE_LOG  ." WHERE objectID = $entryID AND objectType = 'entry'")->fetch();
+        return $object;
     }
 
 }
diff --git a/test/model/entry/getbyid.php b/test/model/entry/getbyid.php
index 7794a439dd..5e83b46f5a 100755
--- a/test/model/entry/getbyid.php
+++ b/test/model/entry/getbyid.php
@@ -21,8 +21,8 @@ $entryIDList = array('1', '1000001');
 
 $entry = new entryTest();
 
-r($entry->getByIdTest($entryIDList[0])) && p('name') && e('这是应用名称1'); // 查询id为1的entry的name
+r($entry->getByIdTest($entryIDList[0])) && p('name') && e('这是应用名称1');   // 查询id为1的entry的name
 r($entry->getByIdTest($entryIDList[0])) && p('account') && e('accountadmin'); // 查询id为1的entry的account
-r($entry->getByIdTest($entryIDList[1])) && p('name') && e('0'); // 查询id为1000001的entry的name
-r($entry->getByIdTest($entryIDList[1])) && p('account') && e('0'); // 查询id为1000001的entry的account
+r($entry->getByIdTest($entryIDList[1])) && p('name') && e('0');               // 查询id为1000001的entry的name
+r($entry->getByIdTest($entryIDList[1])) && p('account') && e('0');            // 查询id为1000001的entry的account
 system("./ztest init");