http://www.mediawiki.org/wiki/Special:Code/MediaWiki/91994
Revision: 91994
Author: aaron
Date: 2011-07-12 20:05:02 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
Fixed failing XML tests (on windows) due to newline vs carriage return
discrepancy...ugh
Modified Paths:
--------------
trunk/phase3/tests/phpunit/includes/XmlSelectTest.php
trunk/phase3/tests/phpunit/includes/XmlTest.php
Modified: trunk/phase3/tests/phpunit/includes/XmlSelectTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/XmlSelectTest.php 2011-07-12
19:59:35 UTC (rev 91993)
+++ trunk/phase3/tests/phpunit/includes/XmlSelectTest.php 2011-07-12
20:05:02 UTC (rev 91994)
@@ -79,9 +79,9 @@
$this->select->addOption( 'bar1' );
$this->select->addOption( 'foo2' );
$this->assertEquals(
-'<select><option value="foo1">foo1</option>
-<option value="bar1" selected="selected">bar1</option>
-<option value="foo2">foo2</option></select>', $this->select->getHTML() );
+'<select><option value="foo1">foo1</option>' . "\n" .
+'<option value="bar1" selected="selected">bar1</option>' . "\n" .
+'<option value="foo2">foo2</option></select>', $this->select->getHTML() );
}
/**
@@ -95,9 +95,9 @@
$this->select->addOption( 'foo2' );
$this->select->setDefault( 'bar1' ); # setting default after
adding options
$this->assertEquals(
-'<select><option value="foo1">foo1</option>
-<option value="bar1" selected="selected">bar1</option>
-<option value="foo2">foo2</option></select>', $this->select->getHTML() );
+'<select><option value="foo1">foo1</option>' . "\n" .
+'<option value="bar1" selected="selected">bar1</option>' . "\n" .
+'<option value="foo2">foo2</option></select>', $this->select->getHTML() );
}
public function testGetAttributes() {
Modified: trunk/phase3/tests/phpunit/includes/XmlTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/XmlTest.php 2011-07-12 19:59:35 UTC
(rev 91993)
+++ trunk/phase3/tests/phpunit/includes/XmlTest.php 2011-07-12 20:05:02 UTC
(rev 91994)
@@ -100,36 +100,36 @@
$this->assertEquals(
- '<label for="year">From year (and earlier):</label>
<input name="year" size="4" value="2011" id="year" maxlength="4" /> <label
for="month">From month (and earlier):</label> <select id="month" name="month"
class="mw-month-selector"><option value="-1">all</option>
-<option value="1">January</option>
-<option value="2" selected="selected">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option></select>',
+ '<label for="year">From year (and earlier):</label>
<input name="year" size="4" value="2011" id="year" maxlength="4" /> <label
for="month">From month (and earlier):</label> <select id="month" name="month"
class="mw-month-selector"><option value="-1">all</option>' . "\n" .
+'<option value="1">January</option>' . "\n" .
+'<option value="2" selected="selected">February</option>' . "\n" .
+'<option value="3">March</option>' . "\n" .
+'<option value="4">April</option>' . "\n" .
+'<option value="5">May</option>' . "\n" .
+'<option value="6">June</option>' . "\n" .
+'<option value="7">July</option>' . "\n" .
+'<option value="8">August</option>' . "\n" .
+'<option value="9">September</option>' . "\n" .
+'<option value="10">October</option>' . "\n" .
+'<option value="11">November</option>' . "\n" .
+'<option value="12">December</option></select>',
Xml::dateMenu( 2011, 02 ),
"Date menu for february 2011"
);
$this->assertEquals(
- '<label for="year">From year (and earlier):</label>
<input name="year" size="4" value="2011" id="year" maxlength="4" /> <label
for="month">From month (and earlier):</label> <select id="month" name="month"
class="mw-month-selector"><option value="-1">all</option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option></select>',
+ '<label for="year">From year (and earlier):</label>
<input name="year" size="4" value="2011" id="year" maxlength="4" /> <label
for="month">From month (and earlier):</label> <select id="month" name="month"
class="mw-month-selector"><option value="-1">all</option>' . "\n" .
+'<option value="1">January</option>' . "\n" .
+'<option value="2">February</option>' . "\n" .
+'<option value="3">March</option>' . "\n" .
+'<option value="4">April</option>' . "\n" .
+'<option value="5">May</option>' . "\n" .
+'<option value="6">June</option>' . "\n" .
+'<option value="7">July</option>' . "\n" .
+'<option value="8">August</option>' . "\n" .
+'<option value="9">September</option>' . "\n" .
+'<option value="10">October</option>' . "\n" .
+'<option value="11">November</option>' . "\n" .
+'<option value="12">December</option></select>',
Xml::dateMenu( 2011, -1),
"Date menu with negative month for 'All'"
);
@@ -146,19 +146,19 @@
# @todo FIXME: Please note there is no year there!
$this->assertEquals(
- '<label for="year">From year (and earlier):</label>
<input name="year" size="4" value="" id="year" maxlength="4" /> <label
for="month">From month (and earlier):</label> <select id="month" name="month"
class="mw-month-selector"><option value="-1">all</option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option></select>',
+ '<label for="year">From year (and earlier):</label>
<input name="year" size="4" value="" id="year" maxlength="4" /> <label
for="month">From month (and earlier):</label> <select id="month" name="month"
class="mw-month-selector"><option value="-1">all</option>' . "\n" .
+'<option value="1">January</option>' . "\n" .
+'<option value="2">February</option>' . "\n" .
+'<option value="3">March</option>' . "\n" .
+'<option value="4">April</option>' . "\n" .
+'<option value="5">May</option>' . "\n" .
+'<option value="6">June</option>' . "\n" .
+'<option value="7">July</option>' . "\n" .
+'<option value="8">August</option>' . "\n" .
+'<option value="9">September</option>' . "\n" .
+'<option value="10">October</option>' . "\n" .
+'<option value="11">November</option>' . "\n" .
+'<option value="12">December</option></select>',
Xml::dateMenu( '', ''),
"Date menu with neither year or month"
);
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
