From 11678678b810c26376728166cf334550cbc30124 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 3 Jun 2013 21:30:13 +0200
Subject: [ticket/11579] Rework calls to validate_data_helper

PHPBB3-11579
---
 tests/functions/validate_password_test.php | 39 ++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 13 deletions(-)

(limited to 'tests/functions/validate_password_test.php')

diff --git a/tests/functions/validate_password_test.php b/tests/functions/validate_password_test.php
index e8dc7e0dea..4639f6cc89 100644
--- a/tests/functions/validate_password_test.php
+++ b/tests/functions/validate_password_test.php
@@ -65,19 +65,32 @@ class phpbb_functions_validate_password_test extends phpbb_test_case
 		// Set complexity to mixed case letters, numbers and symbols
 		$config['pass_complex'] = $pass_complexity;
 
-		$this->helper->assert_validate_data($expected, array(
-			'empty'			=> '',
-			'foobar_any'		=> 'foobar',
-			'foobar_mixed'		=> 'FooBar',
-			'foobar_alpha'		=> 'F00bar',
-			'foobar_symbol'		=> 'fooBar123*',
-		),
-		array(
-			'empty'			=> array('password'),
-			'foobar_any'		=> array('password'),
-			'foobar_mixed'		=> array('password'),
-			'foobar_alpha'		=> array('password'),
-			'foobar_symbol'		=> array('password'),
+		$this->helper->assert_valid_data(array(
+			'empty'			=> array(
+				$expected['empty'],
+				'',
+				array('password'),
+			),
+			'foobar_any'		=> array(
+				$expected['foobar_any'],
+				'foobar',
+				array('password'),
+			),
+			'foobar_mixed'		=> array(
+				$expected['foobar_mixed'],
+				'FooBar',
+				array('password'),
+			),
+			'foobar_alpha'		=> array(
+				$expected['foobar_alpha'],
+				'F00bar',
+				array('password'),
+			),
+			'foobar_symbol'		=> array(
+				$expected['foobar_symbol'],
+				'fooBar123*',
+				array('password'),
+			),
 		));
 	}
 }
-- 
cgit v1.2.1