diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-04 23:40:30 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-04 23:40:30 -0500 |
| commit | efe122b03200155479920890defc2a3dc689bdd7 (patch) | |
| tree | 8b3284dffabfb98672d10b20826925c0687bc903 | |
| parent | 58951ef1057bd5f0d1098f9536eb8a84c532833c (diff) | |
| download | forums-efe122b03200155479920890defc2a3dc689bdd7.tar forums-efe122b03200155479920890defc2a3dc689bdd7.tar.gz forums-efe122b03200155479920890defc2a3dc689bdd7.tar.bz2 forums-efe122b03200155479920890defc2a3dc689bdd7.tar.xz forums-efe122b03200155479920890defc2a3dc689bdd7.zip | |
[ticket/11162] This test really only works for bookmarks.
PHPBB3-11162
| -rw-r--r-- | tests/functions_tricky_update/fixtures/bookmarks_duplicates.xml | 47 | ||||
| -rw-r--r-- | tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml (renamed from tests/functions_tricky_update/fixtures/duplicates.xml) | 0 | ||||
| -rw-r--r-- | tests/functions_tricky_update/update_rows_avoiding_duplicates_test.php | 6 |
3 files changed, 50 insertions, 3 deletions
diff --git a/tests/functions_tricky_update/fixtures/bookmarks_duplicates.xml b/tests/functions_tricky_update/fixtures/bookmarks_duplicates.xml new file mode 100644 index 0000000000..d49f76b073 --- /dev/null +++ b/tests/functions_tricky_update/fixtures/bookmarks_duplicates.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> + <table name="phpbb_bookmarks"> + <column>user_id</column> + <column>topic_id</column> + + <!-- one entry for this topic --> + <row> + <value>1</value> + <value>1</value> + </row> + + <!-- non-conflicting entries --> + <row> + <value>2</value> + <value>2</value> + </row> + <row> + <value>3</value> + <value>3</value> + </row> + + <!-- conflicting entries --> + <row> + <value>1</value> + <value>4</value> + </row> + <row> + <value>1</value> + <value>5</value> + </row> + + <!-- conflicting and non-conflicting entries --> + <row> + <value>1</value> + <value>6</value> + </row> + <row> + <value>1</value> + <value>7</value> + </row> + <row> + <value>2</value> + <value>6</value> + </row> + </table> +</dataset> diff --git a/tests/functions_tricky_update/fixtures/duplicates.xml b/tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml index bc08016a8f..bc08016a8f 100644 --- a/tests/functions_tricky_update/fixtures/duplicates.xml +++ b/tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml diff --git a/tests/functions_tricky_update/update_rows_avoiding_duplicates_test.php b/tests/functions_tricky_update/update_rows_avoiding_duplicates_test.php index 4849605e9c..6142997408 100644 --- a/tests/functions_tricky_update/update_rows_avoiding_duplicates_test.php +++ b/tests/functions_tricky_update/update_rows_avoiding_duplicates_test.php @@ -13,7 +13,7 @@ class phpbb_update_rows_avoiding_duplicates_test extends phpbb_database_test_cas { public function getDataSet() { - return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/duplicates.xml'); + return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/bookmarks_duplicates.xml'); } public static function fixture_data() @@ -57,10 +57,10 @@ class phpbb_update_rows_avoiding_duplicates_test extends phpbb_database_test_cas { $db = $this->new_dbal(); - phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $from, $to); + phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $from, $to); $sql = 'SELECT COUNT(*) AS remaining_rows - FROM ' . TOPICS_WATCH_TABLE . ' + FROM ' . BOOKMARKS_TABLE . ' WHERE topic_id = ' . (int) $to; $result = $db->sql_query($sql); $result_count = $db->sql_fetchfield('remaining_rows'); |