diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-02-18 02:01:35 +0200 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-14 23:45:02 +0200 |
| commit | ce215658eb70a2dab7309c5f949ceb9b3e1c5a29 (patch) | |
| tree | 64bcbe05345cb059501b70acf711f004f7497814 /tests | |
| parent | f32cc3ae8fc3fbd28f4fe9e6b7e2a4eb27cfac03 (diff) | |
| download | forums-ce215658eb70a2dab7309c5f949ceb9b3e1c5a29.tar forums-ce215658eb70a2dab7309c5f949ceb9b3e1c5a29.tar.gz forums-ce215658eb70a2dab7309c5f949ceb9b3e1c5a29.tar.bz2 forums-ce215658eb70a2dab7309c5f949ceb9b3e1c5a29.tar.xz forums-ce215658eb70a2dab7309c5f949ceb9b3e1c5a29.zip | |
[feature/merging-style-components] Adjusting unit tests
Adjusting unit tests for new styles table structure
PHPBB3-10632
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dbal/fixtures/styles.xml | 24 | ||||
| -rw-r--r-- | 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>&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>&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>&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' => '© 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' => '© 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' => '© 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) |