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_match_test.php | 45 +++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 tests/functions/validate_match_test.php

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

diff --git a/tests/functions/validate_match_test.php b/tests/functions/validate_match_test.php
new file mode 100644
index 0000000000..5d44f1e00b
--- /dev/null
+++ b/tests/functions/validate_match_test.php
@@ -0,0 +1,45 @@
+<?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_match_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_match()
+	{
+		$this->helper->assert_validate_data(array(
+			'empty_opt'		=> array(),
+			'empty_empty_match'	=> array(),
+			'foobar'		=> array(),
+			'foobar_fail'		=> array('WRONG_DATA'),
+		),
+		array(
+			'empty_opt'		=> '',
+			'empty_empty_match'	=> '',
+			'foobar'		=> 'foobar',
+			'foobar_fail'		=> 'foobar123',
+		),
+		array(
+			'empty_opt'		=> array('match', true, '/[a-z]$/'),
+			'empty_empty_match'	=> array('match'),
+			'foobar'		=> array('match', false, '/[a-z]$/'),
+			'foobar_fail'		=> array('match', false, '/[a-z]$/'),
+		));
+	}
+}
-- 
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_match_test.php | 38 ++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

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

diff --git a/tests/functions/validate_match_test.php b/tests/functions/validate_match_test.php
index 5d44f1e00b..73a363e003 100644
--- a/tests/functions/validate_match_test.php
+++ b/tests/functions/validate_match_test.php
@@ -23,23 +23,27 @@ class phpbb_functions_validate_match_test extends phpbb_test_case
 
 	public function test_validate_match()
 	{
-		$this->helper->assert_validate_data(array(
-			'empty_opt'		=> array(),
-			'empty_empty_match'	=> array(),
-			'foobar'		=> array(),
-			'foobar_fail'		=> array('WRONG_DATA'),
-		),
-		array(
-			'empty_opt'		=> '',
-			'empty_empty_match'	=> '',
-			'foobar'		=> 'foobar',
-			'foobar_fail'		=> 'foobar123',
-		),
-		array(
-			'empty_opt'		=> array('match', true, '/[a-z]$/'),
-			'empty_empty_match'	=> array('match'),
-			'foobar'		=> array('match', false, '/[a-z]$/'),
-			'foobar_fail'		=> array('match', false, '/[a-z]$/'),
+		$this->helper->assert_valid_data(array(
+			'empty_opt' => array(
+				array(),
+				'',
+				array('match', true, '/[a-z]$/'),
+			),
+			'empty_empty_match' => array(
+				array(),
+				'',
+				array('match'),
+			),
+			'foobar' => array(
+				array(),
+				'foobar',
+				array('match', false, '/[a-z]$/'),
+			),
+			'foobar_fail' => array(
+				array('WRONG_DATA'),
+				'foobar123',
+				array('match', false, '/[a-z]$/'),
+			),
 		));
 	}
 }
-- 
cgit v1.2.1