cvs: pear /Validate package.xml /Validate/Validate NL.php /Validate/tests validate_NL.php
| From: | Dave Mertens | Date: | Tue, 07 Oct 2003 20:16:25 +0000 |
| Subject: | cvs: pear /Validate package.xml /Validate/Validate NL.php /Validate/tests validate_NL.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-13469@lists.php.net to get a copy of this message | ||
zyprexia Tue Oct 7 16:16:25 2003 EDT
Added files:
/pear/Validate/tests validate_NL.php
Modified files:
/pear/Validate package.xml
/pear/Validate/Validate NL.php
Log:
- fixed stupid type in phonenumber check
- added unit tests
- added test script to package
Index: pear/Validate/package.xml
diff -u pear/Validate/package.xml:1.12 pear/Validate/package.xml:1.13
--- pear/Validate/package.xml:1.12 Mon Oct 6 17:26:24 2003
+++ pear/Validate/package.xml Tue Oct 7 16:16:23 2003
@@ -65,6 +65,7 @@
<file>number.php</file>
<file>date.php</file>
<file>credit_card.php</file>
+ <file>validate_NL.php</file>
</dir>
<dir name="docs" role="doc">
<file>sample_multiple.php</file>
Index: pear/Validate/Validate/NL.php
diff -u pear/Validate/Validate/NL.php:1.2 pear/Validate/Validate/NL.php:1.3
--- pear/Validate/Validate/NL.php:1.2 Tue Oct 7 15:47:45 2003
+++ pear/Validate/Validate/NL.php Tue Oct 7 16:16:24 2003
@@ -16,7 +16,7 @@
// | Authors: Dave Mertens <zyprexia@php.net> |
// +----------------------------------------------------------------------+
//
-// $Id: NL.php,v 1.2 2003/10/07 19:47:45 zyprexia Exp $
+// $Id: NL.php,v 1.3 2003/10/07 20:16:24 zyprexia Exp $
//
// Specific validation methods for data used in NL
//
@@ -58,7 +58,7 @@
$number = substr($number, strlen($number)-9);
//we only use the last 9 digits (so no troubles with international numbers)
- if (strlen($number) >= 9)) {
+ if (strlen($number) >= 9) {
switch ($type)
{
case VALIDATE_NL_PHONENUMBER_TYPE_ANY:
Index: pear/Validate/tests/validate_NL.php
+++ pear/Validate/tests/validate_NL.php
<?php
require_once( "Validate/NL.php" );
//Phase 1: Testing zipcode (Validate_NL::postcode)
echo "Testing postcode check\n";
echo validateResult("Correct postcode '1234 AB'",
Validate_NL::postcode("1234 AB"), true);
echo ValidateResult("Correct postcode '1234 ab'",
Validate_NL::postcode("1234 ab"), true);
echo ValidateResult("Correct postcode '1234AB'",
Validate_NL::postcode("1234AB"), true);
echo ValidateResult("Correct postcode '1234ab'",
Validate_NL::postcode("1234ab"), true);
echo ValidateResult("Correct postcode '1234aB'",
Validate_NL::postcode("1234aB"), true);
echo ValidateResult("Incorrect postcode '123456'",
Validate_NL::postcode("123456"), false);
echo ValidateResult("Incorrect postcode '1234'",
Validate_NL::postcode("1234"), false);
echo ValidateResult("Incorrect postcode 'AB1234'",
Validate_NL::postcode("AB1234"), false);
echo ValidateResult("Incorrect postcode 'Ab12 34'",
Validate_NL::postcode("aB12 34"), false);
//Phase 2: Testing phonenumbers
echo "\nTesting phonenumber check (Validate_NL::phonenumber\n";
echo ValidateResult("Correct mobile phonenumber (0612345678)",
Validate_NL::phonenumber("0612345678", VALIDATE_NL_PHONENUMBER_TYPE_MOBILE), true);
echo ValidateResult("Correct mobile phonenumber (0031612345678)",
Validate_NL::phonenumber("0031612345678", VALIDATE_NL_PHONENUMBER_TYPE_MOBILE), true);
echo ValidateResult("Correct mobile phonenumber (+31612345678)",
Validate_NL::phonenumber("+31612345678", VALIDATE_NL_PHONENUMBER_TYPE_MOBILE), true);
echo ValidateResult("Correct normal phonenumber (0101234567)",
Validate_NL::phonenumber("0101234567", VALIDATE_NL_PHONENUMBER_TYPE_NORMAL), true);
echo ValidateResult("Correct normal phonenumber (+31101234567)",
Validate_NL::phonenumber("+31101234567", VALIDATE_NL_PHONENUMBER_TYPE_NORMAL), true);
echo ValidateResult("Correct normal phonenumber (0031101234567)",
Validate_NL::phonenumber("0031101234567", VALIDATE_NL_PHONENUMBER_TYPE_NORMAL), true);
echo ValidateResult("Correct (any) phonenumber (0612345678)",
Validate_NL::phonenumber("0612345678", VALIDATE_NL_PHONENUMBER_TYPE_ANY), true);
echo ValidateResult("Correct (any) phonenumber (+31101234567)",
Validate_NL::phonenumber("+31101234567", VALIDATE_NL_PHONENUMBER_TYPE_ANY), true);
echo ValidateResult("Incorrect mobile phonenumber (+31101234567)",
Validate_NL::phonenumber("+31101234567", VALIDATE_NL_PHONENUMBER_TYPE_MOBILE), false);
echo ValidateResult("Incorrect normal phonenumber (0031612345678)",
Validate_NL::phonenumber("0031612345678", VALIDATE_NL_PHONENUMBER_TYPE_NORMAL), false);
echo ValidateResult("Incorrect phonenumber (0101234A67)",
Validate_NL::phonenumber("0101234A67", VALIDATE_NL_PHONENUMBER_TYPE_ANY), false);
//Phase 3: testing ssn (SoFi nummer)
echo "\nTesting SSN number check (Validate_NL::SSN)\n";
echo ValidateResult("Incorrect SSN (12345678)", Validate_NL::SSN("12345678"),
false);
echo ValidateResult("Incorrect SSN (1234567890)",
Validate_NL::SSN("1234567890"), false);
echo ValidateResult("Correct SSN (123456789)", Validate_NL::SSN("123456789"),
true);
function validateResult($description, $result, $compareString)
{
if ((string)$result == (string)$compareString) {
$ret = "$description - PASSED\n";
} else {
$ret = "$description - FAILED\nResult was $result, "
."expecting $compareString\n";
}
return $ret;
}
?>