sh-edraft.de/sh_cpl
1
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

2021.10.3 #35

Merged
edraft merged 31 commits from 2021.10.3 into 2021.10 2021-08-02 14:36:46 +02:00
Conversation 0 Commits 31 Files Changed 39 +20 -4
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a080119c44 - Show all commits

4
src/cpl_query/_extension/iterable.py
View File

@ -64,10 +64,10 @@ class Iterable(IterableABC):
def for_each(self, func: Callable): def for_each(self, func: Callable):
for_each_query(self, func) for_each_query(self, func)
def max(self, func: Callable) -> Union[int, float, complex]: def max(self, func: Callable = None) -> Union[int, float, complex]:
return max_query(self, func) return max_query(self, func)
def min(self, func: Callable) -> Union[int, float, complex]: def min(self, func: Callable = None) -> Union[int, float, complex]:
return min_query(self, func) return min_query(self, func)
def order_by(self, func: Callable) -> OrderedIterableABC: def order_by(self, func: Callable) -> OrderedIterableABC:

4
src/cpl_query/extension/iterable_abc.py
View File

@ -69,10 +69,10 @@ class IterableABC(ABC, list):
def for_each(self, func: Callable) -> Union[int, float, complex]: pass def for_each(self, func: Callable) -> Union[int, float, complex]: pass
@abstractmethod @abstractmethod
def max(self, func: Callable) -> Union[int, float, complex]: pass def max(self, func: Callable = None) -> Union[int, float, complex]: pass
@abstractmethod @abstractmethod
def min(self, func: Callable) -> Union[int, float, complex]: pass def min(self, func: Callable = None) -> Union[int, float, complex]: pass
@abstractmethod @abstractmethod
def order_by(self, func: Callable) -> 'IterableABC': pass def order_by(self, func: Callable) -> 'IterableABC': pass

16
src/cpl_query/tests/query_test.py
View File

@ -171,10 +171,26 @@ class QueryTest(unittest.TestCase):
res = self._tests.max(lambda u: u.address.nr) res = self._tests.max(lambda u: u.address.nr)
self.assertEqual(self._t_user.address.nr, res) self.assertEqual(self._t_user.address.nr, res)
tests = List(values=list(range(0, 100)))
self.assertEqual(99, tests.max())
def wrong():
e_res = List(str, list([str(v) for v in range(0, 100)])).max()
self.assertRaises(WrongTypeException, wrong)
def test_min(self): def test_min(self):
res = self._tests.min(lambda u: u.address.nr) res = self._tests.min(lambda u: u.address.nr)
self.assertEqual(1, res) self.assertEqual(1, res)
tests = List(values=list(range(0, 100)))
self.assertEqual(0, tests.min())
def wrong():
e_res = List(str, list([str(v) for v in range(0, 100)])).min()
self.assertRaises(WrongTypeException, wrong)
def test_order_by(self): def test_order_by(self):
res = self._tests.order_by(lambda user: user.address.street) res = self._tests.order_by(lambda user: user.address.street)
res2 = self._tests.order_by(lambda user: user.address.nr) res2 = self._tests.order_by(lambda user: user.address.nr)