bugfixes to branching and preconditions.

oat-sa · Nov 10, 2015 · ae0b8b6 · ae0b8b6
1 parent 90c37db
commit ae0b8b6
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 32 deletions.
diff --git a/src/qtism/runtime/tests/AssessmentTestSession.php b/src/qtism/runtime/tests/AssessmentTestSession.php
@@ -2157,42 +2157,42 @@ protected function nextRouteItem($ignoreBranchings = false, $ignorePreConditions
         $route = $this->getRoute();
         $stop = false;
 
-        while ($route->valid() === true && $stop === false) {
-
-            // Branchings?
-            if ($ignoreBranchings === false && $this->getCurrentNavigationMode() === NavigationMode::LINEAR && count($route->current()->getBranchRules()) > 0) {
-
-                $branchRules = $route->current()->getBranchRules();
-                for ($i = 0; $i < count($branchRules); $i++) {
-                    $engine = new ExpressionEngine($branchRules[$i]->getExpression(), $this);
-                    $condition = $engine->process();
-                    if ($condition !== null && $condition->getValue() === true) {
-
-                        $target = $branchRules[$i]->getTarget();
-
-                        if ($target === 'EXIT_TEST') {
-                            $this->endTestSession();
-                        } elseif ($target === 'EXIT_TESTPART') {
-                            $route->next();
-                            $this->moveNextTestPart();
-                        } elseif ($target === 'EXIT_SECTION') {
-                            $route->next();
-                            $this->moveNextAssessmentSection();
-                        } else {
-                            $route->branch($branchRules[$i]->getTarget());
-                        }
-
-                        break;
+        // Branchings?
+        if ($ignoreBranchings === false && $this->getCurrentNavigationMode() === NavigationMode::LINEAR && count($route->current()->getBranchRules()) > 0) {
+
+            $branchRules = $route->current()->getBranchRules();
+            for ($i = 0; $i < count($branchRules); $i++) {
+                $engine = new ExpressionEngine($branchRules[$i]->getExpression(), $this);
+                $condition = $engine->process();
+                if ($condition !== null && $condition->getValue() === true) {
+
+                    $target = $branchRules[$i]->getTarget();
+
+                    if ($target === 'EXIT_TEST') {
+                        $this->endTestSession();
+                    } elseif ($target === 'EXIT_TESTPART') {
+                        $route->next();
+                        $this->moveNextTestPart();
+                    } elseif ($target === 'EXIT_SECTION') {
+                        $route->next();
+                        $this->moveNextAssessmentSection();
+                    } else {
+                        $route->branch($branchRules[$i]->getTarget());
                     }
-                }
 
-                if ($i >= count($branchRules)) {
-                    // No branch rule returned true. Simple move next.
-                    $route->next();
+                    break;
                 }
-            } else {
+            }
+
+            if ($i >= count($branchRules)) {
+                // No branch rule returned true. Simple move next.
                 $route->next();
             }
+        } else {
+            $route->next();
+        }
+
+        while ($route->valid() === true && $stop === false) {
 
             // Preconditions on target?
             if ($ignorePreConditions === false && $route->valid() === true) {
@@ -2209,6 +2209,12 @@ protected function nextRouteItem($ignoreBranchings = false, $ignorePreConditions
                             break;
                         }
                     }
+
+                    if ($i >= count($preConditions)) {
+                        // No preConditions returned true, we have to move next
+                        // and fine a new item to be presented.
+                        $route->next();
+                    }
                 } else {
                     $stop = true;
                 }

diff --git a/test/qtismtest/runtime/tests/AssessmentTestSessionBranchingsTest.php b/test/qtismtest/runtime/tests/AssessmentTestSessionBranchingsTest.php
@@ -202,4 +202,4 @@ public function testBranchingOnPreconditon() {
         $this->assertSame(null, $session['Q03.SCORE']);
         $this->assertSame(1.0, $session['Q04.SCORE']->getValue());
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -202,4 +202,4 @@ public function testBranchingOnPreconditon() { @@
             $this->assertSame(null, $session['Q03.SCORE']);
             $this->assertSame(1.0, $session['Q04.SCORE']->getValue());
         }
-    }
+    }