From e499074f39d5d0a97978eefb83a32ced8a6eb762 Mon Sep 17 00:00:00 2001
From: David Monllao <davidm@moodle.com>
Date: Fri, 9 Jun 2017 13:01:30 +0200
Subject: [PATCH] MDL-59057 analytics: Adapt tests to static models API changes

Part of MDL-57791 epic.
---
 .../tests/fixtures/test_target_shortname.php  | 19 +++++++++++--------
 analytics/tests/prediction_test.php           | 19 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/analytics/tests/fixtures/test_target_shortname.php b/analytics/tests/fixtures/test_target_shortname.php
index 2ff52b04099..858e6e1baab 100644
--- a/analytics/tests/fixtures/test_target_shortname.php
+++ b/analytics/tests/fixtures/test_target_shortname.php
@@ -36,18 +36,21 @@ class test_target_shortname extends \core_analytics\local\target\binary {
         return true;
     }
 
-    protected function calculate_sample($sampleid, \core_analytics\analysable $analysable) {
-        global $DB;
-
-        $sample = $DB->get_record('course', array('id' => $sampleid));
+    public function is_valid_sample($sampleid, \core_analytics\analysable $analysable) {
 
+        $sample = $this->retrieve('course', $sampleid);
         if ($sample->visible == 0) {
             // We skip not-visible courses as a way to emulate the training data / prediction data difference.
-            // In normal circumstances targets will return null when they receive a sample that can not be
-            // processed, that same sample may be used for prediction.
-            // We can not do this in is_valid_analysable because the analysable there is the site not the course.
-            return null;
+            // In normal circumstances is_valid_sample will return false when they receive a sample that can not be
+            // processed.
+            return false;
         }
+        return true;
+    }
+
+    protected function calculate_sample($sampleid, \core_analytics\analysable $analysable, $starttime = false, $endtime = false) {
+
+        $sample = $this->retrieve('course', $sampleid);
 
         $firstchar = substr($sample->shortname, 0, 1);
         if ($firstchar === 'a') {
diff --git a/analytics/tests/prediction_test.php b/analytics/tests/prediction_test.php
index 426989e4a84..77103e4aded 100644
--- a/analytics/tests/prediction_test.php
+++ b/analytics/tests/prediction_test.php
@@ -40,12 +40,12 @@ require_once(__DIR__ . '/fixtures/test_target_shortname.php');
 class core_analytics_prediction_testcase extends advanced_testcase {
 
     /**
-     * @dataProvider provider_training_and_prediction
+     * @dataProvider provider_ml_training_and_prediction
      * @param string $timesplittingid
      * @param int $npredictedranges
      * @return void
      */
-    public function test_training_and_prediction($timesplittingid, $npredictedranges, $predictionsprocessorclass) {
+    public function test_ml_training_and_prediction($timesplittingid, $npredictedranges, $predictionsprocessorclass) {
         global $DB;
 
         $ncourses = 10;
@@ -112,12 +112,11 @@ class core_analytics_prediction_testcase extends advanced_testcase {
 
         // $course1 predictions should be 1 == 'a', $course2 predictions should be 0 == 'b'.
         $correct = array($course1->id => 1, $course2->id => 0);
-        foreach ($result->predictions as $sampleprediction) {
-            list($uniquesampleid, $prediction) = $sampleprediction;
-            list($uniquesampleid, $rangeindex) = $model->get_time_splitting()->infer_sample_info($uniquesampleid);
+        foreach ($result->predictions as $uniquesampleid => $predictiondata) {
+            list($sampleid, $rangeindex) = $model->get_time_splitting()->infer_sample_info($uniquesampleid);
 
             // The range index is not important here, both ranges prediction will be the same.
-            $this->assertEquals($correct[$uniquesampleid], $prediction);
+            $this->assertEquals($correct[$sampleid], $predictiondata->prediction);
         }
 
         // 2 ranges will be predicted.
@@ -137,7 +136,7 @@ class core_analytics_prediction_testcase extends advanced_testcase {
         $this->assertEquals(2 * $npredictedranges, $DB->count_records('analytics_predictions', array('modelid' => $model->get_id())));
     }
 
-    public function provider_training_and_prediction() {
+    public function provider_ml_training_and_prediction() {
         $cases = array(
             'no_splitting' => array('\core_analytics\local\time_splitting\no_splitting', 1),
             'quarters' => array('\core_analytics\local\time_splitting\quarters', 4)
@@ -151,9 +150,9 @@ class core_analytics_prediction_testcase extends advanced_testcase {
     /**
      * Basic test to check that prediction processors work as expected.
      *
-     * @dataProvider provider_test_evaluation
+     * @dataProvider provider_ml_test_evaluation
      */
-    public function test_evaluation($modelquality, $ncourses, $expected, $predictionsprocessorclass) {
+    public function test_ml_evaluation($modelquality, $ncourses, $expected, $predictionsprocessorclass) {
         $this->resetAfterTest(true);
 
         $sometimesplittings = '\core_analytics\local\time_splitting\weekly,' .
@@ -203,7 +202,7 @@ class core_analytics_prediction_testcase extends advanced_testcase {
         }
     }
 
-    public function provider_test_evaluation() {
+    public function provider_ml_test_evaluation() {
 
         $cases = array(
             'bad-and-no-enough-data' => array(