Skip to content

Commit

Permalink
NOBUG: Fix tests that were using the old forum_ratings table (moved t…
Browse files Browse the repository at this point in the history 
…o rating).
  • Loading branch information
@stronk7
stronk7 committed Apr 26, 2010
1 parent c8a9f06 commit 777f6eb
Showing 1 changed file with 20 additions and 16 deletions.
36 changes: 20 additions & 16 deletions backup/util/structure/simpletest/testbackupstructures.php
View file
Expand Up @@ -47,10 +47,10 @@ class backup_structure_test extends UnitTestCaseUsingDatabase {

protected $testtables = array(
'lib' => array(
'files'),
'files', 'rating'),
'mod/forum' => array(
'forum', 'forum_discussions', 'forum_posts',
'forum_ratings', 'forum_read'));
'forum_read'));

protected $forumid; // To store the inserted forum->id
protected $contextid; // Official contextid for these tests
Expand Down Expand Up @@ -127,10 +127,14 @@ private function fill_records() {
$DB->insert_record('files', $f1_post2);

// Create two ratings
$rating1 = (object)array('userid' => 104, 'post' => $p1id, 'rating' => 2);
$r1id = $DB->insert_record('forum_ratings', $rating1);
$rating2 = (object)array('userid' => 105, 'post' => $p1id, 'rating' => 3);
$r2id = $DB->insert_record('forum_ratings', $rating2);
$rating1 = (object)array(
'contextid' => $this->contextid, 'userid' => 104, 'itemid' => $p1id, 'rating' => 2,
'scaleid' => -1, 'timecreated' => time(), 'timemodified' => time());
$r1id = $DB->insert_record('rating', $rating1);
$rating2 = (object)array(
'contextid' => $this->contextid, 'userid' => 105, 'itemid' => $p1id, 'rating' => 3,
'scaleid' => -1, 'timecreated' => time(), 'timemodified' => time());
$r2id = $DB->insert_record('rating', $rating2);

// Create 1 reads
$read1 = (object)array('userid' => 102, 'forumid' => $this->forumid, 'discussionid' => $d2id, 'postid' => $p4id);
Expand Down Expand Up @@ -179,7 +183,7 @@ function test_backup_structure_construct() {
$ratings = new backup_nested_element('ratings');
$rating = new backup_nested_element('rating',
array('id'),
array('userid', 'post', 'time', 'post_rating')
array('userid', 'itemid', 'time', 'post_rating')
);
$reads = new backup_nested_element('readposts');
$read = new backup_nested_element('read',
Expand Down Expand Up @@ -251,8 +255,8 @@ function test_backup_structure_construct() {
);
$post->set_source_table('forum_posts', array('discussion' => '/forum/discussions/discussion/id'));
$rating->set_source_sql('SELECT *
FROM {forum_ratings}
WHERE post = ?',
FROM {rating}
WHERE itemid = ?',
array(backup::VAR_PARENTID)
);

Expand Down Expand Up @@ -287,7 +291,7 @@ function test_backup_structure_construct() {
$discussion->annotate_ids('user1', 'userid');
$post->annotate_ids('forum_post', 'id');
$rating->annotate_ids('user2', 'userid');
$rating->annotate_ids('forum_post', 'post');
$rating->annotate_ids('forum_post', 'itemid');

// Create the backup_ids_temp table
backup_controller_dbops::create_backup_ids_temp_table($backupid);
Expand Down Expand Up @@ -316,7 +320,7 @@ function test_backup_structure_construct() {
// Check various counters
$this->assertEqual($forum->get_counter(), $DB->count_records('forum'));
$this->assertEqual($discussion->get_counter(), $DB->count_records('forum_discussions'));
$this->assertEqual($rating->get_counter(), $DB->count_records('forum_ratings'));
$this->assertEqual($rating->get_counter(), $DB->count_records('rating'));
$this->assertEqual($read->get_counter(), $DB->count_records('forum_read'));
$this->assertEqual($inventeds->get_counter(), 2); // Array

Expand All @@ -333,7 +337,7 @@ function test_backup_structure_construct() {

// Check ratings information against DB
$ratings = $dom->getElementsByTagName('rating');
$this->assertEqual($ratings->length, $DB->count_records('forum_ratings'));
$this->assertEqual($ratings->length, $DB->count_records('rating'));
foreach ($ratings as $rating) {
$ratarr = array();
$ratarr['id'] = $rating->getAttribute('id');
Expand All @@ -342,9 +346,9 @@ function test_backup_structure_construct() {
$ratarr[$node->nodeName] = $node->nodeValue;
}
}
$this->assertEqual($ratarr['userid'], $DB->get_field('forum_ratings', 'userid', array('id' => $ratarr['id'])));
$this->assertEqual($ratarr['post'], $DB->get_field('forum_ratings', 'post', array('id' => $ratarr['id'])));
$this->assertEqual($ratarr['post_rating'], $DB->get_field('forum_ratings', 'rating', array('id' => $ratarr['id'])));
$this->assertEqual($ratarr['userid'], $DB->get_field('rating', 'userid', array('id' => $ratarr['id'])));
$this->assertEqual($ratarr['itemid'], $DB->get_field('rating', 'itemid', array('id' => $ratarr['id'])));
$this->assertEqual($ratarr['post_rating'], $DB->get_field('rating', 'rating', array('id' => $ratarr['id'])));
}

// Check forum has "blockeperiod" with value 0 (was declared by object instead of name)
Expand Down Expand Up @@ -407,7 +411,7 @@ function test_backup_structure_construct() {
// Count records in original tables
$c_postsid = $DB->count_records_sql('SELECT COUNT(DISTINCT id) FROM {forum_posts}');
$c_dissuserid = $DB->count_records_sql('SELECT COUNT(DISTINCT userid) FROM {forum_discussions}');
$c_ratuserid = $DB->count_records_sql('SELECT COUNT(DISTINCT userid) FROM {forum_ratings}');
$c_ratuserid = $DB->count_records_sql('SELECT COUNT(DISTINCT userid) FROM {rating}');
// Count records in backup_ids_table
$f_forumpost = $DB->count_records('backup_ids_temp', array('backupid' => $backupid, 'itemname' => 'forum_post'));
$f_user1 = $DB->count_records('backup_ids_temp', array('backupid' => $backupid, 'itemname' => 'user1'));
Expand Down

0 comments on commit 777f6eb

Please sign in to comment.