From efe122b03200155479920890defc2a3dc689bdd7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 23:40:30 -0500
Subject: [ticket/11162] This test really only works for bookmarks.

PHPBB3-11162
---
 .../fixtures/bookmarks_duplicates.xml              | 47 ++++++++++++++++++
 .../fixtures/duplicates.xml                        | 56 ----------------------
 .../fixtures/topics_watch_duplicates.xml           | 56 ++++++++++++++++++++++
 .../update_rows_avoiding_duplicates_test.php       |  6 +--
 4 files changed, 106 insertions(+), 59 deletions(-)
 create mode 100644 tests/functions_tricky_update/fixtures/bookmarks_duplicates.xml
 delete mode 100644 tests/functions_tricky_update/fixtures/duplicates.xml
 create mode 100644 tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml

(limited to 'tests')

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/duplicates.xml
deleted file mode 100644
index bc08016a8f..0000000000
--- a/tests/functions_tricky_update/fixtures/duplicates.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<dataset>
-	<table name="phpbb_topics_watch">
-		<column>user_id</column>
-		<column>topic_id</column>
-		<column>notify_status</column>
-
-		<!-- one entry for this topic -->
-		<row>
-			<value>1</value>
-			<value>1</value>
-			<value>1</value>
-		</row>
-
-		<!-- non-conflicting entries -->
-		<row>
-			<value>2</value>
-			<value>2</value>
-			<value>1</value>
-		</row>
-		<row>
-			<value>3</value>
-			<value>3</value>
-			<value>1</value>
-		</row>
-
-		<!-- conflicting entries -->
-		<row>
-			<value>1</value>
-			<value>4</value>
-			<value>1</value>
-		</row>
-		<row>
-			<value>1</value>
-			<value>5</value>
-			<value>1</value>
-		</row>
-
-		<!-- conflicting and non-conflicting entries -->
-		<row>
-			<value>1</value>
-			<value>6</value>
-			<value>1</value>
-		</row>
-		<row>
-			<value>1</value>
-			<value>7</value>
-			<value>1</value>
-		</row>
-		<row>
-			<value>2</value>
-			<value>6</value>
-			<value>1</value>
-		</row>
-	</table>
-</dataset>
diff --git a/tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml b/tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml
new file mode 100644
index 0000000000..bc08016a8f
--- /dev/null
+++ b/tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_topics_watch">
+		<column>user_id</column>
+		<column>topic_id</column>
+		<column>notify_status</column>
+
+		<!-- one entry for this topic -->
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+		</row>
+
+		<!-- non-conflicting entries -->
+		<row>
+			<value>2</value>
+			<value>2</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>3</value>
+			<value>1</value>
+		</row>
+
+		<!-- conflicting entries -->
+		<row>
+			<value>1</value>
+			<value>4</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>5</value>
+			<value>1</value>
+		</row>
+
+		<!-- conflicting and non-conflicting entries -->
+		<row>
+			<value>1</value>
+			<value>6</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>7</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>6</value>
+			<value>1</value>
+		</row>
+	</table>
+</dataset>
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');
-- 
cgit v1.2.1