moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-19057 minor coding style improvements

Browse source
This commit is contained in:
Petr Skoda 2010-09-06 17:28:02 +00:00
parent 8efd88650e
commit 76f8ddc053
1 changed files with 40 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

74
lib/dml/simpletest/testdml.php
View file

@ -766,8 +766,6 @@ class dml_test extends UnitTestCase {
$rs = $DB->get_recordset_list($tablename, 'course', array(3, 2)); $rs = $DB->get_recordset_list($tablename, 'course', array(3, 2));
$this->assertTrue($rs);
$counter = 0; $counter = 0;
foreach ($rs as $record) { foreach ($rs as $record) {
$counter++; $counter++;
@ -848,7 +846,7 @@ class dml_test extends UnitTestCase {
$inskey6 = $DB->insert_record($tablename, array('course' => 1)); $inskey6 = $DB->insert_record($tablename, array('course' => 1));
$inskey7 = $DB->insert_record($tablename, array('course' => 0)); $inskey7 = $DB->insert_record($tablename, array('course' => 0));
$this->assertTrue($rs = $DB->get_recordset_sql("SELECT * FROM {{$tablename}} WHERE course = ?", array(3))); $rs = $DB->get_recordset_sql("SELECT * FROM {{$tablename}} WHERE course = ?", array(3));
$counter = 0; $counter = 0;
foreach ($rs as $record) { foreach ($rs as $record) {
$counter++; $counter++;
@ -917,8 +915,8 @@ class dml_test extends UnitTestCase {
// All records, but get only one field // All records, but get only one field
$records = $DB->get_records($tablename, null, '', 'id'); $records = $DB->get_records($tablename, null, '', 'id');
$this->assertTrue(empty($records[1]->course)); $this->assertFalse(isset($records[1]->course));
$this->assertFalse(empty($records[1]->id)); $this->assertTrue(isset($records[1]->id));
$this->assertEqual(4, count($records)); $this->assertEqual(4, count($records));
// Booleans into params // Booleans into params
@ -948,7 +946,8 @@ class dml_test extends UnitTestCase {
$DB->insert_record($tablename, array('course' => 5)); $DB->insert_record($tablename, array('course' => 5));
$DB->insert_record($tablename, array('course' => 2)); $DB->insert_record($tablename, array('course' => 2));
$this->assertTrue($records = $DB->get_records_list($tablename, 'course', array(3, 2))); $records = $DB->get_records_list($tablename, 'course', array(3, 2));
$this->assertTrue(is_array($records));
$this->assertEqual(3, count($records)); $this->assertEqual(3, count($records));
$this->assertEqual(1, reset($records)->id); $this->assertEqual(1, reset($records)->id);
$this->assertEqual(2, next($records)->id); $this->assertEqual(2, next($records)->id);
@ -960,29 +959,6 @@ class dml_test extends UnitTestCase {
// note: delegate limits testing to test_get_records_sql() // note: delegate limits testing to test_get_records_sql()
} }
public function test_get_record_select() {
$DB = $this->tdb;
$dbman = $DB->get_manager();
$table = $this->get_test_table();
$tablename = $table->getName();
$table->add_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
$table->add_field('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0');
$table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
$dbman->create_table($table);
$this->tables[$tablename] = $table;
$DB->insert_record($tablename, array('course' => 3));
$DB->insert_record($tablename, array('course' => 2));
$this->assertTrue($record = $DB->get_record_select($tablename, "id = ?", array(2)));
$this->assertEqual(2, $record->course);
// note: delegates limit testing to test_get_records_sql()
}
public function test_get_records_sql() { public function test_get_records_sql() {
global $CFG; global $CFG;
$DB = $this->tdb; $DB = $this->tdb;
@ -1005,7 +981,7 @@ class dml_test extends UnitTestCase {
$inskey6 = $DB->insert_record($tablename, array('course' => 1)); $inskey6 = $DB->insert_record($tablename, array('course' => 1));
$inskey7 = $DB->insert_record($tablename, array('course' => 0)); $inskey7 = $DB->insert_record($tablename, array('course' => 0));
$this->assertTrue($records = $DB->get_records_sql("SELECT * FROM {{$tablename}} WHERE course = ?", array(3))); $records = $DB->get_records_sql("SELECT * FROM {{$tablename}} WHERE course = ?", array(3));
$this->assertEqual(2, count($records)); $this->assertEqual(2, count($records));
$this->assertEqual($inskey1, reset($records)->id); $this->assertEqual($inskey1, reset($records)->id);
$this->assertEqual($inskey4, next($records)->id); $this->assertEqual($inskey4, next($records)->id);
@ -1072,7 +1048,8 @@ class dml_test extends UnitTestCase {
$DB->insert_record($tablename, array('course' => 5)); $DB->insert_record($tablename, array('course' => 5));
$DB->insert_record($tablename, array('course' => 2)); $DB->insert_record($tablename, array('course' => 2));
$this->assertTrue($records = $DB->get_records_menu($tablename, array('course' => 3))); $records = $DB->get_records_menu($tablename, array('course' => 3));
$this->assertTrue(is_array($records));
$this->assertEqual(2, count($records)); $this->assertEqual(2, count($records));
$this->assertFalse(empty($records[1])); $this->assertFalse(empty($records[1]));
$this->assertFalse(empty($records[2])); $this->assertFalse(empty($records[2]));
@ -1100,7 +1077,8 @@ class dml_test extends UnitTestCase {
$DB->insert_record($tablename, array('course' => 3)); $DB->insert_record($tablename, array('course' => 3));
$DB->insert_record($tablename, array('course' => 5)); $DB->insert_record($tablename, array('course' => 5));
$this->assertTrue($records = $DB->get_records_select_menu($tablename, "course > ?", array(2))); $records = $DB->get_records_select_menu($tablename, "course > ?", array(2));
$this->assertTrue(is_array($records));
$this->assertEqual(3, count($records)); $this->assertEqual(3, count($records));
$this->assertFalse(empty($records[1])); $this->assertFalse(empty($records[1]));
@ -1132,7 +1110,8 @@ class dml_test extends UnitTestCase {
$DB->insert_record($tablename, array('course' => 3)); $DB->insert_record($tablename, array('course' => 3));
$DB->insert_record($tablename, array('course' => 5)); $DB->insert_record($tablename, array('course' => 5));
$this->assertTrue($records = $DB->get_records_sql_menu("SELECT * FROM {{$tablename}} WHERE course > ?", array(2))); $records = $DB->get_records_sql_menu("SELECT * FROM {{$tablename}} WHERE course > ?", array(2));
$this->assertTrue(is_array($records));
$this->assertEqual(3, count($records)); $this->assertEqual(3, count($records));
$this->assertFalse(empty($records[1])); $this->assertFalse(empty($records[1]));
@ -1162,9 +1141,36 @@ class dml_test extends UnitTestCase {
$DB->insert_record($tablename, array('course' => 3)); $DB->insert_record($tablename, array('course' => 3));
$DB->insert_record($tablename, array('course' => 2)); $DB->insert_record($tablename, array('course' => 2));
$this->assertTrue($record = $DB->get_record($tablename, array('id' => 2))); $record = $DB->get_record($tablename, array('id' => 2));
$this->assertTrue($record instanceof stdClass);
$this->assertEqual(2, $record->course); $this->assertEqual(2, $record->course);
$this->assertEqual(2, $record->id);
}
public function test_get_record_select() {
$DB = $this->tdb;
$dbman = $DB->get_manager();
$table = $this->get_test_table();
$tablename = $table->getName();
$table->add_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
$table->add_field('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0');
$table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
$dbman->create_table($table);
$this->tables[$tablename] = $table;
$DB->insert_record($tablename, array('course' => 3));
$DB->insert_record($tablename, array('course' => 2));
$record = $DB->get_record_select($tablename, "id = ?", array(2));
$this->assertTrue($record instanceof stdClass);
$this->assertEqual(2, $record->course);
// note: delegates limit testing to test_get_records_sql()
} }
public function test_get_record_sql() { public function test_get_record_sql() {