[Test] Fixing unittests causing Travis failure (#6903)

The unit tests for NDB_BVL_Instrument that were merged with main in PR #6819 were causing Travis to fail. This fixes those errors.

The reason it failed Travis was because the changes made in merged PR #5352 were not added to the testing PR. These changes caused it to fail Travis but were not flagged before.

Author: AlexandraLivadas

test/unittests/NDB_BVL_Instrument_Test.php

@@ -17,6 +17,7 @@
 require_once __DIR__ . '/../../php/libraries/NDB_BVL_Instrument.class.inc';
 require_once 'Smarty_hook.class.inc';
 require_once 'NDB_Config.class.inc';
+require_once 'SessionID.php';
 /**
  * Unit test for NDB_BVL_Instrument class
  *
@@ -983,14 +984,21 @@ function testGetCommentID()
      */
     function testGetSessionID()
     {
-        $this->_setUpMockDB();
-        $this->_setTableData();
         $this->_instrument->commentID = 'commentID1';
-        $this->assertEquals("123", $this->_instrument->getSessionID());
+        $this->_mockDB->expects($this->once())->method('pselectOne')
+            ->with(
+                "SELECT SessionID FROM flag WHERE CommentID = :CID",
+                ['CID' => 'commentID1']
+            )
+            ->willReturn('123');
+        $this->assertEquals(
+            new \SessionID('123'),
+            $this->_instrument->getSessionID()
+        );
     }
 
     /**
-     * Test that getSessionID returns -1 if nothing was found in the
+     * Test that getSessionID throws a NotFound exception if nothing was found in the
      * database for the given commentID
      *
      * @covers NDB_BVL_Instrument::getSessionID
@@ -1001,7 +1009,8 @@ function testGetSessionIDReturnsNegative()
         $this->_setUpMockDB();
         $this->_setTableData();
         $this->_instrument->commentID = 'commentID3';
-        $this->assertEquals(-1, $this->_instrument->getSessionID());
+        $this->expectException('NotFound');
+        $this->_instrument->getSessionID();
     }
 
     /**
@@ -1013,28 +1022,20 @@ function testGetSessionIDReturnsNegative()
      */
     function testGetVisitLabel()
     {
-        $this->_setUpMockDB();
-        $this->_setTableData();
         $this->_instrument->commentID = 'commentID1';
-        $this->assertEquals("123", $this->_instrument->getSessionID());
+        $this->_mockDB->expects($this->any(0))->method('pselectOne')
+            ->with(
+                "SELECT SessionID FROM flag WHERE CommentID = :CID",
+                ['CID' => 'commentID1']
+            )
+            ->willReturn('123');
+        $this->_mockDB->expects($this->any())->method('pselectRow')
+            ->willReturn(
+                ['SubprojectID' => 2, 'Visit_label' => 'V1', 'CandID' => '300123']
+            );
         $this->assertEquals("V1", $this->_instrument->getVisitLabel());
     }
 
-    /**
-     * Test that getVistiLabel returns an empty string
-     * if nothing was found in the database
-     *
-     * @covers NDB_BVL_Instrument::getVisitLabel
-     * @return void
-     */
-    function testGetVisitLabelReturnsEmpty()
-    {
-        $this->_setUpMockDB();
-        $this->_setTableData();
-        $this->_instrument->commentID = 'commentID3';
-        $this->assertEquals("", $this->_instrument->getVisitLabel());
-    }
-
     /**
      * Test that getSubprojectID returns the correct value
      * for the given session ID
@@ -1044,26 +1045,18 @@ function testGetVisitLabelReturnsEmpty()
      */
     function testGetSubprojectID()
     {
-        $this->_setUpMockDB();
-        $this->_setTableData();
         $this->_instrument->commentID = 'commentID1';
+        $this->_mockDB->expects($this->any(0))->method('pselectOne')
+            ->with(
+                "SELECT SessionID FROM flag WHERE CommentID = :CID",
+                ['CID' => 'commentID1']
+            )
+            ->willReturn('123');
+        $this->_mockDB->expects($this->any())->method('pselectRow')
+            ->willReturn(['SubprojectID' => 2]);
         $this->assertEquals(2, $this->_instrument->getSubprojectID());
     }
 
-    /**
-     * Test that getSubprojectID returns null if nothing was found
-     *
-     * @covers NDB_BVL_Instrument::getSubprojectID
-     * @return void
-     */
-    function testGetSubprojectIDReturnsNull()
-    {
-        $this->_setUpMockDB();
-        $this->_setTableData();
-        $this->_instrument->commentID = 'commentID3';
-        $this->assertEquals(null, $this->_instrument->getSubprojectID());
-    }
-
     /**
      * Test that getDoB returns the correct date of birth from the database
      *
@@ -1769,44 +1762,6 @@ function toJsonParseSmartySelectType()
         $this->assertEquals($el, $this->_instrument->_toJSONParseSmarty($select));
     }
 
-    /**
-     * Test that getBreadcrumbs returns a BreadcrumbTrail object with the correct
-     * Breadcrumb data
-     *
-     * @covers NDB_BVL_Instrument::getBreadcrumbs
-     * @return void
-     */
-    function testGetBreadcrumbs()
-    {
-        $this->_setUpMockDB();
-        $this->_setTableData();
-        $this->_instrument->commentID = 'commentID1';
-        $this->_instrument->testName = 'testname';
-        $breadcrumb = new \LORIS\BreadcrumbTrail(
-            new \LORIS\Breadcrumb(
-                'Access Profile',
-                '/candidate_list'
-            ),
-            new \LORIS\Breadcrumb(
-                "Candidate Profile 300123 / 345",
-                "/300123"
-            ),
-            new \LORIS\Breadcrumb(
-                "TimePoint V1 Details",
-                "/instrument_list/?candID=300123&sessionID=123"
-            ),
-            new \LORIS\Breadcrumb(
-                "Test Instrument",
-                "/instruments/testname/".
-                "?commentID=commentID1&sessionID=123&candID=300123"
-            )
-        );
-        $this->assertEquals(
-            $breadcrumb,
-            $this->_instrument->getBreadcrumbs()
-        );
-    }
-
     /**
      * Test that usesJSONData returns false
      *