http://www.mediawiki.org/wiki/Special:Code/MediaWiki/91960
Revision: 91960
Author: jeroendedauw
Date: 2011-07-12 14:02:30 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
follow up to r91907
Modified Paths:
--------------
trunk/extensions/Validator/Validator.php
trunk/extensions/Validator/test/ValidatorCriteriaTests.php
Modified: trunk/extensions/Validator/Validator.php
===================================================================
--- trunk/extensions/Validator/Validator.php 2011-07-12 14:01:38 UTC (rev
91959)
+++ trunk/extensions/Validator/Validator.php 2011-07-12 14:02:30 UTC (rev
91960)
@@ -40,8 +40,10 @@
);
// Autoload the classes.
+$wgAutoloadClasses['ValidatorHooks'] = dirname( __FILE__ ) .
'/Validator.hooks.php';
+
$incDir = dirname( __FILE__ ) . '/includes/';
-$wgAutoloadClasses['CriterionValidationResult'] = $incDir .
'CriterionValidationResult.php';
+$wgAutoloadClasses['CriterionValidationResult'] = $incDir .
'CriterionValidationResult.php';
$wgAutoloadClasses['ItemParameterCriterion'] = $incDir .
'ItemParameterCriterion.php';
$wgAutoloadClasses['ItemParameterManipulation'] = $incDir .
'ItemParameterManipulation.php';
$wgAutoloadClasses['ListParameter'] = $incDir .
'ListParameter.php';
@@ -90,7 +92,7 @@
$wgHooks['LanguageGetMagic'][] = 'ValidatorDescribe::staticMagic';
// Since 0.4.8
-$wgHooks['UnitTestsList'][] = 'MapsHooks::registerUnitTests';
+$wgHooks['UnitTestsList'][] = 'ValidatorHooks::registerUnitTests';
// This file needs to be included directly, since Validator_Settings.php
// uses it, in some rare cases before autoloading is defined.
Modified: trunk/extensions/Validator/test/ValidatorCriteriaTests.php
===================================================================
--- trunk/extensions/Validator/test/ValidatorCriteriaTests.php 2011-07-12
14:01:38 UTC (rev 91959)
+++ trunk/extensions/Validator/test/ValidatorCriteriaTests.php 2011-07-12
14:02:30 UTC (rev 91960)
@@ -11,6 +11,21 @@
*/
class ValidatorCriteriaTests extends MediaWikiTestCase {
- // TODO
+ /**
+ * Tests CriterionHasLength.
+ */
+ public function testCriterionHasLength() {
+ $tests = array(
+ array( true, 0, 5, 'foo' ),
+ array( false, 0, 5, 'foobar' ),
+ );
+
+ foreach ( $tests as $test ) {
+ $c = new CriterionHasLength( $test[1], $test[2] );
+ $p = new Parameter( 'test' );
+ $p->setUserValue( 'test', $test[3] );
+ $this->assertEquals( $test[0], $c->validate( $p,
array() )->isValid() );
+ }
+ }
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
