Addressing failing tests

jeffersoncasimir · Feb 12, 2025 · 1f77e78 · 1f77e78
1 parent 3eea7d7
commit 1f77e78
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/modules/timepoint_list/test/timepoint_listTest.php b/modules/timepoint_list/test/timepoint_listTest.php
@@ -48,6 +48,12 @@ class TimepointListIntegrationTest extends LorisIntegrationTestWithCandidate
      */
     private static $_TST0001_CANDID = 900000;
 
+    /**
+     * ID for candidate TST0001.
+     */
+    private static $_TST0001_CANDIDATEID = 1;
+
+
     /**
      * Tests that, when loading the timepoint_list module, some
      * text appears in the body.
@@ -121,6 +127,7 @@ function testTimepointFilteringRules()
         $this->DB->insert(
             "candidate",
             [
+                'ID'                    => 2,
                 'CandID'                => '900001',
                 'PSCID'                 => 'TST0002',
                 'RegistrationCenterID'  => 1,
@@ -136,7 +143,7 @@ function testTimepointFilteringRules()
             'session',
             [
                 'ID'          => '999998',
-                'CandID'      => '900001',
+                'CandidateID' => 2,
                 'Visit_label' => 'Test',
                 'CenterID'    => 1,
                 'ProjectID'   => 1,
@@ -149,7 +156,7 @@ function testTimepointFilteringRules()
             'session',
             [
                 'ID'          => '999997',
-                'CandID'      => self::$_TST0001_CANDID,
+                'CandidateID' => 1,
                 'Visit_label' => 'Test2',
                 'CenterID'    => 1,
                 'ProjectID'   => 1,

diff --git a/php/libraries/CandIDGenerator.php b/php/libraries/CandIDGenerator.php
@@ -31,7 +31,7 @@ class CandIDGenerator extends IdentifierGenerator
      */
     private const LENGTH     = 10;
     private const MIN_CANDID = '100000';
-    private const MAX_CANDID = '9999999999';
+    private const MAX_CANDID = '4294967295';
 
     /**
      * Creates a new CandIDGenerator by initializing properties based on class

diff --git a/test/unittests/CandidateTest.php b/test/unittests/CandidateTest.php
@@ -1203,7 +1203,7 @@ public function testParticipantStatusDescription()
         $this->_DB->run("DROP TEMPORARY TABLE participant_status_options");
         $this->_DB->run("DROP TEMPORARY TABLE participant_status");
         $this->assertEquals(
-            $this->_candidate->getPSCID() . '--' . $this->_candidate->getCandID(),
+            $this->_candidate->getPSCID() . '--' . $this->_candidate->getData('ID'),
             'description2'
         );
     }