feat: make the first item consider testPart pre-conditions

src/qtism/common/collections/AbstractCollection.php

@@ -96,6 +96,11 @@ public function count(): int
         return count($this->dataPlaceHolder);
     }
 
+    public function isEmpty(): bool
+    {
+        return empty($this->dataPlaceHolder);
+    }
+
     /**
      * Return the current element of the collection while iterating.
      *

src/qtism/data/AssessmentSection.php

@@ -288,6 +288,15 @@ public function getSectionParts(): SectionPartCollection
      */
     public function setSectionParts(SectionPartCollection $sectionParts): void
     {
+        if (!$sectionParts->isEmpty()) {
+            /** @var SectionPart $sectionPart */
+            foreach ($sectionParts as $sectionPart) {
+                $sectionPart->setParent($this);
+            }
+
+            $sectionPart->setIsLast(true);
+        }
+
         $this->sectionParts = $sectionParts;
     }
 
@@ -320,4 +329,11 @@ public function getComponents(): QtiComponentCollection
 
         return new QtiComponentCollection($comp);
     }
+
+    public function isLastSectionPart(SectionPart $sectionPart): bool
+    {
+        $sectionParts = $this->getSectionParts()->getArrayCopy();
+
+        return end($sectionParts) === $sectionPart;
+    }
 }

src/qtism/data/SectionPart.php

@@ -117,6 +117,10 @@ class SectionPart extends QtiComponent implements QtiIdentifiable, Shufflable
      */
     private $timeLimits = null;
 
+    private ?SectionPart $parent = null;
+
+    private bool $isLast = false;
+
     /**
      * Create a new instance of SectionPart.
      *
@@ -363,4 +367,24 @@ public function __clone()
         // Reset observers.
         $this->setObservers(new SplObjectStorage());
     }
+
+    public function getParent(): ?SectionPart
+    {
+        return $this->parent;
+    }
+
+    public function setParent(SectionPart $parent): void
+    {
+        $this->parent = $parent;
+    }
+
+    public function isLast(): bool
+    {
+        return $this->isLast;
+    }
+
+    public function setIsLast(bool $isLast): void
+    {
+        $this->isLast = $isLast;
+    }
 }

src/qtism/data/TestPart.php

@@ -348,20 +348,24 @@ public function getAssessmentSections(): SectionPartCollection
      */
     public function setAssessmentSections(SectionPartCollection $assessmentSections): void
     {
-        if (count($assessmentSections) > 0) {
-            // Check that we have only AssessmentSection and/ord AssessmentSectionRef objects.
-            foreach ($assessmentSections as $assessmentSection) {
-                if (!$assessmentSection instanceof AssessmentSection && !$assessmentSection instanceof AssessmentSectionRef) {
-                    $msg = 'A TestPart contain only contain AssessmentSection or AssessmentSectionRef objects.';
-                    throw new InvalidArgumentException($msg);
-                }
-            }
+        if ($assessmentSections->isEmpty()) {
+            throw new InvalidArgumentException('A TestPart must contain at least one AssessmentSection.');
+        }
 
-            $this->assessmentSections = $assessmentSections;
-        } else {
-            $msg = 'A TestPart must contain at least one AssessmentSection.';
-            throw new InvalidArgumentException($msg);
+        foreach ($assessmentSections as $assessmentSection) {
+            if (
+                !$assessmentSection instanceof AssessmentSection
+                && !$assessmentSection instanceof AssessmentSectionRef
+            ) {
+                throw new InvalidArgumentException(
+                    'A TestPart contain only contain AssessmentSection or AssessmentSectionRef objects.'
+                );
+            }
         }
+
+        $assessmentSection->setIsLast(true);
+
+        $this->assessmentSections = $assessmentSections;
     }
 
     /**
@@ -419,4 +423,11 @@ public function __clone()
     {
         $this->setObservers(new SplObjectStorage());
     }
+
+    public function isLastSection(AssessmentSection $assessmentSection): bool
+    {
+        $sections = $this->getAssessmentSections()->getArrayCopy();
+
+        return end($sections) === $assessmentSection;
+    }
 }

src/qtism/runtime/tests/AbstractSessionManager.php

@@ -31,6 +31,7 @@
 use qtism\data\IAssessmentItem;
 use qtism\data\NavigationMode;
 use qtism\data\SubmissionMode;
+use qtism\data\TestPart;
 
 /**
  * The AbstractSessionManager class is a bed for instantiating
@@ -148,6 +149,7 @@ protected function createRoute(AssessmentTest $test): Route
     {
         $routeStack = [];
 
+        /** @var TestPart $testPart */
         foreach ($test->getTestParts() as $testPart) {
             $assessmentSectionStack = [];
 
@@ -192,16 +194,6 @@ protected function createRoute(AssessmentTest $test): Route
                             $route->appendRoute($r);
                         }
 
-                        // Add to the last item of the selection the branch rules of the AssessmentSection/testPart
-                        // on which the selection is applied... Only if the route contains something (empty assessmentSection edge case).
-                        if ($route->count() > 0) {
-                            $route->getLastRouteItem()->addBranchRules($current->getBranchRules());
-
-                            // Do the same as for branch rules for pre conditions, except that they must be
-                            // attached on the first item of the route.
-                            $route->getFirstRouteItem()->addPreConditions($current->getPreConditions());
-                        }
-
                         array_push($routeStack, $route);
                         array_pop($assessmentSectionStack);
                     } elseif ($current instanceof AssessmentItemRef) {
@@ -216,6 +208,8 @@ protected function createRoute(AssessmentTest $test): Route
 
         $finalRoutes = $routeStack;
         $route = new SelectableRoute();
+
+        /** @var SelectableRoute $finalRoute */
         foreach ($finalRoutes as $finalRoute) {
             $route->appendRoute($finalRoute);
         }

src/qtism/runtime/tests/AssessmentTestSession.php

@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2013-2020 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
+ * Copyright (c) 2013-2023 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  *
  * @author Jérôme Bogaerts <[email protected]>
  * @license GPLv2
@@ -2406,10 +2406,12 @@ protected function nextRouteItem($ignoreBranchings = false, $ignorePreConditions
         $stop = false;
 
         while ($route->valid() === true && $stop === false) {
+            $branchRules = $route->current()->getEffectiveBranchRules();
+            $numberOfBranchRules = $branchRules->count();
+
             // Branchings?
-            if ($ignoreBranchings === false && count($route->current()->getBranchRules()) > 0 && $this->mustApplyBranchRules() === true) {
-                $branchRules = $route->current()->getBranchRules();
-                for ($i = 0; $i < count($branchRules); $i++) {
+            if ($ignoreBranchings === false && $numberOfBranchRules > 0 && $this->mustApplyBranchRules() === true) {
+                for ($i = 0; $i < $numberOfBranchRules; $i++) {
                     $engine = new ExpressionEngine($branchRules[$i]->getExpression(), $this);
                     $condition = $engine->process();
                     if ($condition !== null && $condition->getValue() === true) {
@@ -2438,17 +2440,21 @@ protected function nextRouteItem($ignoreBranchings = false, $ignorePreConditions
             }
 
             // Preconditions on target?
-            if ($ignorePreConditions === false && $route->valid() === true && ($preConditions = $route->current()->getPreConditions()) && count($preConditions) > 0 && $this->mustApplyPreConditions() === true) {
+            if ($ignorePreConditions === false && $route->valid() === true && ($preConditions = $route->current()->getEffectivePreConditions()) && count($preConditions) > 0 && $this->mustApplyPreConditions() === true) {
+                $preConditionFailed = false;
+
                 for ($i = 0; $i < count($preConditions); $i++) {
                     $engine = new ExpressionEngine($preConditions[$i]->getExpression(), $this);
                     $condition = $engine->process();
 
-                    if ($condition !== null && $condition->getValue() === true) {
-                        // The item must be presented.
-                        $stop = true;
+                    if ($condition === null || $condition->getValue() === false) {
+                        // The item must NOT be presented.
+                        $preConditionFailed = true;
                         break;
                     }
                 }
+
+                $stop = !$preConditionFailed;
             } else {
                 $stop = true;
             }

src/qtism/runtime/tests/Route.php

@@ -1117,10 +1117,11 @@ public function branch($identifier): void
 
             if ($targetRouteItems[$occurence]->getTestPart() !== $this->current()->getTestPart()) {
                 // From IMS QTI:
-                // In case of an item or section, the target must refer to an item or section
-                // in the same testPart [...]
-                $msg = 'Branchings to items outside of the current testPart is forbidden by the QTI 2.1 specification.';
-                throw new OutOfBoundsException($msg);
+                // In the case of an item or section, the target must refer to an item or section in the same test-part
+                // that has not yet been presented.
+                $this->next();
+
+                return;
             }
 
             $this->setPosition($this->getRouteItemPosition($targetRouteItems[$occurence]));
@@ -1133,10 +1134,11 @@ public function branch($identifier): void
         if (isset($assessmentSectionIdentifierMap[$id])) {
             if ($assessmentSectionIdentifierMap[$id][0]->getTestPart() !== $this->current()->getTestPart()) {
                 // From IMS QTI:
-                // In case of an item or section, the target must refer to an item or section
-                // in the same testPart [...]
-                $msg = 'Branchings to assessmentSections outside of the current testPart is forbidden by the QTI 2.1 specification.';
-                throw new OutOfBoundsException($msg);
+                // In the case of an item or section, the target must refer to an item or section in the same test-part
+                // that has not yet been presented.
+                $this->next();
+
+                return;
             }
 
             // We branch to the first RouteItem belonging to the section.

src/qtism/runtime/tests/RouteItem.php

@@ -268,6 +268,30 @@ public function getPreConditions(): PreConditionCollection
         return $this->preConditions;
     }
 
+    /**
+     * Get the PreConditions that actually need to be applied considering all the parent elements: TestPart and Section
+     *
+     * @return PreConditionCollection A collection of PreCondition objects.
+     */
+    public function getEffectivePreConditions(): PreConditionCollection
+    {
+        $routeItemPreConditions = new PreConditionCollection([]);
+
+        foreach ($this->getTestPart()->getPreConditions() as $preCondition) {
+            $routeItemPreConditions->attach($preCondition);
+        }
+
+        foreach ($this->getAssessmentSection()->getPreConditions() as $preCondition) {
+            $routeItemPreConditions->attach($preCondition);
+        }
+
+        foreach ($this->getPreConditions() as $preCondition) {
+            $routeItemPreConditions->attach($preCondition);
+        }
+
+        return $routeItemPreConditions;
+    }
+
     /**
      * Set the PreCondition objects to be applied prior to the RouteItem.
      *
@@ -426,4 +450,39 @@ public function getTimeLimits($excludeItem = false): RouteTimeLimitsCollection
 
         return $timeLimits;
     }
+
+    public function getEffectiveBranchRules(): BranchRuleCollection
+    {
+        // Checking branching rules at the Item level
+        if (!$this->getBranchRules()->isEmpty()) {
+            return $this->getBranchRules();
+        }
+
+        $currentSectionPart = $this->getAssessmentItemRef();
+
+        // Checking branching rules at the Section/Subsection level
+        // To get branching rules for the current section, you need to make sure that the current part of the
+        // section (item or subsection) is the last part of the current section.
+        while ($parent = $currentSectionPart->getParent()) {
+            if (!$currentSectionPart->isLast()) {
+                return new BranchRuleCollection();
+            }
+
+            if (!$parent->getBranchRules()->isEmpty()) {
+                return $parent->getBranchRules();
+            }
+
+            // If there are no branching rules for the current section, we proceed to check its parent section
+            // (if it exists)
+            $currentSectionPart = $parent;
+        }
+
+        // Checking branching rules at the Test Part level
+        // In this case, $currentSectionPart is the top-level section of the current item
+        if (!$currentSectionPart->isLast()) {
+            return new BranchRuleCollection();
+        }
+
+        return $this->getTestPart()->getBranchRules();
+    }
 }

test/qtismtest/runtime/tests/AssessmentTestSessionBranchingsTest.php

@@ -248,4 +248,62 @@ public function testBranchingOnPreconditon(): void
         $this::assertNull($session['Q03.SCORE']);
         $this::assertSame(1.0, $session['Q04.SCORE']->getValue());
     }
+
+    public function testBranchingOnTestPartsSimple1(): void
+    {
+        $session = self::instantiate(self::samplesDir() . 'custom/runtime/branchings/branchings_testparts.xml');
+        $session->beginTestSession();
+
+        // We are starting at item Q01, in testPart P01.
+        $this->assertEquals('Q01', $session->getCurrentAssessmentItemRef()->getIdentifier());
+
+        // Let's jump to testPart P03.
+        $session->beginAttempt();
+        $session->endAttempt(new State([new ResponseVariable('RESPONSE', Cardinality::SINGLE, BaseType::IDENTIFIER, new QtiIdentifier('GotoP03'))]));
+        $session->moveNext();
+
+        // We expect to land in testPart P03, item Q03.
+        $this->assertEquals('Q03', $session->getCurrentAssessmentItemRef()->getIdentifier());
+        $this->assertEquals('P03', $session->getCurrentTestPart()->getIdentifier());
+    }
+
+    public function testBranchingRules(): void
+    {
+        $session = self::instantiate(self::samplesDir() . 'custom/runtime/branchings/branching_rules.xml');
+        $session->beginTestSession();
+
+        $this->assertEquals('testPart-1', $session->getCurrentTestPart()->getIdentifier());
+        $this->assertEquals('assessmentSection-1', $session->getCurrentAssessmentSection()->getIdentifier());
+        $this->assertEquals('item-1', $session->getCurrentAssessmentItemRef()->getIdentifier());
+
+        $session->moveNext();
+
+        $this->assertEquals('testPart-1', $session->getCurrentTestPart()->getIdentifier());
+        $this->assertEquals('assessmentSection-1', $session->getCurrentAssessmentSection()->getIdentifier());
+        $this->assertEquals('item-3', $session->getCurrentAssessmentItemRef()->getIdentifier());
+
+        $session->moveNext();
+
+        $this->assertEquals('testPart-1', $session->getCurrentTestPart()->getIdentifier());
+        $this->assertEquals('assessmentSection-3', $session->getCurrentAssessmentSection()->getIdentifier());
+        $this->assertEquals('item-5', $session->getCurrentAssessmentItemRef()->getIdentifier());
+
+        $session->moveNext();
+
+        $this->assertEquals('testPart-3', $session->getCurrentTestPart()->getIdentifier());
+        $this->assertEquals('assessmentSection-5', $session->getCurrentAssessmentSection()->getIdentifier());
+        $this->assertEquals('item-7', $session->getCurrentAssessmentItemRef()->getIdentifier());
+
+        $session->moveNext();
+
+        $this->assertEquals('testPart-4', $session->getCurrentTestPart()->getIdentifier());
+        $this->assertEquals('subsection-1', $session->getCurrentAssessmentSection()->getIdentifier());
+        $this->assertEquals('item-9', $session->getCurrentAssessmentItemRef()->getIdentifier());
+
+        $session->moveNext();
+
+        $this->assertEquals('testPart-5', $session->getCurrentTestPart()->getIdentifier());
+        $this->assertEquals('assessmentSection-8', $session->getCurrentAssessmentSection()->getIdentifier());
+        $this->assertEquals('item-11', $session->getCurrentAssessmentItemRef()->getIdentifier());
+    }
 }