DEV: restructure tests: move Question tests - fix imports

LimeSurvey · Jan 9, 2018 · 23959f7 · 23959f7
1 parent 9cc72d8
commit 23959f7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/tests/controllers/TemplateControllerTest.php → ...ceptance/admin/TemplateControllerTest.php b/tests/controllers/TemplateControllerTest.php → ...ceptance/admin/TemplateControllerTest.php
@@ -1,6 +1,17 @@
 <?php
+/**
+ *  LimeSurvey
+ * Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
+ * All rights reserved.
+ * License: GNU/GPL License v2 or later, see LICENSE.php
+ * LimeSurvey is free software. This version may have been modified pursuant
+ * to the GNU General Public License, and as distributed it includes or
+ * is derivative of works licensed under the GNU General Public License or
+ * other free or open source software licenses.
+ * See COPYRIGHT.php for copyright notices and details.
+ */
 
-namespace ls\tests\controllers;
+namespace ls\tests\acceptance\admin;
 
 use ls\tests\DummyController;
 use ls\tests\TestBaseClass;

diff --git a/tests/acceptance/questions/DateTimeDefaultAnswerExpressionTest.php b/tests/acceptance/questions/DateTimeDefaultAnswerExpressionTest.php
@@ -2,6 +2,8 @@
 namespace ls\tests\acceptance\question;
 
 use ls\tests\TestBaseClass;
+use ls\tests\DummyController;
+use Survey;
 
 /**
  *  LimeSurvey
@@ -70,7 +72,7 @@ public function testDefaultAnswerExpressionFill()
         $_SESSION['survey_' . self::$surveyId]['step'] = 1;
 
         // Move one step to run expressions.
-        $moveResult = \LimeExpressionManager::NavigateForwards();
+        $moveResult = LimeExpressionManager::NavigateForwards();
 
         // Check result from qanda.
         $qanda = \retrieveAnswers(
@@ -102,7 +104,6 @@ public function testCorrectDefaultAnswerExpression()
     {
         global $thissurvey;
         $thissurvey = self::$surveyId;
-        $survey = \Survey::model()->findByPk(self::$surveyId);
 
         list($question, $group, $sgqa) = self::$testHelper->getSgqa('q2', self::$surveyId);
 

diff --git a/tests/acceptance/questions/DateTimeForwardBackTest.php b/tests/acceptance/questions/DateTimeForwardBackTest.php
@@ -2,6 +2,7 @@
 namespace ls\tests\acceptance\question;
 
 use ls\tests\TestBaseClass;
+use ls\tests\DummyController;
 
 /**
  *  LimeSurvey

diff --git a/tests/acceptance/questions/DateTimeTest.php b/tests/acceptance/questions/DateTimeTest.php
@@ -14,6 +14,7 @@
 namespace ls\tests\acceptance\question;
 
 use ls\tests\TestBaseClass;
+use ls\tests\DummyController;
 
 /**
  * @since 2017-06-13