MDL-52060 phpunit: Check file only if needed

diff --git a/lib/testing/classes/util.php b/lib/testing/classes/util.php
index 0864d3b..1b08d6f 100644 (file)
--- a/lib/testing/classes/util.php
+++ b/lib/testing/classes/util.php
@@ -269,17 +269,15 @@ abstract class testing_util {
      * @return array  $table=>$records
      */
     protected static function get_tabledata() {
-        global $CFG;
-
-        $framework = self::get_framework();
+        if (!isset(self::$tabledata)) {
+            $framework = self::get_framework();
 
-        $datafile = self::get_dataroot() . '/' . $framework . '/tabledata.ser';
-        if (!file_exists($datafile)) {
-            // Not initialised yet.
-            return array();
-        }
+            $datafile = self::get_dataroot() . '/' . $framework . '/tabledata.ser';
+            if (!file_exists($datafile)) {
+                // Not initialised yet.
+                return array();
+            }
 
-        if (!isset(self::$tabledata)) {
             $data = file_get_contents($datafile);
             self::$tabledata = unserialize($data);
         }
@@ -297,17 +295,15 @@ abstract class testing_util {
      * @return array $table=>$records
      */
     public static function get_tablestructure() {
-        global $CFG;
-
-        $framework = self::get_framework();
+        if (!isset(self::$tablestructure)) {
+            $framework = self::get_framework();
 
-        $structurefile = self::get_dataroot() . '/' . $framework . '/tablestructure.ser';
-        if (!file_exists($structurefile)) {
-            // Not initialised yet.
-            return array();
-        }
+            $structurefile = self::get_dataroot() . '/' . $framework . '/tablestructure.ser';
+            if (!file_exists($structurefile)) {
+                // Not initialised yet.
+                return array();
+            }
 
-        if (!isset(self::$tablestructure)) {
             $data = file_get_contents($structurefile);
             self::$tablestructure = unserialize($data);
         }