Changed fail for assertEquals and removed fields which weren't checked

This commit is contained in:
Sergio Bertolin 2015-12-03 12:54:44 +00:00
parent e01e894b98
commit c744b30b3b
2 changed files with 12 additions and 11 deletions

View File

@ -12,9 +12,6 @@ Feature: capabilities
| core | webdav-root | remote.php/webdav | |
| files_sharing | api_enabled | 1 | |
| files_sharing | public | enabled | 1 |
| files_sharing | public | password | 1 |
| files_sharing | public | expire_date | 1 |
| files_sharing | public | send_mail | 1 |
| files_sharing | public | upload | 1 |
| files_sharing | resharing | 1 | |
| files_sharing | federation | outgoing | 1 |

View File

@ -29,15 +29,19 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
foreach ($fd as $row) {
if ($row['value'] === ''){
$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature']->$row['value_or_subfeature'];
if ( !$answeredValue === $row['value_or_subfeature']){
PHPUnit_Framework_Assert::fail("Answered value $answeredValue is different to expected " . $row['value_or_subfeature']);
}
$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature'];
PHPUnit_Framework_Assert::assertEquals(
$answeredValue,
$row['value_or_subfeature'],
"Failed field " . $row['capability'] . " " . $row['feature']
);
} else{
$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature']->$row['value_or_subfeature']->$row['value'];
if ( !$answeredValue === $row['value']){
PHPUnit_Framework_Assert::fail("Answered value $answeredValue is different to expected " . $row['value']);
}
$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature']->$row['value_or_subfeature'];
PHPUnit_Framework_Assert::assertEquals(
$answeredValue,
$row['value'],
"Failed field: " . $row['capability'] . " " . $row['feature'] . " " . $row['value_or_subfeature']
);
}
}
}