more module updates

This commit is contained in:
Bachir Soussi Chiadmi
2015-04-20 18:07:22 +02:00
parent 134c8b8338
commit 55b23a2cec
21 changed files with 370 additions and 708 deletions

View File

@@ -10,6 +10,9 @@
*/
class UUIDTestCase extends DrupalWebTestCase {
/**
* {@inheritdoc}
*/
function setUp() {
parent::setUp(func_get_args());
}
@@ -27,6 +30,9 @@ class UUIDTestCase extends DrupalWebTestCase {
*/
class UUIDAPITestCase extends UUIDTestCase {
/**
* {@inheritdoc}
*/
public static function getInfo() {
return array(
'name' => 'UUID API',
@@ -35,10 +41,16 @@ class UUIDAPITestCase extends UUIDTestCase {
);
}
/**
* {@inheritdoc}
*/
function setUp() {
parent::setUp('uuid');
}
/**
* Tests uuid function calls.
*/
function testAPIFunctions() {
// This is a valid UUID, we know that.
$valid_uuid = '0ab26e6b-f074-4e44-9da6-1205fa0e9761';
@@ -62,6 +74,9 @@ class UUIDAPITestCase extends UUIDTestCase {
*/
class UUIDEntityTestCase extends UUIDTestCase {
/**
* {@inheritdoc}
*/
public static function getInfo() {
return array(
'name' => 'Entity API functions',
@@ -70,6 +85,9 @@ class UUIDEntityTestCase extends UUIDTestCase {
);
}
/**
* {@inheritdoc}
*/
function setUp() {
parent::setUp('uuid');
}
@@ -101,6 +119,9 @@ class UUIDEntityTestCase extends UUIDTestCase {
*/
class UUIDUserTestCase extends UUIDTestCase {
/**
* {@inheritdoc}
*/
public static function getInfo() {
return array(
'name' => 'User implementation',
@@ -109,6 +130,9 @@ class UUIDUserTestCase extends UUIDTestCase {
);
}
/**
* {@inheritdoc}
*/
function setUp() {
// Some tests depends on the optional Entity API module.
if (module_exists('entity')) {
@@ -161,6 +185,9 @@ class UUIDUserTestCase extends UUIDTestCase {
*/
class UUIDNodeTestCase extends UUIDTestCase {
/**
* {@inheritdoc}
*/
public static function getInfo() {
return array(
'name' => 'Node implementation',
@@ -169,6 +196,9 @@ class UUIDNodeTestCase extends UUIDTestCase {
);
}
/**
* {@inheritdoc}
*/
function setUp() {
// Some tests depends on the optional Entity API module.
if (module_exists('entity')) {
@@ -181,6 +211,9 @@ class UUIDNodeTestCase extends UUIDTestCase {
/**
* Tests CRUD on nodes with UUID functions.
*
* @todo
* Break out into multiple test methods to loosen coupling between tests.
*/
function testNodeCRUD() {
// Create some entities that we will work with.
@@ -192,12 +225,16 @@ class UUIDNodeTestCase extends UUIDTestCase {
// Test node update, without creating new revision.
$node_test = clone $node;
$node_test->title = 'new title';
$node_test->title = 'original title';
$node_test->revision = FALSE;
node_save($node_test);
$node_test = node_load($node->nid, FALSE, TRUE);
$this->assertEqual($node_test->uuid, $node->uuid, 'Node UUID was intact after update, when not creating new revision.');
$this->assertEqual($node_test->vuuid, $node->vuuid, 'Node revision UUID was intact after updating, when not creating new revision.');
// Save the original revision IDs that we will test with later.
$vid_old = $node_test->vid;
$vuuid_old = $node_test->vuuid;
$uuid_old = $node_test->uuid;
// Test node update, with new revision.
$node_test = clone $node;
@@ -210,10 +247,28 @@ class UUIDNodeTestCase extends UUIDTestCase {
$this->assertUUID($node_test->vuuid, 'The new node revision UUID was valid.');
// Test entity_uuid_load().
// Save some variables that we will test against.
$nid_test = $node_test->nid;
$vid_test = $node_test->vid;
$uid_test = $user->uuid;
$uuid_test = $node_test->uuid;
$vuuid_test = $node_test->vuuid;
$nodes = entity_uuid_load('node', array($node->uuid), array(), TRUE);
$node_test = reset($nodes);
$this->assertEqual($node_test->nid, $node->nid, 'Node was correctly loaded with UUID.');
$this->assertEqual($node_test->uid, $user->uuid, "Node property 'uid' was transformed to UUID when loaded with UUID.");
$this->assertEqual($node_test->nid, $nid_test, 'Node ID was correct when loading with UUID.');
$this->assertEqual($node_test->vid, $vid_test, 'Node revision ID was correct when loading with UUID.');
$this->assertEqual($node_test->uid, $uid_test, "Node author ID was transformed to UUID when loaded with UUID.");
$this->assertEqual($node_test->uuid, $uuid_test, 'Node UUID was correct when loading with UUID.');
$this->assertEqual($node_test->vuuid, $vuuid_test, 'Node revision UUID was correct when loading with UUID.');
// Test entity_uuid_load() with conditions.
// Load the previous revision UUID that we saved earlier.
$nodes = entity_uuid_load('node', array($uuid_test), array('vuuid' => $vuuid_old));
$node_test = reset($nodes);
$this->assertTrue((($node_test->uuid == $uuid_test) && ($node_test->nid && $node->nid)), 'The correct entity was loaded when loading a universal entity with a revision UUID condition.');
$this->assertEqual($node_test->vuuid, $vuuid_old, 'Correct revision UUID was loaded when loading a universal entity with a revision UUID condition.');
$this->assertEqual($node_test->vid, $vid_old, 'Correct revision ID was loaded when loading a universal entity with a revision UUID condition.');
$this->assertEqual($node_test->title, 'original title', 'Correct title was loaded when loading a universal entity with a revision UUID condition.');
// The following tests depends on the optional Entity API module.
if (module_exists('entity')) {
@@ -248,6 +303,72 @@ class UUIDNodeTestCase extends UUIDTestCase {
$this->assertUUID($node_test->vuuid, 'New node revision UUID was valid.');
$this->assertEqual($node_test->uid, $node->uid, "Node property 'uid' was intact after saving with UUID, when creating new revision.");
// Test the same thing again, but now triggering a new revision from a
// remote environment.
// TODO: Move this test to the uuid_services module.
$nodes = entity_uuid_load('node', array($node->uuid), array(), TRUE);
$node_test = reset($nodes);
// Store the current local revision ID to test with later.
$vid_old1 = $node_test->vid;
$vuuid_old1 = $node_test->vuuid;
// Simulate this node coming from a remote environment by generating
// IDs that won't match. Only the UUID match at this point.
$node_test->uuid_services = TRUE;
$nid_remote = rand();
$vid_remote = rand();
$vuuid_test = uuid_generate();
$node_test->nid = $nid_test;
$node_test->vid = $vid_test;
$node_test->vuuid = $vuuid_test;
$node_test->revision = TRUE;
entity_uuid_save('node', $node_test);
$node_test = node_load($node->nid, FALSE, TRUE);
$this->assertNotEqual($node_test->vid, $vid_old1, 'A new revision was created, when trying to create new revision with new revision UUID from remote site');
$this->assertEqual($node_test->vuuid, $vuuid_test, 'The revison UUID was preserved after saving with UUID, when trying to create new revision with new revision UUID from remote site.');
// Test the same thing again from a remote environment, but now with the
// same vuuid as once previosuly. This should not trigger a new revision.
// This covers the case of "dupe deployments" where a client might push a
// node several times.
// TODO: Move this test to the uuid_services module.
$nodes = entity_uuid_load('node', array($node->uuid), array(), TRUE);
$node_test = reset($nodes);
// Store the current local revision ID to test with later.
$vid_old2 = $node_test->vid;
// Simulate this node coming from a remote environment by generating
// IDs that won't match.
$node_test->uuid_services = TRUE;
$node_test->nid = $nid_test;
$node_test->vid = $vid_test;
$node_test->vuuid = $vuuid_test;
$node_test->revision = TRUE;
entity_uuid_save('node', $node_test);
$node_test = node_load($node->nid, FALSE, TRUE);
$this->assertEqual($node_test->vid, $vid_old2, 'A new revision was not created, when trying to create new revision with existing revision UUID from remote site.');
$this->assertEqual($node_test->vuuid, $vuuid_test, 'The revison UUID was preserved after saving with UUID, when trying to create new revision with existing revision UUID from remote site.');
// Test the same this again, but now with an old revision.
$nodes = entity_uuid_load('node', array($uuid_old), array('vuuid' => $vuuid_old), TRUE);
$node_test = reset($nodes);
// Simulate this node coming from a remote environment by generating
// IDs that won't match.
$node_test->uuid_services = TRUE;
$node_test->nid = rand();
$node_test->vid = rand();
$node_test->revision = TRUE;
$node_test->title = 'newest title';
entity_uuid_save('node', $node_test);
$node_test = node_load($node->nid, $vid_old, TRUE);
$this->assertEqual($node_test->title, 'newest title', 'The revision was updated, when updating old revision with existing revision UUID from remote site.');
$this->assertEqual($node_test->vuuid, $vuuid_old, 'The revison UUID was preserved after saving with UUID, when updating old revision with existing revision UUID from remote site.');
// Setting the node options variable should also trigger a new revision.
$nodes = entity_uuid_load('node', array($node->uuid), array(), TRUE);
$node_test = reset($nodes);
variable_set('node_options_' . $node_test->type, array('revision'));
entity_uuid_save('node', $node_test);
$this->assertNotEqual($node_test->vuuid, $node->vuuid, 'A new node revison ID was generated after saving with UUID, when relying on the node options variable.');
// Test entity_uuid_delete() for nodes.
entity_uuid_delete('node', $node->uuid);
$node_test = node_load($node->nid);
@@ -264,6 +385,9 @@ class UUIDNodeTestCase extends UUIDTestCase {
*/
class UUIDCommentTestCase extends CommentHelperCase {
/**
* {@inheritdoc}
*/
public static function getInfo() {
return array(
'name' => 'Comment implementation',
@@ -339,6 +463,9 @@ class UUIDCommentTestCase extends CommentHelperCase {
*/
class UUIDTaxonomyTestCase extends TaxonomyWebTestCase {
/**
* {@inheritdoc}
*/
public static function getInfo() {
return array(
'name' => 'Taxonomy implementation',
@@ -348,6 +475,8 @@ class UUIDTaxonomyTestCase extends TaxonomyWebTestCase {
}
/**
* {@inheritdoc}
*
* A lot of code here is taken from TaxonomyTermTestCase::setUp().
*/
function setUp() {
@@ -420,6 +549,9 @@ class UUIDTaxonomyTestCase extends TaxonomyWebTestCase {
*/
class UUIDSyncTestCase extends UUIDTestCase {
/**
* {@inheritdoc}
*/
public static function getInfo() {
return array(
'name' => 'UUID sync',
@@ -435,17 +567,12 @@ class UUIDSyncTestCase extends UUIDTestCase {
* There are something weird around this assertion.
*/
function assertTableColumn($table, $column, $message) {
$result = db_query("SHOW COLUMNS FROM {$table}");
$exists = FALSE;
foreach ($result as $record) {
if ($record->field == $column) {
$exists = TRUE;
break;
}
}
$this->assertTrue($exists, $message);
$this->assertTrue(db_field_exists($table, $column), $message);
}
/**
* Tests creating UUIDs for entities that don't have them.
*/
function testSync() {
// These entities will not have UUID from the start, since the UUID module
// isn't installed yet.
@@ -481,210 +608,3 @@ class UUIDSyncTestCase extends UUIDTestCase {
$this->assertUUID($user_test->uuid, 'User UUID was generated when clicking the sync button.');
}
}
class UUIDExportEntitiesWithDeploy extends DrupalWebTestCase {
public static function getInfo() {
return array(
'name' => 'Export UUID entities',
'description' => 'Test exporting UUID entities with Deploy and Features.',
'group' => 'UUID',
);
}
function setUp() {
parent::setUp('taxonomy', 'uuid', 'entity', 'features', 'deploy', 'deploy_example');
}
function testExport() {
$test_user = $this->drupalCreateUser();
$test_node = $this->drupalCreateNode(array(
'uid' => $test_user->uid,
));
deploy_manager_add_to_plan('deploy_example_plan', 'node', $test_node);
// TODO: Test the actual insert.
$this->assertTrue(TRUE, 'Added a node with a user dependency to be exported as a Feature module.');
// Login and recreate the example feature. The feature isn't installed. But
// Features can still export the code, and we can test it.
$web_user = $this->drupalCreateUser(array('administer features'));
$this->drupalLogin($web_user);
$code = $this->drupalPost('admin/structure/features/uuid_default_entities_example/recreate', array(), t('Download feature'));
$this->assertTrue($code, 'Feature module was exported.');
// Ensure that we find what we expect in the exported code.
$node_test1 = preg_match('/' . $test_node->title . '/', $code);
$node_test2 = preg_match("/'uri' => 'node\/" . $test_node->uuid . "'/", $code);
$this->assertTrue($node_test1, 'Node title was found in the expoted code.');
$this->assertTrue($node_test2, 'Node URI was found in the expoted code.');
$user_test1 = preg_match('/' . $test_user->name . '/', $code);
$user_test2 = preg_match("/'uri' => 'user\/" . $test_user->uuid . "'/", $code);
$this->assertTrue($user_test1, 'User was found in the expoted code.');
$this->assertTrue($user_test2, 'User URI was found in the expoted code.');
}
}
/**
* Tests for the UUID synchronization.
*/
class UUIDImportEntitiesTestCase extends UUIDTestCase {
/**
* Representation of the UUIDs that is exported in our example feature, that
* we use for testing.
*/
public $term1_uuid = 'bcb92ce8-2236-e264-65c8-0c163ae716d1';
public $term2_uuid = '4293a15c-531a-6164-7d1b-668ed019a6bd';
public $term3_uuid = 'af738a46-f278-cf84-d94d-9e03879fd71e';
public $node1_uuid = 'b0558664-c94b-3674-d9df-3e1696b2e471';
public $node2_uuid = '5e3d8bbe-a1f2-f2d4-fdc0-71e6c23aa837';
public $user1_uuid = '7cf875e6-dc15-4404-f190-5a7c3e91d14c';
/**
* Helper method to assert the uuid_entities component in any features.
*/
function assertFeatureState($feature, $state, $message = '') {
if (empty($message)) {
switch ($state) {
case FEATURES_DEFAULT:
$readable_state = 'default';
break;
case FEATURES_OVERRIDDEN:
$readable_state = 'overridden';
break;
default:
$readable_state = 'unknown';
break;
}
$message = format_string('%component in %feature had state: %state', array('%component' => 'uuid_entities', '%feature' => $feature, '%state' => $readable_state));
}
// Ensure that the features we used is in default state.
$states = features_get_component_states(array($feature), TRUE, TRUE);
if (!$this->assertEqual($states[$feature]['uuid_entities'], $state, $message)) {
debug(format_string('Enabling functionality to show diff output for debug purposes.'));
$success = module_enable(array('diff'));
if ($success) {
// Make sure we run on cold caches.
drupal_flush_all_caches();
drupal_static_reset();
$user = $this->drupalCreateUser(array('administer features'));
$this->drupalLogin($user);
$this->drupalGet('admin/structure/features/' . $feature . '/diff');
}
else {
debug(format_string('Download !module to see diff output for debug purposes.', array('!module' => 'diff.module')));
}
}
}
function getEntityByUuid($entity_type, $uuid) {
$ids = entity_get_id_by_uuid($entity_type, array($uuid));
$entities = entity_load($entity_type, $ids, NULL, TRUE);
return reset($entities);
}
function enableFeature($feature) {
$success = module_enable(array($feature), TRUE);
$this->assertTrue($success, t('Enabled modules: %modules', array('%modules' => implode(', ', array($feature)))));
// Make sure we run on cold caches.
drupal_flush_all_caches();
drupal_static_reset();
}
function revertFeature($feature) {
features_revert(array($feature => array('uuid_entities')));
$this->assertTrue(TRUE, format_string('Reverted feature: %feature', array('%feature' => $feature)));
}
function testImport() {
$term1 = $this->getEntityByUuid('taxonomy_term', $this->term1_uuid);
$term2 = $this->getEntityByUuid('taxonomy_term', $this->term2_uuid);
$term3 = $this->getEntityByUuid('taxonomy_term', $this->term3_uuid);
$node1 = $this->getEntityByUuid('node', $this->node1_uuid);
$node2 = $this->getEntityByUuid('node', $this->node2_uuid);
$user1 = $this->getEntityByUuid('user', $this->user1_uuid);
// Ensure that we don't have our entities yet.
$this->assertTrue(empty($term1), 'Term 1 has not been created yet.');
$this->assertTrue(empty($term2), 'Term 2 has not been created yet.');
$this->assertTrue(empty($term3), 'Term 3 has not been created yet.');
$this->assertTrue(empty($node1), 'Node 1 has not been created yet.');
$this->assertTrue(empty($node2), 'Node 2 has not been created yet.');
$this->assertTrue(empty($user1), 'User 1 has not been created yet.');
$this->enableFeature('uuid_default_entities_example');
$term1 = $this->getEntityByUuid('taxonomy_term', $this->term1_uuid);
$term2 = $this->getEntityByUuid('taxonomy_term', $this->term2_uuid);
$term3 = $this->getEntityByUuid('taxonomy_term', $this->term3_uuid);
$node1 = $this->getEntityByUuid('node', $this->node1_uuid);
$node2 = $this->getEntityByUuid('node', $this->node2_uuid);
$user1 = $this->getEntityByUuid('user', $this->user1_uuid);
// Ensure that our entities was created.
$this->assertEqual($term1->uuid, $this->term1_uuid, 'Term 1 was created.');
$this->assertEqual($term2->uuid, $this->term2_uuid, 'Term 2 was created.');
$this->assertEqual($term3->uuid, $this->term3_uuid, 'Term 3 was created.');
$this->assertEqual($node1->uuid, $this->node1_uuid, 'Node 1 was created.');
$this->assertEqual($node2->uuid, $this->node2_uuid, 'Node 2 was created.');
$this->assertEqual($user1->uuid, $this->user1_uuid, 'User 1 was created.');
// Check the features state.
$this->assertFeatureState('uuid_default_entities_example', FEATURES_DEFAULT);
// New property.
$new = 'foo bar';
// Change a term.
$term1->name = $new;
$status = taxonomy_term_save($term1);
$this->assertEqual($status, SAVED_UPDATED, 'Updated term 1.');
// Change a node.
$node1->title = $new;
node_save($node1);
$this->assertEqual($node1->title, $new, 'Updated node 1.');
// Change a user.
$user1->name = $new;
$updated_user = user_save($user1);
$this->assertEqual($user1->name, $updated_user->name, 'Updated user 1.');
// Check the features state.
$this->assertFeatureState('uuid_default_entities_example', FEATURES_OVERRIDDEN);
// Revert the feature.
$this->revertFeature('uuid_default_entities_example');
// Check the features state.
$this->assertFeatureState('uuid_default_entities_example', FEATURES_DEFAULT);
}
}
class UUIDImportEntitiesWithDeploy extends UUIDImportEntitiesTestCase {
public static function getInfo() {
return array(
'name' => 'Import UUID entities, with Deploy',
'description' => 'Test importing UUID entities with Features and Deploy.',
'group' => 'UUID',
);
}
function setUp() {
parent::setUp('taxonomy', 'uuid', 'entity', 'features', 'deploy', 'deploy_example');
}
}
class UUIDImportEntitiesWithoutDeploy extends UUIDImportEntitiesTestCase {
public static function getInfo() {
return array(
'name' => 'Import UUID entities, without Deploy',
'description' => 'Test importing UUID entities with Features only.',
'group' => 'UUID',
);
}
function setUp() {
parent::setUp('taxonomy', 'uuid', 'entity', 'features');
}
}