From c2bc82ebfd54cebba03bd04dccaf5a8e317844ae Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 3 Jun 2013 16:15:08 +0200
Subject: [ticket/11579] Move simple tests into seperate files
PHPBB3-11579
---
tests/functions/validate_date_test.php | 66 ++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 tests/functions/validate_date_test.php
(limited to 'tests/functions/validate_date_test.php')
diff --git a/tests/functions/validate_date_test.php b/tests/functions/validate_date_test.php
new file mode 100644
index 0000000000..e7a279879c
--- /dev/null
+++ b/tests/functions/validate_date_test.php
@@ -0,0 +1,66 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
+require_once dirname(__FILE__) . '/validate_data_helper.php';
+
+class phpbb_functions_validate_date_test extends phpbb_test_case
+{
+ protected $helper;
+
+ protected function setUp()
+ {
+ parent::setUp();
+
+ $this->helper = new phpbb_functions_validate_data_helper($this);
+ }
+
+ 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(),
+ // 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'),
+ ));
+ }
+}
--
cgit v1.2.1
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_date_test.php | 90 ++++++++++++++++++++--------------
1 file changed, 53 insertions(+), 37 deletions(-)
(limited to 'tests/functions/validate_date_test.php')
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'),
+ ),
+ */
));
}
}
--
cgit v1.2.1