Commit graph

94 commits

Author SHA1 Message Date
Aaron Schulz
fb8e4beca3 Merge "While testing, turn off DataBase::ignoreErrors." 2012-12-06 17:38:21 +00:00
daniel
abf22b914a While testing, turn off DataBase::ignoreErrors.
Database errors should cause an exception, not return false,
unless the test case, or the code under test, explicitely calls
ignoreErrors(true). The DB object should be reset to fail fast
and safe for every test.

Change-Id: Ifc2a720ec46a1843d9ffb1488c54743a0099ef9d
2012-12-05 17:13:21 +01:00
Antoine Musso
5b9f76aef7 test: detects parent setUp not being called
Our test classes often overload MediaWikiTestCase::setUp() but forget to
call their parent. This patch makes MediaWikiTestCase to flag whenever
its own setUp() is called and then simply assert it got called. Any
class failing the assertion is missing a call to its parent setup which
is easily fixed by adding: parent::setUp().

It would be nice to find a similar trick for tearDown().

Change-Id: Ia2afed6052eb3863d6c8e68c551cf03b33bb4be9
2012-12-05 16:44:41 +01:00
jeroendedauw
ba9a170df2 Added assertException method to MediaWikiTestCase
Change-Id: I3ce667b4405241c66c5a979863d1cea2cf39956b
2012-11-30 11:35:08 +01:00
Hashar
289c407957 Merge "Add MediaWikiTestCase::checkHasDiff3 and use it" 2012-11-23 10:27:47 +00:00
daniel
e2bb376dd7 Added profiling to test runner.
MediaWikiTestCase now calls wfProfileIn/wfProfileOut for each call
to a test function. This makes it easy to track down slow tests.

Change-Id: I5ff2fea957c082f41da37936fe44948ad006f573
2012-11-22 19:34:32 +01:00
umherirrender
9b3292e31a Add MediaWikiTestCase::checkHasDiff3 and use it
Some tests can only passed, when diff3 is enabled on the wiki, when not
the tests should marked as skipped. To avoid code duplicates inside
the test folder for the check, if diff3 is enabled, the new function
MediaWikiTestCase::checkHasDiff3 can be used.

Change-Id: Ie765da49a4a1358da78a3506e38772d61bcd010c
2012-11-22 17:45:50 +01:00
daniel
be39c351d4 Clean up database cloning for tests.
This change makes the operation for overlaying the wiki database
with a structurally equivalent test database statically accessible,
and adds a function to revert that operation.

This is a precondition to logging profiling info to the database
after the test run has finished.

Change-Id: I2e8335d50eefcc7a97c1cd122b509f0939eacc92
2012-11-16 19:48:33 +01:00
Nikerabbit
a9e9c0e3ff Merge "Stash global only once per test case." 2012-10-29 12:15:37 +00:00
daniel
7385890cfe Stash global only once per test case.
Make sure we only stash a given global only once per test case since we
do not want to override the original value.

This allows the same test to modify the same global multiple times,
while still preserving the original value to be restored after the
test case finished.

Change-Id: I9056d6d6879fb976a192960f661904287f9760a8
2012-10-29 11:07:06 +01:00
Timo Tijhof
a4aef7d495 Fix warnings and enforce conventions in ContentHandler tests.
Syntax:
* Call parent setUp from setUp.
* Set required globals for the test inside the test class instead
  of assuming the default settings.
* Data providers are called statically and outside setUp/tearDown
  ("public static function")
* Test function names should be prefixed with "test"
  ("testIsRedirect")
* Marked 2 functions as unused. JavascriptContentTest has 2 data
  providers for tests that don't exist in it (nor in TextContentText)
  but do exist in WikitextContentTest.

Style:
* Single quotes
* Remove odd comment "# =====" lines
* Consistent tree wrapping with arrays.
  array(
      array(
          .. ) );
  array(
      array(
          ..
      )
  );
  Some were closing on the previous line instead.
  Made it consistent now.
* Remove odd indentation to make nested arrays line up:
  array( 'foo' => array(  'bar' => true,
                          'baz' => array() ) )
  array( 'foo' => array(
      'bar' => true,
      'baz' => array()
  ) )

  We don't do this kind of indentation because it is fragile
  and becomes outdates when any of the earlier keys ("foo")
  change. Converted to a regular tree instead.

  Also triggered git warnings for mixing spaces with tabs, which
  is almost always an detector for this style.

* Not using @annotations in inline comments, reserved (and only
  parsed/meaningful) for block comments.

Follows-up 8b568be5e2

Change-Id: Ic55d539b9a58f448b550bcd98894d389764e0694
2012-10-25 22:37:32 +02:00
daniel
759518bdde Fixing dump tests for non-wikitext in NS_MAIN.
Change-Id: I7945a1b950d3b9b394a336813abc8cd1e288766f
2012-10-12 17:34:29 +02:00
daniel
4ec9459100 [Bug 40716] Fix SearchEngineTest etc with non-wikitext content.
Several core tests fail if there is non-wikitext content in the main namespace.
This change fixes SearchEngineTest and TitlePermissionTest for this case.
More fixes are to come.

Change-Id: I6a19b568c5700bc8584689de8f33e4b0b6ffc277
2012-10-12 13:09:08 +02:00
daniel
329d5b3516 Merge branch 'Wikidata' into master.
This introduces the ContentHandler facility into MediaWiki,
see docs/contenthandler.txt.

For convenient review, a squashed version is available at
https://gerrit.wikimedia.org/r/27191

The ContentHandler facility is a major building block of the Wikidata project.
It has been discussed repeatedly on wikitech-l.

Change-Id: I3804e2d5f6f59e6a39db80744bdf61bfe8c14f98
2012-10-09 11:34:24 +02:00
Timo Tijhof
d1c8bf85f8 Fix HtmlTest, XmlTest; Add setMwGlobals method to base TestCase.
The HTML and XML test now set the globals they depend on
(instead of relying on the default settings).

Tests for the "other" scenarios still exist, globals are
overridden inline. They are automatically restored after each
test## function by PHPUnit from MediaWikiTestCase::tearDown.

Also fixed 2 other problems with the test suite:

* HtmlTest::testDropDefaults forgot to pass
  $message to the assertion from the provider ($case[3]).

* The data provider for HtmlTest::testDropDefaults was calling
  Html::element directly (instead of calling it within the test)
  which is problematic because data providers are expected to be
  static. PHPUnit calls them outside the setUp/tearDown flow.
  (also fixed the function to be public static, as PHPUnit
  expects).

That last one was crucial to make the test still pass correctly.

Updated the expected strings to what they are with these
fixed non-leakage settings.

Took wgHtml5 without xmlform as default. And added tests
for variations where it made sense.

Change-Id: Iccf6ea81f4bc2639273ab2ad101c58788ee49d45
2012-10-09 00:26:52 +02:00
daniel
bb51a58e57 Cleanup of Wikidata branch.
This cleans up several issues raised in comments to I3b2dad3a,
mostly style and merge artifacts.

Change-Id: I99f5e300a671db1353db151cd187ffd2e4478d03
2012-10-08 17:34:47 +02:00
daniel
c546fae8ed merge latest master into Wikidata branch
Change-Id: Id4e0f40c03679c13d8934a6add99b5cd86d0437d
2012-10-08 13:58:54 +02:00
jeroendedauw
430b31415f Replace remaining Array occurences with array
Change-Id: Id7c2fdd6814a8239acbe050d857b56350e691a49
2012-10-05 16:11:54 +02:00
jeroendedauw
5356dbd180 Switch on expected value, since the actual one can obviously be wrong
This gets rid of confusing error messages pointing to the provided type being invalid

Change-Id: Id283ef6e8fa6c3f18bc9ef3b740e8ec4bd181e3a
2012-09-24 15:15:43 +02:00
daniel
b6b686c13b merged master
Change-Id: I0ef7c7f33a5dc5855f38b20c03ddc5306f38ec66
2012-09-19 12:34:10 +02:00
Daniel Kinzler
e1dc9e8723 Merge "Added MediaWikiTestCase::assertTypeOrValue to facilitate common type checks" 2012-09-14 10:08:44 +00:00
Siebrand Mazeland
59ec5a325c Move api/ApiTestUser.php to TestUser.php and make available in MediaWikiTestCase class.
* Renamed class ApiTestUser to TestUser.

Change-Id: I1c3c659c3ba5c54a314d879132f760008983372d
2012-09-13 18:40:23 +00:00
jeroendedauw
ad6ccbcaf3 Added MediaWikiTestCase::assertTypeOrValue to facilitate common type checks
Also added MediaWikiTestCase::assertType which accepts both internal types, classes and interfaces

Change-Id: I168ef17ad2da3b744a106742760ef34cc683bf69
2012-09-13 20:22:03 +02:00
daniel
b6fe213226 merge latest master.
some tests fail due to logical changes, will fix that in a follow-up

Change-Id: I8a5e4087ecf674fbcf6327c5d168cd401be12400
2012-09-05 17:50:13 +02:00
daniel
cc5cc79148 Restore (some) globals after each test
Change-Id: I5fbf777c2bd4b1f88ba76d5cc42ad6df2eee4a9c
2012-09-05 15:04:07 +02:00
Antoine Musso
19d5ab2e8a test: new assertHTMLEquals()
Very trivial helper to compare HTML content. The method just add a
newline after each closing angle and then call assertEquals().

Change-Id: I5e6daa916a4fb452824616fa3c8a87bdb8038e8c
2012-09-03 10:47:36 +02:00
daniel
9994968774 merged master
Change-Id: Ib2b879c4daa17401eeeb50767c0e5a54254855c3
2012-08-29 15:20:15 +02:00
Daniel Kinzler
392af46809 Revert "merged master"
This reverts commit 67bfdc7a68
2012-08-29 13:14:49 +00:00
daniel
67bfdc7a68 merged master
Change-Id: Ib2b879c4daa17401eeeb50767c0e5a54254855c3
2012-08-29 12:06:38 +02:00
daniel
96f7db3f7b Avoid deprecation warnings in test cases.
a) when testing deprecated functions, use $this->hideDeprecated() to
suppress warnings.

b) use doEditContent() instead of doEdit()

Change-Id: Ifa9e0ef373ed72ef7d4a3c2dd558483af4a3fd55
2012-08-28 16:00:39 +02:00
daniel
167bea7e7e Clean up transactions after test.
MediaWikiTestCase::teardown() will now rollback any transactions
left open by a test case. This is intended to make sure tests do
not provide "interesting" results casued by transaction state
leaking from other tests.

Change-Id: Ia225251efd5aafbaa6674e2732ab1ba7761bfadc
2012-08-27 14:38:25 +02:00
daniel
29719f846b merging latest master
Change-Id: I36b7f2f63ab8c08f8412d521dc68ea45c8b67711
2012-08-20 16:55:28 +02:00
Aaron Schulz
d996871d6b Merge "Added utility method taking an array of elements and wrapping each element in it's own array." 2012-08-14 03:25:13 +00:00
Aaron Schulz
b701eb0713 Merge "Move method to its using test class rather then having a public static thing in the base test class" 2012-08-13 20:14:19 +00:00
Aaron Schulz
c638ca1914 Merge "Fix for assertArrayEquals. Was throwing fatal for object elements" 2012-08-13 20:09:10 +00:00
jeroendedauw
93fe721105 Fix for assertArrayEquals. Was throwing fatal for object elements
Change-Id: I8fa45237e028a814e0895ac0f2b3723394b50d6b
2012-08-12 22:55:55 +02:00
jeroendedauw
8caca131e4 Move method to its using test class rather then having a public static thing in the base test class
Change-Id: Id82225d0fb65dcd30b5724ee4f2d7838dfcb5ea6
2012-08-12 21:47:06 +02:00
jeroendedauw
10f8b5f340 Added utility method taking an array of elements and wrapping each element in it's own array.
Useful for data providers that only return a single argument.

Change-Id: I220948865e3de395363bf8858098e61de3c8d35b
2012-08-12 21:37:56 +02:00
jeroendedauw
974f4f8f37 Added missing @since tags and fixed style
Change-Id: I8941345be8f754bda40f4c36cf2082ca3d408c50
2012-08-12 21:35:37 +02:00
daniel
3db0b6684d fix logic bug in assertArrayEquals
Change-Id: I442ebfe77292918f29121aba1205de664723e468
2012-07-26 20:12:08 +02:00
daniel
91972a365f fix logic bug in assertArrayEquals
Change-Id: I442ebfe77292918f29121aba1205de664723e468
2012-07-26 20:08:54 +02:00
jeroendedauw
19bd054e8b Added assertArrayEquals method to MediaWikiTestCase to avoid duplicating asort and array_values all over the place
Change-Id: I8e8e7257b74268dff8c0d105a399257dfdc01b40
2012-07-08 19:03:42 +02:00
jeroendedauw
06e54b828f Added assertArrayEquals method to MediaWikiTestCase to avoid duplicating asort and array_values all over the place
Change-Id: I8e8e7257b74268dff8c0d105a399257dfdc01b40
2012-07-02 16:24:10 +02:00
awjrichards
c29fd59775 Big oops - merged to wrong branch.
Revert "Revert to arbitrarily old point before initial remote branch creation to help clean up"

This reverts commit ee0d3d330f
2012-06-05 22:58:54 +00:00
awjrichards
ee0d3d330f Revert to arbitrarily old point before initial remote branch creation to help clean up
Change-Id: I41a3d1e55d3ea9dffa42451237fe065f9334361d
2012-06-02 08:43:04 -07:00
Platonides
4c7dc368a6 The 4th Database::select() parameter is the function name.
The ORDER BY should be at $options.
This was throwing errors in PHP 5.4 due to the array being
converted to a string down at Database.php:862

Fixes 50ee1d2

Change-Id: Ifb0fc70144242f25fc916fb8d380ed3e2d334fb9
2012-06-01 00:13:36 +02:00
daniel
50ee1d23e5 Introducing LinksUpdateTest.
This test case is intended to test the updating of various links
tables using a LinksUpdate object, based on the information in
a ParserOutput object.

Patch set 3: Suggestions by Aaron:
             factored assertSelect() out into MediaWikiTestCase.
             Force sorting of result set under testing.

Change-Id: I2d01e67ee7396080a04e5dff637aca0dc159c65d
2012-05-13 17:07:10 +02:00
daniel
650e33efa4 Let tablesUsed imply needsDB in MediaWikiTestCase.
If the test says it uses database tables, then it needs the database.

And while we are at it, make the check for the test group declaration
more lenient.

Patch set 2: tweaked according to demon's comments.

Change-Id: Ib123745d45b85cebeab5ec87ea7d8227ec3d1dea
2012-05-07 14:56:33 -07:00
Christian Aistleitner
9e80e3a702 Adding temp file/dir management to MediaWikiTestCase
Change-Id: I4ac8f44f1d681925af231377e9d1b984488d3198
2012-04-10 17:08:00 +02:00
Aaron Schulz
c1c6433bfc * In NewParserTest, refactored code to use FileBackend (bug 31737). Also made some speed improvements and made regex= not flood the output with 600 items of crap.
* In FileBackendTest, call clean() on the dirs *after* deleting all the files first.
* Speed improvements to MediaWikiTestCase.
2012-01-25 23:11:53 +00:00