From ce215658eb70a2dab7309c5f949ceb9b3e1c5a29 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 18 Feb 2012 02:01:35 +0200
Subject: [PATCH] [feature/merging-style-components] Adjusting unit tests

Adjusting unit tests for new styles table structure

PHPBB3-10632
---
 tests/dbal/fixtures/styles.xml  | 24 ++++++++++++++++--------
 tests/dbal/order_lower_test.php | 18 ++++++++++++------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/tests/dbal/fixtures/styles.xml b/tests/dbal/fixtures/styles.xml
index 36fc22a48f..dcbe39d3b0 100644
--- a/tests/dbal/fixtures/styles.xml
+++ b/tests/dbal/fixtures/styles.xml
@@ -5,31 +5,39 @@
 		<column>style_name</column>
 		<column>style_copyright</column>
 		<column>style_active</column>
-		<column>template_id</column>
-		<column>theme_id</column>
+		<column>style_path</column>
+		<column>bbcode_bitfield</column>
+		<column>style_parent_id</column>
+		<column>style_parent_tree</column>
 		<row>
 			<value>1</value>
 			<value>prosilver</value>
 			<value>&amp;copy; phpBB Group</value>
 			<value>1</value>
-			<value>1</value>
-			<value>1</value>
+			<value>prosilver</value>
+			<value>kNg=</value>
+			<value>0</value>
+			<value></value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>prosilver2</value>
 			<value>&amp;copy; phpBB Group</value>
 			<value>0</value>
-			<value>2</value>
-			<value>2</value>
+			<value>prosilver2</value>
+			<value>kNg=</value>
+			<value>0</value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>Prosilver1</value>
 			<value>&amp;copy; phpBB Group</value>
 			<value>0</value>
-			<value>3</value>
-			<value>3</value>
+			<value>prosilver1</value>
+			<value>kNg=</value>
+			<value>1</value>
+			<value>prosilver</value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php
index eaf5211508..e16c0c20ee 100644
--- a/tests/dbal/order_lower_test.php
+++ b/tests/dbal/order_lower_test.php
@@ -33,24 +33,30 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case
 					'style_name'		=> 'prosilver',
 					'style_copyright'	=> '&copy; phpBB Group',
 					'style_active'		=> 1,
-					'template_id'		=> 1,
-					'theme_id'			=> 1,
+					'style_path'		=> 'prosilver',
+					'bbcode_bitfield'	=> 'kNg=',
+					'style_parent_id'	=> 0,
+					'style_parent_tree'	=> '',
 				),
 				array(
 					'style_id' 			=> 3,
 					'style_name'		=> 'Prosilver1',
 					'style_copyright'	=> '&copy; phpBB Group',
 					'style_active'		=> 0,
-					'template_id'		=> 3,
-					'theme_id'			=> 3,
+					'style_path'		=> 'prosilver1',
+					'bbcode_bitfield'	=> 'kNg=',
+					'style_parent_id'	=> 1,
+					'style_parent_tree'	=> 'prosilver',
 				),
 				array(
 					'style_id' 			=> 2,
 					'style_name'		=> 'prosilver2',
 					'style_copyright'	=> '&copy; phpBB Group',
 					'style_active'		=> 0,
-					'template_id'		=> 2,
-					'theme_id'			=> 2,
+					'style_path'		=> 'prosilver2',
+					'bbcode_bitfield'	=> 'kNg=',
+					'style_parent_id'	=> 0,
+					'style_parent_tree'	=> '',
 				)
 			), 
 			$db->sql_fetchrowset($result)