Permalink
Browse files

Merge remote branch 'origin/3.6'

Conflicts:
	Tests/Util/ConfigurationTest.php
  • Loading branch information...
2 parents b469478 + 8aceb87 commit fea818a3e45e29859c39d57339dcb2fd132c34a8 @edorian edorian committed Jul 2, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 Tests/TextUI/log-xml.phpt
@@ -18,10 +18,10 @@ PHPUnit %s by Sebastian Bergmann.
...<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
- <testsuite name="BankAccountTest" file="%s/BankAccountTest.php" fullPackage="PHPUnit" package="PHPUnit" tests="3" assertions="3" failures="0" errors="0" time="%f">
- <testcase name="testBalanceIsInitiallyZero" class="BankAccountTest" file="%s/BankAccountTest.php" line="73" assertions="1" time="%f"/>
- <testcase name="testBalanceCannotBecomeNegative" class="BankAccountTest" file="%s/BankAccountTest.php" line="83" assertions="1" time="%f"/>
- <testcase name="testBalanceCannotBecomeNegative2" class="BankAccountTest" file="%s/BankAccountTest.php" line="103" assertions="1" time="%f"/>
+ <testsuite name="BankAccountTest" file="%sBankAccountTest.php" fullPackage="PHPUnit" package="PHPUnit" tests="3" assertions="3" failures="0" errors="0" time="%f">
+ <testcase name="testBalanceIsInitiallyZero" class="BankAccountTest" file="%sBankAccountTest.php" line="73" assertions="1" time="%f"/>
+ <testcase name="testBalanceCannotBecomeNegative" class="BankAccountTest" file="%sBankAccountTest.php" line="83" assertions="1" time="%f"/>
+ <testcase name="testBalanceCannotBecomeNegative2" class="BankAccountTest" file="%sBankAccountTest.php" line="103" assertions="1" time="%f"/>
</testsuite>
</testsuites>

0 comments on commit fea818a

Please sign in to comment.