Skip to content

Commit

Permalink
Fix, add tests on status
Browse files Browse the repository at this point in the history
  • Loading branch information
trasher committed May 24, 2024
1 parent f553564 commit f95cec2
Show file tree
Hide file tree
Showing 4 changed files with 153 additions and 74 deletions.
22 changes: 11 additions & 11 deletions lib/GaletteObjectsLend/Filters/StatusList.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ class StatusList extends Pagination
/**
* Returns the field we want to default set order to
*
* @return string field name
* @return int|string
*/
protected function getDefaultOrder(): string
protected function getDefaultOrder(): int|string
{
return 'status_text';
return Status::ORDERBY_NAME;
}

/**
Expand Down Expand Up @@ -125,14 +125,15 @@ public function __set(string $name, mixed $value): void

switch ($name) {
case 'filter_str':
case 'query':
$this->$name = $value;
break;
case 'active_filter':
switch ($value) {
case Status::ALL:
case Status::ACTIVE:
case Status::INACTIVE:
$this->active_filter = $value;
$this->active_filter = (int)$value;
break;
default:
Analog::log(
Expand Down Expand Up @@ -161,16 +162,15 @@ public function __set(string $name, mixed $value): void
break;
}

break;
case 'query':
$this->$name = $value;
break;
default:
Analog::log(
'[StatusList] Unable to set proprety `' . $name . '`',
Analog::WARNING
throw new \RuntimeException(
sprintf(
'Unable to set property "%s::%s"!',
__CLASS__,
$name
)
);
break;
}
}
}
Expand Down
1 change: 0 additions & 1 deletion lib/GaletteObjectsLend/Repository/Categories.php
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ private function buildOrderClause(array $fields = null): array
$order[] = 'is_active ' . $this->filters->getDirection();
}
break;

}

return $order;
Expand Down
63 changes: 1 addition & 62 deletions tests/GaletteObjectsLend/Filters/tests/units/CategoriesList.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
use Galette\GaletteTestCase;

/**
* Contribution filters tests class
* Categories filters tests class
*
* @author Johan Cwiklinski <johan@x-tnd.be>
*/
Expand Down Expand Up @@ -100,31 +100,6 @@ public function testCreate(): void
$this->assertInstanceOf($filters::class, $filters->setObjectsFilter($ofilters));
$this->assertSame($ofilters, $filters->objects_filters);

//set filter on children
/*$filters->filtre_cotis_children = 5;
$this->assertSame(5, $filters->filtre_cotis_children);
$filters->date_field = \GaletteObjectsLend\Filters\CategoriesList::DATE_END;
$this->assertSame(\GaletteObjectsLend\Filters\CategoriesList::DATE_END, $filters->date_field);
$filters->payment_type_filter = 42;
$this->assertSame(42, $filters->payment_type_filter);
$filters->filtre_transactions = true;
$this->assertTrue($filters->filtre_transactions);
$filters->filtre_cotis_adh = 42;
$this->assertSame(42, $filters->filtre_cotis_adh);
$filters->from_transaction = 18;
$this->assertSame(18, $filters->from_transaction);
$filters->max_amount = 42;
$this->assertSame(42, $filters->max_amount);
$filters->selected = [0, 1, 2];
$this->assertSame([0, 1, 2], $filters->selected);*/

//reinit and test defaults are back
$filters->reinit();
$this->testDefaults($filters);
Expand Down Expand Up @@ -157,40 +132,4 @@ public function testGetNotExisting()
$this->expectException(\RuntimeException::class);
$value = $filters->non_existing;
}

/**
* Test localized date in filter
*
* @return void
*/
/*public function testLocalizedDates(): void
{
$filters = new \GaletteObjectsLend\Filters\CategoriesList();
$this->testDefaults($filters);
$i18n = new \Galette\Core\I18n(
\Galette\Core\I18n::DEFAULT_LANG
);
$langs = $i18n->getList();
$filter_date = new \DateTime('2000-01-01'); //day of the bug :D
foreach ($langs as $lang) {
$this->assertInstanceOf('\Galette\Core\I18n', $lang);
$i18n->changeLanguage($lang->getID());
$this->assertSame($i18n->getID(), $lang->getID());
try {
$filters->start_date_filter = $filter_date->format(__('Y-m-d'));
$filters->start_date_filter = $filter_date->format(__('Y-m'));
$filters->start_date_filter = $filter_date->format(__('Y'));
} catch (\Throwable $e) {
$this->fail(
sprintf(
'Failed to set start date filter with lang %s: %s',
$lang->getID(),
$e->getMessage()
)
);
}
}
}*/
}
141 changes: 141 additions & 0 deletions tests/GaletteObjectsLend/Filters/tests/units/StatusList.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?php

/**
* Copyright © 2003-2024 The Galette Team
*
* This file is part of Galette (https://galette.eu).
*
* Galette is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Galette is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Galette. If not, see <http://www.gnu.org/licenses/>.
*/

declare(strict_types=1);

namespace GaletteObjectslend\Filters\test\units;

use Galette\GaletteTestCase;

/**
* Status filters tests class
*
* @author Johan Cwiklinski <johan@x-tnd.be>
*/
class StatusList extends GaletteTestCase
{
/**
* Test filter defaults values
*
* @param \GaletteObjectsLend\Filters\StatusList $filters Filters instance
*
* @return void
*/
protected function testDefaults(\GaletteObjectsLend\Filters\StatusList $filters): void
{
$this->assertSame(\GaletteObjectsLend\Repository\Status::ORDERBY_NAME, $filters->orderby);
$this->assertSame(\GaletteObjectsLend\Filters\StatusList::ORDER_ASC, $filters->ordered);
$this->assertNull($filters->filter_str);
$this->assertNull($filters->active_filter);
$this->assertNull($filters->stock_filter);
}

/**
* Test creation
*
* @return void
*/
public function testCreate(): void
{
$filters = new \GaletteObjectsLend\Filters\StatusList();

$this->testDefaults($filters);

//change order field
$filters->orderby = \GaletteObjectsLend\Repository\Status::ORDERBY_STOCK;
$this->assertSame(\GaletteObjectsLend\Repository\Status::ORDERBY_STOCK, $filters->orderby);
$this->assertSame(\GaletteObjectsLend\Filters\StatusList::ORDER_ASC, $filters->ordered);

//same order field again: direction inverted
$filters->orderby = \GaletteObjectsLend\Repository\Status::ORDERBY_STOCK;
$this->assertSame(\GaletteObjectsLend\Repository\Status::ORDERBY_STOCK, $filters->orderby);
$this->assertSame(\GaletteObjectsLend\Filters\StatusList::ORDER_DESC, $filters->ordered);

//not existing order, same kept
$filters->ordered = 42;
$this->assertSame(\GaletteObjectsLend\Repository\Status::ORDERBY_STOCK, $filters->orderby);
$this->assertSame(\GaletteObjectsLend\Filters\StatusList::ORDER_DESC, $filters->ordered);

//change direction only
$filters->ordered = \GaletteObjectsLend\Filters\StatusList::ORDER_ASC;
$this->assertSame(\GaletteObjectsLend\Repository\Status::ORDERBY_STOCK, $filters->orderby);
$this->assertSame(\GaletteObjectsLend\Filters\StatusList::ORDER_ASC, $filters->ordered);

//set string filter
$filters->filter_str = 'a string';
$this->assertSame('a string', $filters->filter_str);

//Set activity filter
$filters->active_filter = \GaletteObjectsLend\Repository\Status::INACTIVE;
$this->assertSame(\GaletteObjectsLend\Repository\Status::INACTIVE, $filters->active_filter);

//cast is forced
$filters->active_filter = (string)\GaletteObjectsLend\Repository\Status::INACTIVE;
$this->assertSame(\GaletteObjectsLend\Repository\Status::INACTIVE, $filters->active_filter);

//out of known values, no change
$filters->active_filter = 42;
$this->assertSame(\GaletteObjectsLend\Repository\Status::INACTIVE, $filters->active_filter);

//set stock filter
$filters->stock_filter = \GaletteObjectsLend\Repository\Status::IN_STOCK;
$this->assertSame(\GaletteObjectsLend\Repository\Status::IN_STOCK, $filters->stock_filter);

$filters->stock_filter = \GaletteObjectsLend\Repository\Status::OUT_STOCK;
$this->assertSame(\GaletteObjectsLend\Repository\Status::OUT_STOCK, $filters->stock_filter);

//out of known values, no change
$filters->stock_filter = 42;
$this->assertSame(\GaletteObjectsLend\Repository\Status::OUT_STOCK, $filters->stock_filter);

//reinit and test defaults are back
$filters->reinit();
$this->testDefaults($filters);
}

/**
* Test setting non existing filter
*
* @return void
*/
public function testSetNotExisting()
{
$filters = new \GaletteObjectsLend\Filters\StatusList();
$this->testDefaults($filters);

$this->expectException(\RuntimeException::class);
$filters->non_existing = 42;
}

/**
* Test getting non existing filter
*
* @return void
*/
public function testGetNotExisting()
{
$filters = new \GaletteObjectsLend\Filters\StatusList();
$this->testDefaults($filters);

$this->expectException(\RuntimeException::class);
$value = $filters->non_existing;
}
}

0 comments on commit f95cec2

Please sign in to comment.