mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2025-01-09 09:22:40 +00:00
Code Issues Activity

Munge off-by-one dates in tests; fixes #112

Browse source
This commit is contained in:
J. King 2017-12-08 16:00:23 -05:00
parent 5cdcd2a7d3
commit 3e42fbdddf
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/lib/AbstractTest.php
View file

@ -29,7 +29,22 @@ abstract class AbstractTest extends \PHPUnit\Framework\TestCase {
} }
} }
public function approximateTime($exp, $act) {
if (is_null($act)) {
return null;
}
$target = Date::normalize($exp)->getTimeStamp();
$value = Date::normalize($act)->getTimeStamp();
if ($value >= ($target - 1) && $value <= ($target + 1)) {
// if the actual time is off by no more than one second, it's acceptable
return $exp;
} else {
return $act;
}
}
public function assertTime($exp, $test, string $msg = null) { public function assertTime($exp, $test, string $msg = null) {
$test = $this->approximateTime($exp, $test);
$exp = Date::transform($exp, "iso8601"); $exp = Date::transform($exp, "iso8601");
$test = Date::transform($test, "iso8601"); $test = Date::transform($test, "iso8601");
$this->assertSame($exp, $test, $msg); $this->assertSame($exp, $test, $msg);

12
tests/lib/Database/Setup.php
View file

@ -82,11 +82,23 @@ trait Setup {
public function compareExpectations(array $expected): bool { public function compareExpectations(array $expected): bool {
foreach ($expected as $table => $info) { foreach ($expected as $table => $info) {
$cols = implode(",", array_keys($info['columns'])); $cols = implode(",", array_keys($info['columns']));
$types = $info['columns'];
$data = $this->drv->prepare("SELECT $cols from $table")->run()->getAll(); $data = $this->drv->prepare("SELECT $cols from $table")->run()->getAll();
$cols = array_keys($info['columns']); $cols = array_keys($info['columns']);
foreach ($info['rows'] as $index => $row) { foreach ($info['rows'] as $index => $row) {
$this->assertCount(sizeof($cols), $row, "The number of values for array index $index does not match the number of fields"); $this->assertCount(sizeof($cols), $row, "The number of values for array index $index does not match the number of fields");
$row = array_combine($cols, $row); $row = array_combine($cols, $row);
foreach($data as $index => $test) {
foreach ($test as $col => $value) {
if ($types[$col]=="datetime") {
$test[$col] = $this->approximateTime($row[$col], $value);
}
}
if($row===$test) {
$data[$index] = $test;
break;
}
}
$this->assertContains($row, $data, "Table $table does not contain record at array index $index."); $this->assertContains($row, $data, "Table $table does not contain record at array index $index.");
$found = array_search($row, $data, true); $found = array_search($row, $data, true);
unset($data[$found]); unset($data[$found]);