Commit graph

557 commits

Author SHA1 Message Date
Fyorl
1bb64ab23e [ticket/10941] Changed assertTrue to assertEquals
PHPBB3-10941
2012-07-09 14:08:19 +01:00
Fyorl
19405a7f47 [ticket/10941] Now actually checks for the value of errors.
Uses phpbb_mock_lang to return the key used when setting errors to
allow that key to be checked for during tests rather than just checking
if any error was set.

PHPBB3-10941
2012-07-09 14:08:19 +01:00
Fyorl
943af957e6 [ticket/10941] Re-arranged dataProvidor methods to be near their callers
PHPBB3-10941
2012-07-09 14:08:19 +01:00
Fyorl
59a7b10f14 [ticket/10941] Added a comment explaining the incomplete test
PHPBB3-10941
2012-07-09 14:08:18 +01:00
Fyorl
f2bbbdaafa [ticket/10941] tearDown() now uses explicit file list
Instances of $it also renamed for clarity.

PHPBB3-10941
2012-07-09 14:08:18 +01:00
Fyorl
82ca2c8b08 [ticket/10941] Minor adjustments as per PR comments
Added some comments clarifying globals and lowercased fixture filenames

PHPBB3-10941
2012-07-09 14:08:18 +01:00
Fyorl
1233544c4a [ticket/10941] Marked broken test as incomplete
PHPBB3-10941
2012-07-09 14:08:18 +01:00
Fyorl
5693036bf9 [ticket/10941] Added functional tests for the fileupload class
NOTE: test_form_upload() is broken. Uploading files via Symfony fails to
retain $_FILES['fileupload']['type'] even if it set explicitely. This appears
to be a bug in Symfony. Since the current version of filespec::is_image()
relies on the mimetype, these tests will __fail__. filespec::is_image() has
been fixed in https://github.com/phpbb/phpbb3/pull/833 however.

PHPBB3-10941
2012-07-09 14:08:17 +01:00
Fyorl
dfef80f267 [ticket/10941] Unit tests for fileupload class added
PHPBB3-10941
2012-07-08 23:59:11 +01:00
Fyorl
fe4056c599 [ticket/10941] Finished filespec tests
PHPBB3-10941
2012-07-08 23:59:11 +01:00
Fyorl
d6bd8928b5 [ticket/10941] Minor adjustments as per PR comments
Switched from dirname(__FILE__) to just __DIR__.
Removed static definition from data provider methods.

PHPBB3-10941
2012-07-08 23:59:11 +01:00
Fyorl
33a13002af [ticket/10941] Unit tests for filespec class
PHPBB3-10941
2012-07-08 23:59:11 +01:00
Nils Adermann
9f0259c473 Merge remote-tracking branch 'github-bantu/ticket/10973' into develop
* github-bantu/ticket/10973:
  [ticket/10973] Drop all require_once for mocks. Use autoloading.
  [ticket/10973] Add autoloader for autoloading phpbb_mock_ in tests.

Conflicts:
	tests/bbcode/url_bbcode_test.php
	tests/text_processing/censor_text_test.php
2012-07-08 23:12:22 +02:00
Nils Adermann
527f02bb4b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php

Conflicts:
	tests/bbcode/url_bbcode_test.php
2012-07-08 23:10:42 +02:00
Nils Adermann
088dbc0b54 Merge remote-tracking branch 'github-bantu/ticket/10974' into develop-olympus
* github-bantu/ticket/10974:
  [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
2012-07-08 23:03:58 +02:00
Andreas Fischer
d3bbde69c4 [ticket/10973] Drop all require_once for mocks. Use autoloading.
PHPBB3-10973
2012-07-08 22:57:23 +02:00
Andreas Fischer
cde5411e8a [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
PHPBB3-10974
2012-07-08 22:46:14 +02:00
Andreas Fischer
932428086e [ticket/10973] Add autoloader for autoloading phpbb_mock_ in tests.
PHPBB3-10973
2012-07-08 22:33:27 +02:00
Oleg Pudeyev
b6a364b706 Merge PR #856 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:30 -04:00
Oleg Pudeyev
a7da376004 Merge PR #856 branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:28 -04:00
Andreas Fischer
81d5327e44 [ticket/10937] Comment removal functions: Restore backward compatibility
PHPBB3-10937
2012-07-03 01:02:42 +02:00
Oleg Pudeyev
d8946e74de Merge PR #778 branch 'cyberalien/ticket/10800' into develop
* cyberalien/ticket/10800:
  [ticket/10800] Changing html to js for includejs tests
  [ticket/10800] Changing template paths in tests
2012-06-11 20:02:35 -04:00
Nils Adermann
f22c99ffdb Merge remote-tracking branch 'github-p/ticket/10882' into develop
* github-p/ticket/10882:
  [ticket/10882] Fix test name - oops.
  [ticket/10882] Add a test for including a nonexistent file.
  [ticket/10882] Add test for an ENDIF without IF.
  [ticket/10882] Add test for an invalid template tag.
2012-06-12 00:57:34 +02:00
Oleg Pudeyev
241033ae88 [ticket/10882] Fix test name - oops.
PHPBB3-10882
2012-06-11 18:50:05 -04:00
Nils Adermann
4ebcb5319e Merge remote-tracking branch 'github-p/ticket/10828' into develop-olympus
* github-p/ticket/10828:
  [ticket/10828] Connect to postgres database by default.
2012-06-12 00:44:59 +02:00
Nils Adermann
a0771b8814 Merge pull request #814 from p/ticket/10828
[ticket/10828] Connect to postgres database by default.
2012-06-11 15:42:26 -07:00
Nils Adermann
3852f78bb4 Merge pull request #796 from imkingdavid/ticket/10837
[ticket/10837] Removed tearDownAfterClass() from extension_controller_test.php
2012-06-11 14:30:33 -07:00
Andreas Fischer
72212077eb [ticket/10931] Also test get_bytes() and get_string() with false.
PHPBB3-10931
2012-06-11 15:46:03 +02:00
Andreas Fischer
cbff02db4f [ticket/10931] Make to_numeric function globally available.
PHPBB3-10931
2012-06-11 15:46:03 +02:00
Andreas Fischer
09fb9a9efe [ticket/10931] Make sure get_bytes() always returns either an int or a float.
PHPBB3-10931
2012-06-11 15:15:08 +02:00
Andreas Fischer
44287e57bf [ticket/10931] Use strict assertSame() instead of assertEquals().
PHPBB3-10931
2012-06-11 14:47:29 +02:00
Andreas Fischer
3872abd824 [ticket/10931] Also test for negative values.
PHPBB3-10931
2012-06-11 14:47:29 +02:00
Andreas Fischer
fb279c9677 [ticket/10931] Also test lower case units in test_get_bytes().
PHPBB3-10931
2012-06-11 14:31:09 +02:00
Andreas Fischer
80dfa53ee3 [ticket/10931] Correctly use GNU GPL version 2.
PHPBB3-10931
2012-06-11 14:24:30 +02:00
Andreas Fischer
5086366662 [ticket/10931] Make it clear that we are mocking the ini_get() function.
PHPBB3-10931
2012-06-11 14:23:09 +02:00
Andreas Fischer
afd6f86892 [ticket/10931] Unit tests for phpbb_php_ini class.
PHPBB3-10931
2012-06-11 13:22:11 +02:00
Nils Adermann
4a5004781a Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10162] Increase maximum length of email address TLD from 6 to 63.
  [ticket/10162] Add test cases for top level domain names longer than 6 chars.
2012-05-31 15:30:05 +02:00
Andreas Fischer
de4dff8bb0 [ticket/10162] Add test cases for top level domain names longer than 6 chars.
PHPBB3-10162
2012-05-30 21:11:17 +02:00
Nils Adermann
221154a435 Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.
2012-05-22 19:42:25 +02:00
Andreas Fischer
bad91d8e74 [ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.
PHPBB3-10907
2012-05-22 18:46:29 +02:00
Nils Adermann
6956a6eb00 Merge branch 'develop-olympus' into develop
By David King
via David King (1) and Nils Adermann (1)
* develop-olympus:
  [task/functional] Use proper format for @var doc blocks.
  [task/functional] Fix $lang_path variable
  [task/functional] Change property visibility, remove globals, reword comment
  [task/functional] Make sure missing language values are handled properly
  [task/functional] Increase code coverage for functional tests

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-05-22 18:11:08 +02:00
Nils Adermann
5d5049710c Merge remote-tracking branch 'github-imkingdavid/task/functional' into develop-olympus
By David King
via David King
* github-imkingdavid/task/functional:
  [task/functional] Use proper format for @var doc blocks.
  [task/functional] Fix $lang_path variable
  [task/functional] Change property visibility, remove globals, reword comment
  [task/functional] Make sure missing language values are handled properly
  [task/functional] Increase code coverage for functional tests
2012-05-22 18:10:21 +02:00
David King
09d15db1fa [task/functional] Use proper format for @var doc blocks.
PHPBB3-10758
2012-05-22 12:06:27 -03:00
David King
819accedc8 [task/functional] Fix $lang_path variable
PHPBB3-10758
2012-05-22 10:52:49 -04:00
David King
b96c050695 [task/functional] Change property visibility, remove globals, reword comment
PHPBB3-10758
2012-05-22 10:46:36 -04:00
Oleg Pudeyev
3c5eca4aed Merge PR #810 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10890] Fix test_sql_fetchrow_returns_false_when_empty() on MS and ORA.
2012-05-21 23:02:58 -04:00
Oleg Pudeyev
9fa7ab62ad [ticket/10828] Connect to postgres database by default.
When not connecting to a specific database, connect to postgres
database which specifically exists as a default database to
connect to.

PHPBB3-10828
2012-05-21 23:02:12 -04:00
Andreas Fischer
7ec6254078 [ticket/10890] Fix test_sql_fetchrow_returns_false_when_empty() on MS and ORA.
Fix phpbb_dbal_select_test::test_sql_fetchrow_returns_false_when_empty() on
MSSQL and Oracle by specifying an existing table in the query.

PHPBB3-10890
2012-05-22 01:25:19 +02:00
Andreas Fischer
2715fc5bdf Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10891] Allow specifying test_config.php path via environment.
2012-05-13 20:09:00 +02:00
Andreas Fischer
92d17cbff3 Merge remote-tracking branch 'p/ticket/10891' into develop-olympus
* p/ticket/10891:
  [ticket/10891] Allow specifying test_config.php path via environment.

Conflicts:
	tests/RUNNING_TESTS.txt
2012-05-13 20:08:49 +02:00