forums - The forums.mageia.org Website

about summary refs log tree commit diff stats

path: root/tests/test_framework/phpbb_functional_test_case.php

diff options

These method names are more straightforward than the previous ones. PHPBB3-11610

Diffstat (limited to 'tests')

download
author	Senky <jakubsenko@gmail.com>	2012-05-17 20:01:44 +0200
committer	Oleg Pudeyev <oleg@bsdpower.com>	2012-12-05 12:07:37 -0500
commit	dd6983b14bba4326d824b3abb130eafc5e8f666c (patch)
tree	292b2ad0b855ccd981afe209720103fb38eda5b3 /tests/test_framework/phpbb_functional_test_case.php
parent	af064cdaad357f705fc7c80f4d018d57cffa8d33 (diff)

-rw-r--r--

tests/passwords/manager_test.php

1 files changed, 11 insertions, 11 deletions

this sould reduce load and be faster. Also freeresult functions added PHPBB3-10841

Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')

0 files changed, 0 insertions, 0 deletions

d'>+ $this->assertEquals(false, $hash = $this->manager->hash($password, $type));

return;

}

$time = microtime(true);

@@ -87,7 +87,7 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase

// Limit each test to 1 second

while ((microtime(true) - $time) < 1)

{

- $hash = $this->manager->hash_password($password, $type);

+ $hash = $this->manager->hash($password, $type);

preg_match('#^\$([a-zA-Z0-9\\\]*?)\$#', $hash, $match);

$this->assertEquals($prefix, $match[1]);

$this->assertEquals($length, strlen($hash));

@@ -126,10 +126,10 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase

// Limit each test to 1 second

while ((microtime(true) - $time) < 1)

{

- $hash = $this->manager->hash_password($password, $hash_type);

- $this->assertEquals(true, $this->manager->check_hash($password, $hash));

+ $hash = $this->manager->hash($password, $hash_type);

+ $this->assertEquals(true, $this->manager->check($password, $hash));

$password .= $this->pw_characters[mt_rand(0, 66)];

- $this->assertEquals(false, $this->manager->check_hash($password, $hash));

+ $this->assertEquals(false, $this->manager->check($password, $hash));

}

// Check if convert_flag is correctly set

@@ -154,7 +154,7 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase

public function test_check_hash_exceptions($password, $hash, $expected)

{

- $this->assertEquals($expected, $this->manager->check_hash($password, $hash));

+ $this->assertEquals($expected, $this->manager->check($password, $hash));

}

public function test_hash_password_length()

@@ -167,7 +167,7 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase

public function test_hash_password_8bit_bcrypt()

{

- $this->assertEquals(false, $this->manager->hash_password('foobar𝄞', 'passwords.driver.bcrypt'));

+ $this->assertEquals(false, $this->manager->hash('foobar𝄞', 'passwords.driver.bcrypt'));

}

public function test_combined_hash_data()

@@ -232,11 +232,11 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase

// Limit each test to 1 second

while ((microtime(true) - $time) < 1)

{

- $hash = $this->manager->hash_password($password, $first_type);

- $combined_hash = $this->manager->hash_password($hash, $second_type);

- $this->assertEquals($expected, $this->manager->check_hash($password, $combined_hash));

+ $hash = $this->manager->hash($password, $first_type);

+ $combined_hash = $this->manager->hash($hash, $second_type);

+ $this->assertEquals($expected, $this->manager->check($password, $combined_hash));

$password .= $this->pw_characters[mt_rand(0, 66)];

- $this->assertEquals(false, $this->manager->check_hash($password, $combined_hash));

+ $this->assertEquals(false, $this->manager->check($password, $combined_hash));

// If we are expecting the check to fail then there is

// no need to run this more than once


context:
space:
mode: