[ticket/11579] Rework calls to validate_data_helper

PHPBB3-11579

1 files changed, 53 insertions, 37 deletions

diff --git a/tests/functions/validate_date_test.php b/tests/functions/validate_date_test.php
index e7a279879c..1dcd1361a2 100644
--- a/tests/functions/validate_date_test.php
+++ b/tests/functions/validate_date_test.php
@@ -23,44 +23,60 @@ class phpbb_functions_validate_date_test extends phpbb_test_case
 
 	public function test_validate_date()
 	{
-		$this->helper->assert_validate_data(array(
-			'empty'			=> array('INVALID'),
-			'empty_opt'		=> array(),
-			'double_single'		=> array(),
-			'single_single'		=> array(),
-			'double_double'		=> array(),
+		$this->helper->assert_valid_data(array(
+			'empty' => array(
+				array('INVALID'),
+				'',
+				array('date'),
+			),
+			'empty_opt' => array(
+				array(),
+				'',
+				array('date', true),
+			),
+			'double_single' => array(
+				array(),
+				'17-06-1990',
+				array('date'),
+			),
+			'single_single' => array(
+				array(),
+				'05-05-2009',
+				array('date'),
+			),
+			'double_double' => array(
+				array(),
+				'17-12-1990',
+				array('date'),
+			),
+			'month_high' => array(
+				array('INVALID'),
+				'17-17-1990',
+				array('date'),
+			),
+			'month_low' => array(
+				array('INVALID'),
+				'01-00-1990',
+				array('date'),
+			),
+			'day_high' => array(
+				array('INVALID'),
+				'64-01-1990',
+				array('date'),
+			),
+			'day_low' => array(
+				array('INVALID'),
+				'00-12-1990',
+				array('date'),
+			),
 			// Currently fails
-			//'zero_year'		=> array(),
-			'month_high'		=> array('INVALID'),
-			'month_low'		=> array('INVALID'),
-			'day_high'		=> array('INVALID'),
-			'day_low'		=> array('INVALID'),
-		),
-		array(
-			'empty'			=> '',
-			'empty_opt'		=> '',
-			'double_single'		=> '17-06-1990',
-			'single_single'		=> '05-05-2009',
-			'double_double'		=> '17-12-1990',
-			// Currently fails
-			//'zero_year'		=> '01-01-0000',
-			'month_high'		=> '17-17-1990',
-			'month_low'		=> '01-00-1990',
-			'day_high'		=> '64-01-1990',
-			'day_low'		=> '00-12-1990',
-		),
-		array(
-			'empty'			=> array('date'),
-			'empty_opt'		=> array('date', true),
-			'double_single'		=> array('date'),
-			'single_single'		=> array('date'),
-			'double_double'		=> array('date'),
-			// Currently fails
-			//'zero_year'		=> array('date'),
-			'month_high'		=> array('date'),
-			'month_low'		=> array('date'),
-			'day_high'		=> array('date'),
-			'day_low'		=> array('date'),
+			/*
+			'zero_year' => array(
+				array(),
+				'01-01-0000',
+				array('date'),
+			),
+			*/
 		));
 	}
 }