fix database text

kongtiaowang · Dec 16, 2020 · 937eab9 · 937eab9
1 parent 265ed8c
commit 937eab9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/test/unittests/Database_Test.php b/test/unittests/Database_Test.php
@@ -136,10 +136,6 @@ function _getAllMethodsExcept($methods)
      */
     function testSetFakeData()
     {
-        $client = new NDB_Client();
-        $client->makeCommandLine();
-        $client->initialize();
-
         $this->DB->setFakeTableData(
             "Config",
             [
@@ -152,7 +148,7 @@ function testSetFakeData()
         );
 
         $allCandidates = $this->DB->pselect("SELECT * FROM Config", []);
-
+        $this->DB->run("DROP TEMPORARY TABLE Config");
         $this->assertEquals(
             $allCandidates,
             [

diff --git a/test/unittests/NDB_Factory_Test.php b/test/unittests/NDB_Factory_Test.php
@@ -235,6 +235,11 @@ function testProject()
     function testCandidate()
     {
         $candID = new CandID("300001");
+        $mockdb     = $this->getMockBuilder("\Database")->getMock();
+        $this->_factory->setDatabase($mockdb);
+        $mockdb->expects($this->any())
+            ->method('pselectRow')
+            ->willReturn(['DCCID'=>'300001']);
         $this->assertEquals(
             Candidate::singleton($candID),
             $this->_factory->candidate($candID)
@@ -251,6 +256,13 @@ function testCandidate()
     function testTimepoint()
     {
         $sessionID = new \SessionID("1");
+        $mockdb     = $this->getMockBuilder("\Database")->getMock();
+        $mockconfig = $this->getMockBuilder("\NDB_Config")->getMock();
+        $this->_factory->setConfig($mockconfig);
+        $this->_factory->setDatabase($mockdb);
+        $mockdb->expects($this->any())
+            ->method('pselectRow')
+            ->willReturn(['1']);
         $this->assertEquals(
             \TimePoint::singleton($sessionID),
             $this->_factory->timepoint($sessionID)