home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split BaseModel.by_id into .by_id and by_id_or_create, refactor tests.
[plomtask]
/
tests
/
days.py
diff --git
a/tests/days.py
b/tests/days.py
index 901667f4c6e0276a2800bf4b21b15b03a17be2fb..02b6c22a3851c03f0ff6cf8a2a47186768589679 100644
(file)
--- a/
tests/days.py
+++ b/
tests/days.py
@@
-53,18
+53,15
@@
class TestsWithDB(TestCaseWithDB):
kwargs = {'date': self.default_ids[0], 'comment': 'foo'}
self.check_saving_and_caching(**kwargs)
kwargs = {'date': self.default_ids[0], 'comment': 'foo'}
self.check_saving_and_caching(**kwargs)
- def test_Day_from_table_row(self) -> None:
- """Test .from_table_row() properly reads in class from DB"""
- self.check_from_table_row()
-
- def test_Day_by_id(self) -> None:
- """Test .by_id()."""
- self.check_by_id()
-
def test_Day_by_date_range_filled(self) -> None:
"""Test Day.by_date_range_filled."""
date1, date2, date3 = self.default_ids
def test_Day_by_date_range_filled(self) -> None:
"""Test Day.by_date_range_filled."""
date1, date2, date3 = self.default_ids
- day1, day2, day3 = self.check_all()
+ day1 = Day(date1)
+ day2 = Day(date2)
+ day3 = Day(date3)
+ day1.save(self.db_conn)
+ day2.save(self.db_conn)
+ day3.save(self.db_conn)
# check date range is a closed interval
self.assertEqual(Day.by_date_range_filled(self.db_conn, date1, date3),
[day1, day2, day3])
# check date range is a closed interval
self.assertEqual(Day.by_date_range_filled(self.db_conn, date1, date3),
[day1, day2, day3])
@@
-86,7
+83,7
@@
class TestsWithDB(TestCaseWithDB):
self.assertEqual(Day.by_date_range_filled(self.db_conn,
day5.date, day7.date),
[day5, day6, day7])
self.assertEqual(Day.by_date_range_filled(self.db_conn,
day5.date, day7.date),
[day5, day6, day7])
- self.check_
storage
([day1, day2, day3, day6])
+ self.check_
identity_with_cache_and_db
([day1, day2, day3, day6])
# check 'today' is interpreted as today's date
today = Day(date_in_n_days(0))
today.save(self.db_conn)
# check 'today' is interpreted as today's date
today = Day(date_in_n_days(0))
today.save(self.db_conn)
@@
-98,10
+95,6
@@
class TestsWithDB(TestCaseWithDB):
"""Test .remove() effects on DB and cache."""
self.check_remove()
"""Test .remove() effects on DB and cache."""
self.check_remove()
- def test_Day_singularity(self) -> None:
- """Test pointers made for single object keep pointing to it."""
- self.check_singularity('day_comment', 'boo')
-
class TestsWithServer(TestCaseWithServer):
"""Tests against our HTTP server/handler (and database)."""
class TestsWithServer(TestCaseWithServer):
"""Tests against our HTTP server/handler (and database)."""