Revert "Dev: Use PHPUnit dataset instead of manually inserting data i…

…n test" This reverts commit c60ac14.
LimeSurvey · Feb 24, 2021 · fee6204 · fee6204
1 parent 5d2c4de
commit fee6204
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 41 deletions.
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -216,6 +216,8 @@
     }
 }
 
+$config['components']['db']['connectionString'] = 'mysql:host=localhost;port=3306;dbname=ls4;';
+
 // Check that tmp and upload are set to 777 permission (OK on test system).
 if (substr(sprintf('%o', fileperms(BASEPATH . '../tmp/')), -4) != '0777') {
     die('tmp folder not set to 777');

diff --git a/tests/data/datasets/participantattributes.xml b/tests/data/datasets/participantattributes.xml
diff --git a/tests/unit/controllers/ParticipantActionTest.php b/tests/unit/controllers/ParticipantActionTest.php
@@ -3,39 +3,12 @@
 namespace ls\tests\controllers;
 
 use ls\tests\TestBaseClass;
-use PHPUnit\DbUnit\TestCaseTrait;
 
 /**
  * Test the participantsaction controller class.
  */
 class ParticipantActionTest extends TestBaseClass
 {
-    use TestCaseTrait;
-
-    /**
-     * @return PHPUnit_Extensions_Database_DB_IDatabaseConnection
-     */
-    public function getConnection()
-    {
-        $config = include(APPPATH . '/config/config.php');
-        $dsn = 'mysql:dbname=limesurvey;host=localhost';
-        $user = $config['components']['db']['username'];
-        $password = $config['components']['db']['password'];
-        $pdo = new \PDO($dsn, $user, $password);
-        return $this->createDefaultDBConnection($pdo);
-    }
-
-    /**
-     * @return PHPUnit_Extensions_Database_DataSet_IDataSet
-     */
-    public function getDataSet()
-    {
-        if (\PHP_VERSION_ID < 80000) {
-            libxml_disable_entity_loader(false);
-        }           
-        return $this->createFlatXMLDataSet(ROOT . '/tests/data/datasets/participantattributes.xml');
-    }
-
     /**
      * @group pp
      */
@@ -49,7 +22,13 @@ public function testUpdateEncryption()
         $participantController = new \participantsaction('dummy');
 
         // TODO: Use PHPUnit dataset instead? https://phpunit.de/manual/6.5/en/database.html
-        $attribute_id = 10;
+        $attrName = new \ParticipantAttributeName();
+        $attrName->attribute_type = 'TB';
+        $attrName->defaultname    = 'encrypted';
+        $attrName->visible        = 'TRUE';
+        $attrName->encrypted      = 'Y';
+        $attrName->core_attribute = 'N';
+        $this->assertTrue($attrName->save());
 
         $attrName2 = new \ParticipantAttributeName();
         $attrName2->attribute_type = 'TB';
@@ -79,7 +58,7 @@ public function testUpdateEncryption()
 
         /** @var array<string, string> */
         $extraAttributes = [
-            'ea_' . $attribute_id => 'Some encrypted value',
+            'ea_' . $attrName->attribute_id => 'Some encrypted value',
             'ea_' . $attrName2->attribute_id => 'Some value'
         ];
 
@@ -112,7 +91,7 @@ public static function outputError($msg, $code = 0)
         $attrValue = \ParticipantAttribute::model()->findByAttributes(
             [
                 'participant_id' => $part->participant_id,
-                'attribute_id'   => $attribute_id
+                'attribute_id'   => $attrName->attribute_id
             ]
         );
 
@@ -131,6 +110,7 @@ public static function outputError($msg, $code = 0)
         // Equal, because it is NOT encrypted.
         $this->assertEquals('Some value', $attrValue2->value);
 
+        $this->assertTrue($attrName->delete());
         $this->assertTrue($attrName2->delete());
         $this->assertTrue($attrValue->delete());
         $this->assertTrue($attrValue2->delete());