Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/core#980 [dbunit] remove dependency on discontinued dbunit #14321

Merged
merged 1 commit into from
May 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 10 additions & 50 deletions tests/fixtures/contacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ civicrm_contact:
id: 3
contact_type: Individual
contact_sub_type:
do_not_email:
do_not_phone:
do_not_mail:
do_not_sms:
do_not_trade:
do_not_email: 0
do_not_phone: 0
do_not_mail: 0
do_not_sms: 0
do_not_trade: 0
is_opt_out: 0
legal_identifier:
external_identifier:
sort_name: Site Administrator
display_name: Site Administrator
nick_name:
Expand All @@ -24,38 +23,18 @@ civicrm_contact:
first_name: Site
middle_name:
last_name: Administrator
prefix_id:
suffix_id:
email_greeting_id:
email_greeting_custom:
postal_greeting_id:
postal_greeting_custom:
addressee_id:
addressee_custom:
job_title:
gender_id:
birth_date:
is_deceased:
deceased_date:
household_name:
primary_contact_id:
organization_name:
sic_code:
user_unique_id:
employer_id:

-
id: 17
contact_type: Individual
contact_sub_type:
do_not_email:
do_not_phone:
do_not_mail:
do_not_sms:
do_not_trade:
do_not_email: 0
do_not_phone: 0
do_not_mail: 0
do_not_sms: 0
do_not_trade: 0
is_opt_out: 0
legal_identifier:
external_identifier:
sort_name:
display_name: Test Contact
nick_name:
Expand All @@ -69,22 +48,3 @@ civicrm_contact:
first_name: Test
middle_name:
last_name: Contact
prefix_id:
suffix_id:
email_greeting_id:
email_greeting_custom:
postal_greeting_id:
postal_greeting_custom:
addressee_id:
addressee_custom:
job_title:
gender_id:
birth_date:
is_deceased: 0
deceased_date:
household_name:
primary_contact_id:
organization_name:
sic_code:
user_unique_id:
employer_id:
29 changes: 23 additions & 6 deletions tests/phpunit/CiviTest/CiviUnitTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/

use Civi\Payment\System;
use Symfony\Component\Yaml\Yaml;

/**
* Include class definitions
Expand Down Expand Up @@ -371,17 +372,33 @@ protected function setUp() {
public function loadAllFixtures() {
$fixturesDir = __DIR__ . '/../../fixtures';

$this->getConnection()->getConnection()->query("SET FOREIGN_KEY_CHECKS = 0;");
CRM_Core_DAO::executeQuery("SET FOREIGN_KEY_CHECKS = 0;");

$yamlFiles = glob($fixturesDir . '/*.yaml');
foreach ($yamlFiles as $yamlFixture) {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$dataset = new PHPUnit_Extensions_Database_DataSet_YamlDataSet($yamlFixture);
$this->_tablesToTruncate = array_merge($this->_tablesToTruncate, $dataset->getTableNames());
$op->execute($this->_dbconn, $dataset);
$yaml = Yaml::parse(file_get_contents($yamlFixture));
foreach ($yaml as $tableName => $vars) {
if ($tableName === 'civicrm_contact') {
CRM_Core_DAO::executeQuery('DELETE c FROM civicrm_contact c LEFT JOIN civicrm_domain d ON d.contact_id = c.id WHERE d.id IS NULL');
}
else {
CRM_Core_DAO::executeQuery("TRUNCATE $tableName");
}
foreach ($vars as $entity) {
$keys = $values = [];
foreach ($entity as $key => $value) {
$keys[] = $key;
$values[] = is_numeric($value) ? $value : "'{$value}'";
}
CRM_Core_DAO::executeQuery("
INSERT INTO $tableName (" . implode(',', $keys) . ') VALUES(' . implode(',', $values) . ')'
);
}

}
}

$this->getConnection()->getConnection()->query("SET FOREIGN_KEY_CHECKS = 1;");
CRM_Core_DAO::executeQuery("SET FOREIGN_KEY_CHECKS = 1;");
}

/**
Expand Down