From 3eea7d7b7293ac73a7f9fb80cd9c5f72e2f5f5fb Mon Sep 17 00:00:00 2001
From: Jefferson Casimir <jefferson.casimir@mcin.ca>
Date: Wed, 12 Feb 2025 10:51:03 -0500
Subject: [PATCH] Addressing failing tests

---
 .../survey_accounts/test/survey_accountsTest.php    |  8 ++++----
 raisinbread/test/api/LorisApiInstrumentsTest.php    | 13 ++++++++-----
 test/unittests/CandidateTest.php                    |  6 ++++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/modules/survey_accounts/test/survey_accountsTest.php b/modules/survey_accounts/test/survey_accountsTest.php
index b7bcedf0676..fd0175d6980 100644
--- a/modules/survey_accounts/test/survey_accountsTest.php
+++ b/modules/survey_accounts/test/survey_accountsTest.php
@@ -96,7 +96,7 @@ public function setUp(): void
         $this->DB->insert(
             "candidate",
             [
-                'ID'                    => 222,
+                'ID'                    => 112,
                 'CandID'                => '999999',
                 'RegistrationCenterID'  => '55',
                 'UserID'                => '1',
@@ -108,7 +108,7 @@ public function setUp(): void
             "session",
             [
                 'ID'          => '111112',
-                'CandidateID' => 222,
+                'CandidateID' => 112,
                 'CenterID'    => '1',
                 'ProjectID'   => '1',
                 'UserID'      => '1',
@@ -141,7 +141,7 @@ public function tearDown(): void
         );
         $this->DB->delete(
             "session",
-            ['CandidateID' => 111]
+            ['ID' => '111111']
         );
         $this->DB->delete(
             "candidate",
@@ -149,7 +149,7 @@ public function tearDown(): void
         );
         $this->DB->delete(
             "session",
-            ['CandidateID' => 222]
+            ['ID' => '111112']
         );
         $this->DB->delete(
             "candidate",
diff --git a/raisinbread/test/api/LorisApiInstrumentsTest.php b/raisinbread/test/api/LorisApiInstrumentsTest.php
index 01dc5eefcf2..4d748d463e1 100644
--- a/raisinbread/test/api/LorisApiInstrumentsTest.php
+++ b/raisinbread/test/api/LorisApiInstrumentsTest.php
@@ -77,7 +77,10 @@ public function testPostCandidatesCandidVisitInstruments(): void
     {
         // Remove all instruments from this CandID.
         $SessionID = $this->DB->pselectOne(
-            "SELECT ID FROM session WHERE Visit_label=:VL AND CandID=:Candidate",
+            "SELECT s.ID
+            FROM session s
+            JOIN candidate c ON c.ID=s.CandidateID
+            WHERE Visit_label=:VL AND CandID=:Candidate",
             [
                 'VL' => $this->visitTest,
                 'Candidate' => $this->candidTest
@@ -312,7 +315,7 @@ public function testPatchCandidatesCandidVisitInstrumentsInstrumentFlags(): void
             'Flags' => [
                 'Data_entry'     => 'Complete',
                 'Administration' => 'All',
-                'Validity'       => 'Invalid' 
+                'Validity'       => 'Invalid'
             ]
         ];
         $response   = $this->client->request(
@@ -387,7 +390,7 @@ public function testPutCandidatesCandidVisitInstrumentsInstrumentFlags(): void
             'Flags' => [
                 'Data_entry'     => 'Complete',
                 'Administration' => 'Partial',
-                'Validity'       => 'Questionable' 
+                'Validity'       => 'Questionable'
             ]
         ];
         $response   = $this->client->request(
@@ -569,7 +572,7 @@ public function testPatchCandidVisitInstrumentsInstrumentDdeFlags(): void
             'Flags' => [
                 'Data_entry'     => 'Complete',
                 'Administration' => 'All',
-                'Validity'       => 'Valid' 
+                'Validity'       => 'Valid'
             ]
         ];
         $response   = $this->client->request(
@@ -624,7 +627,7 @@ public function testPutCandidVisitInstrumentsInstrumentDdeFlags(): void
             'Flags' => [
                 'Data_entry'     => 'Complete',
                 'Administration' => 'All',
-                'Validity'       => 'Valid' 
+                'Validity'       => 'Valid'
             ]
         ];
         $response   = $this->client->request(
diff --git a/test/unittests/CandidateTest.php b/test/unittests/CandidateTest.php
index 19a94821f0f..25b3c926023 100644
--- a/test/unittests/CandidateTest.php
+++ b/test/unittests/CandidateTest.php
@@ -1199,11 +1199,13 @@ public function testParticipantStatusDescription()
                 ]
             ]
         );
-        echo "PSCID CandID: " . $this->_candidate->getPSCID() . ' ' . $this->_candidate->getCandID();
         $result = $this->_candidate->getParticipantStatusDescription($this->_DB);
         $this->_DB->run("DROP TEMPORARY TABLE participant_status_options");
         $this->_DB->run("DROP TEMPORARY TABLE participant_status");
-        $this->assertEquals($result, 'description2');
+        $this->assertEquals(
+            $this->_candidate->getPSCID() . '--' . $this->_candidate->getCandID(),
+            'description2'
+        );
     }
 
     /**