LazyUUIDTaskSet: Add implementation for the and operator

[etc/taskwarrior.git] / tasklib / tests.py

diff --git a/tasklib/tests.py b/tasklib/tests.py
index 7611536c5cc1734ee4475194141e4e1f7217ea2f..fc0a1c174e622f637e4afb9ffbb5969981fb1323 100644 (file)
--- a/tasklib/tests.py
+++ b/tasklib/tests.py
@@ -12,8 +12,8 @@ import tempfile
 import unittest
 
 from .backends import TaskWarrior
 import unittest
 
 from .backends import TaskWarrior

-from .task import (Task, ReadOnlyDictView, LazyUUIDTask,
-                   LazyUUIDTaskSet, TaskQuerySet)
+from .task import Task, ReadOnlyDictView, TaskQuerySet
+from .lazy import LazyUUIDTask, LazyUUIDTaskSet

 from .serializing import DATE_FORMAT, local_zone
 
 # http://taskwarrior.org/docs/design/task.html , Section: The Attributes
 from .serializing import DATE_FORMAT, local_zone
 
 # http://taskwarrior.org/docs/design/task.html , Section: The Attributes


@@ -1135,7 +1135,7 @@ class LazyUUIDTaskTest(TasklibTest):
         assert type(lazy2) is LazyUUIDTask
 
     def test_lazy_in_queryset(self):
         assert type(lazy2) is LazyUUIDTask
 
     def test_lazy_in_queryset(self):

-        tasks = self.tw.tasks.tasks.filter(uuid=self.stored['uuid'])
+        tasks = self.tw.tasks.filter(uuid=self.stored['uuid'])

 
         assert self.lazy in tasks
         assert type(self.lazy) is LazyUUIDTask
 
         assert self.lazy in tasks
         assert type(self.lazy) is LazyUUIDTask


@@ -1144,7 +1144,7 @@ class LazyUUIDTaskTest(TasklibTest):
 class LazyUUIDTaskSetTest(TasklibTest):
 
     def setUp(self):
 class LazyUUIDTaskSetTest(TasklibTest):
 
     def setUp(self):

-        super(LazyUUIDTaskTest, self).setUp()
+        super(LazyUUIDTaskSetTest, self).setUp()

 
         self.task1 = Task(self.tw, description="task 1")
         self.task2 = Task(self.tw, description="task 2")
 
         self.task1 = Task(self.tw, description="task 1")
         self.task2 = Task(self.tw, description="task 2")


@@ -1172,10 +1172,15 @@ class LazyUUIDTaskSetTest(TasklibTest):
         assert self.task3 in self.lazy
         assert type(self.lazy) is LazyUUIDTaskSet
 
         assert self.task3 in self.lazy
         assert type(self.lazy) is LazyUUIDTaskSet
 

-    def test_eq(self):
-        assert self.lazy == self.tw.tasks.all()
+    def test_eq_lazy(self):
+        new_lazy = LazyUUIDTaskSet(self.tw, self.uuids)
+        assert self.lazy == new_lazy
+        assert not self.lazy != new_lazy

         assert type(self.lazy) is LazyUUIDTaskSet
 
         assert type(self.lazy) is LazyUUIDTaskSet
 

-    def test_conversion(self):
-        assert set(self.lazy) == set(self.tw.tasks.all())
-        assert type(self.lazy) is TaskQuerySet
+    def test_eq_real(self):
+        assert self.lazy == self.tw.tasks.all()
+        assert self.tw.tasks.all() == self.lazy
+        assert not self.lazy != self.tw.tasks.all()
+
+        assert type(self.lazy) is LazyUUIDTaskSet