Update hash tests for consistency in their titles and remove the skip…

…if sections (except for the mhash related tests)
php · Oct 3, 2018 · f73c010 · f73c010
1 parent bf34442
commit f73c010
Show file tree

Hide file tree

Showing 63 changed files with 67 additions and 198 deletions.
diff --git a/ext/hash/tests/adler32.phpt b/ext/hash/tests/adler32.phpt
@@ -1,7 +1,5 @@
 --TEST--
-ADLER32
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: ADLER32 algorithm
 --FILE--
 <?php
 echo hash('adler32', ''), "\n";

diff --git a/ext/hash/tests/bug52240.phpt b/ext/hash/tests/bug52240.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #52240 (hash_copy() does not copy the HMAC key, causes wrong results and PHP crashes)
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/bug64745.phpt b/ext/hash/tests/bug64745.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Bug #64745 hash_pbkdf2() truncates data when using default length and hex output
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Bug #64745 (hash_pbkdf2() truncates data when using default length and hex output)
 --FILE--
 <?php
 $hash = hash_pbkdf2('sha1', 'password', 'salt', 1, 0);

diff --git a/ext/hash/tests/bug70312.phpt b/ext/hash/tests/bug70312.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Bug #70312 HAVAL gives wrong hashes in specific cases
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Bug #70312 (HAVAL gives wrong hashes in specific cases)
 --FILE--
 <?php
 var_dump(hash('haval128,5', '1234567890123456789012345678901234567890123456789012345678901234'));
@@ -15,4 +13,4 @@ string(32) "f3f0d23819b87228b4b70ee350afaa9d"
 string(40) "aded6485e137f11d7292212ba3fa961714df0564"
 string(48) "e53da2b16269fe732e9a898a96707a9f28404d7333b02286"
 string(56) "c574fb307f0817b514b9bb2e7c4bfaffb7ad667aca3c8b523fefcf10"
-string(64) "fb73c19300b14d5cb393d929bf005e6c2d459a4c9c009e9813af1d2d3637ee8f"
+string(64) "fb73c19300b14d5cb393d929bf005e6c2d459a4c9c009e9813af1d2d3637ee8f"
diff --git a/ext/hash/tests/bug73127.phpt b/ext/hash/tests/bug73127.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #73127 (gost-crypto hash incorrect if input data contains long 0xFF sequence)
---SKIPIF--
-<?php if(!extension_loaded('hash')) die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/crc32.phpt b/ext/hash/tests/crc32.phpt
@@ -1,7 +1,5 @@
 --TEST--
-CRC32
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: CRC32 algorithm
 --FILE--
 <?php
 echo hash('crc32', ''), "\n";

diff --git a/ext/hash/tests/fnv132.phpt b/ext/hash/tests/fnv132.phpt
@@ -1,7 +1,5 @@
 --TEST--
-FNV
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: FNV132 algorithm
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/fnv164.phpt b/ext/hash/tests/fnv164.phpt
@@ -1,7 +1,5 @@
 --TEST--
-FNV
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: FNV164 algorithm
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/fnv1a32.phpt b/ext/hash/tests/fnv1a32.phpt
@@ -1,7 +1,5 @@
 --TEST--
-FNV
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: FNV1a32 algorithm
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/fnv1a64.phpt b/ext/hash/tests/fnv1a64.phpt
@@ -1,7 +1,5 @@
 --TEST--
-FNV
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: FNV1a64 algorithm
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/gost.phpt b/ext/hash/tests/gost.phpt
@@ -1,7 +1,5 @@
 --TEST--
-gost
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: gost algorithm
 --FILE--
 <?php
 echo hash('gost', ''), "\n";

diff --git a/ext/hash/tests/hash-clone.phpt b/ext/hash/tests/hash-clone.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hash_copy() via clone
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: hash_copy() via clone
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_algos.phpt b/ext/hash/tests/hash_algos.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_algos() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_algos() function : basic functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_copy_001.phpt b/ext/hash/tests/hash_copy_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hash_copy() basic tests
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: hash_copy() basic tests
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_copy_002.phpt b/ext/hash/tests/hash_copy_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hash_copy() errors
---SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+Hash: hash_copy() errors
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_equals.phpt b/ext/hash/tests/hash_equals.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hash_equals() function
---SKIPIF--
-<?php if(!extension_loaded('hash')) die('skip hash extension not loaded'); ?>
+Hash: hash_equals() test
 --FILE--
 <?php
 var_dump(hash_equals("same", "same"));

diff --git a/ext/hash/tests/hash_error.phpt b/ext/hash/tests/hash_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash() function : error conditions 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash() function : error conditions 
 --FILE--
 <?php
 
@@ -45,4 +43,4 @@ NULL
 
 Warning: hash(): Unknown hashing algorithm: foo in %s on line %d
 bool(false)
-===Done===
+===Done===
diff --git a/ext/hash/tests/hash_file_basic.phpt b/ext/hash/tests/hash_file_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_file() function : basic functionality 
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--

diff --git a/ext/hash/tests/hash_file_basic1.phpt b/ext/hash/tests/hash_file_basic1.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_file() function : basic functionality 
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : error conditions 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_file() function : error conditions 
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--

diff --git a/ext/hash/tests/hash_hkdf_basic.phpt b/ext/hash/tests/hash_hkdf_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: basic functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hkdf() function: basic functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hkdf_edges.phpt b/ext/hash/tests/hash_hkdf_edges.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: edge cases
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hkdf() function: edge cases
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hkdf_error.phpt b/ext/hash/tests/hash_hkdf_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: error conditions
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hkdf() function: error conditions
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hkdf_rfc5869.phpt b/ext/hash/tests/hash_hkdf_rfc5869.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hkdf() function: RFC 5869 test vectors
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hkdf() function: RFC 5869 test vectors
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hmac_algos.phpt b/ext/hash/tests/hash_hmac_algos.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac_algos() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hmac_algos() function : basic functionality 
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hmac_basic.phpt b/ext/hash/tests/hash_hmac_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_file() function : basic functionality 
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hmac_error.phpt b/ext/hash/tests/hash_hmac_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hmac() function : basic functionality 
 --FILE--
 <?php
 /*

diff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hmac_file() function : basic functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_hmac_file_error.phpt b/ext/hash/tests/hash_hmac_file_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_hmac_file() function : basic functionality 
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_hmac_file() function : basic functionality 
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_init_error.phpt b/ext/hash/tests/hash_init_error.phpt
@@ -1,9 +1,5 @@
 --TEST--
-hash_init() function - errors test
---SKIPIF--
-<?php
-if (!extension_loaded('hash')) die('skip hash extension not available');
-?>
+Hash: hash_init() function - errors test
 --FILE--
 <?php
 echo "*** Testing hash_init(): error conditions ***\n";

diff --git a/ext/hash/tests/hash_pbkdf2_basic.phpt b/ext/hash/tests/hash_pbkdf2_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_pbkdf2() function : basic functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: hash_pbkdf2() function : basic functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_pbkdf2_error.phpt b/ext/hash/tests/hash_pbkdf2_error.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test hash_pbkdf2() function : error functionality
---SKIPIF--
-<?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
+Hash: Test hash_pbkdf2() function : error functionality
 --FILE--
 <?php
 

diff --git a/ext/hash/tests/hash_update_file.phpt b/ext/hash/tests/hash_update_file.phpt
@@ -1,11 +1,7 @@
 --TEST--
-hash_update_file() function - basic test
+Hash: hash_update_file() test
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
---SKIPIF--
-<?php
-if (!extension_loaded('hash')) die('skip hash extension not available');
-?>
 --FILE--
 <?php
 $filePath = __DIR__ . DIRECTORY_SEPARATOR . 'hash_update_stream.txt';

diff --git a/ext/hash/tests/hash_update_stream.phpt b/ext/hash/tests/hash_update_stream.phpt
@@ -1,11 +1,7 @@
 --TEST--
-int hash_update_stream ( resource $context , resource $handle [, int $length = -1 ] );
+Hash: hash_update_stream() test
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
---SKIPIF--
-<?php
-if (!extension_loaded('hash')) die('skip hash extension not available');
-?>
 --FILE--
 <?php
 $fp = tmpfile();

diff --git a/ext/hash/tests/haval.phpt b/ext/hash/tests/haval.phpt
@@ -1,7 +1,5 @@
 --TEST--
-haval algorithm (multi-vector, multi-pass, multi-width)
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: haval algorithm (multi-vector, multi-pass, multi-width)
 --FILE--
 <?php
 echo "Empty String\n";

diff --git a/ext/hash/tests/hmac-md5.phpt b/ext/hash/tests/hmac-md5.phpt
@@ -1,7 +1,5 @@
 --TEST--
-hmac-md5 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: hmac-md5 algorithm
 --FILE--
 <?php
 /* Test Vectors from RFC 2104 */

diff --git a/ext/hash/tests/joaat.phpt b/ext/hash/tests/joaat.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Jenkins's one-at-a-time
---SKIPIF--
-<?php extension_loaded('hash') or die ('Skip - hash extension not available'); ?>
+Hash: Jenkins's one-at-a-time
 --FILE--
 <?php
 $tests = array(

diff --git a/ext/hash/tests/md2.phpt b/ext/hash/tests/md2.phpt
@@ -1,7 +1,5 @@
 --TEST--
-md2 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: md2 algorithm
 --FILE--
 <?php
 echo hash('md2', '') . "\n";

diff --git a/ext/hash/tests/md4.phpt b/ext/hash/tests/md4.phpt
@@ -1,7 +1,5 @@
 --TEST--
-md4 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: md4 algorithm
 --FILE--
 <?php
 /* RFC 1320 vectors */

diff --git a/ext/hash/tests/md5.phpt b/ext/hash/tests/md5.phpt
@@ -1,7 +1,5 @@
 --TEST--
-md5 algorithm
---SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+Hash: md5 algorithm
 --FILE--
 <?php
 echo hash('md5', '') . "\n";

diff --git a/ext/hash/tests/mhash_001.phpt b/ext/hash/tests/mhash_001.phpt
@@ -1,9 +1,7 @@
 --TEST--
-mhash() test
+MHash: mhash() test
 --SKIPIF--
-<?php
-	include "skip_mhash.inc";
-?>
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
 --FILE--
 <?php