From de3155cb065da420c9edcba25cd103428e08d83a Mon Sep 17 00:00:00 2001
From: James Turk <james.p.turk@gmail.com>
Date: Sun, 21 Feb 2010 12:01:04 -0500
Subject: [PATCH] filter test improvements

---
 saucebrush/tests/__init__.py |  7 +++++++
 saucebrush/tests/filters.py  | 38 +++++++++++++++++++++++++-----------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/saucebrush/tests/__init__.py b/saucebrush/tests/__init__.py
index e69de29..f4683f4 100644
--- a/saucebrush/tests/__init__.py
+++ b/saucebrush/tests/__init__.py
@@ -0,0 +1,7 @@
+import unittest
+from saucebrush.tests.filters import FilterTestCase
+
+filter_suite = unittest.TestLoader().loadTestsFromTestCase(FilterTestCase)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/saucebrush/tests/filters.py b/saucebrush/tests/filters.py
index 97c8f91..7458df6 100644
--- a/saucebrush/tests/filters.py
+++ b/saucebrush/tests/filters.py
@@ -4,7 +4,7 @@ import types
 from saucebrush.filters import (Filter, YieldFilter, FieldFilter,
                                 ConditionalFilter, FieldModifier,
                                 FieldRemover, FieldMerger, FieldAdder,
-                                FieldCopier, FieldRenamer)
+                                FieldCopier, FieldRenamer, Unique)
 
 class DummyRecipe(object):
     rejected_record = None
@@ -17,6 +17,13 @@ class Doubler(Filter):
     def process_record(self, record):
         return record*2
 
+class OddRemover(Filter):
+    def process_record(self, record):
+        if record % 2 == 0:
+            return record
+        else:
+            return None     # explicitly return None
+
 class ListFlattener(YieldFilter):
     def process_record(self, record):
         for item in record:
@@ -26,7 +33,7 @@ class FieldDoubler(FieldFilter):
     def process_field(self, item):
         return item*2
 
-class OddRemover(ConditionalFilter):
+class ConditionalOddRemover(ConditionalFilter):
     def test_record(self, record):
         # return True for even values
         return record % 2 == 0
@@ -61,6 +68,13 @@ class FilterTestCase(unittest.TestCase):
         self.assertEquals(type(result), types.GeneratorType)
         self.assertEquals(list(result), [2,4,6])
 
+    def test_simple_filter_return_none(self):
+        cf = OddRemover()
+        result = cf.attach(range(10))
+
+        # ensure only even numbers remain
+        self.assertEquals(list(result), [0,2,4,6,8])
+
     def test_simple_yield_filter(self):
         lf = ListFlattener()
         result = lf.attach([[1],[2,3],[4,5,6]])
@@ -79,7 +93,7 @@ class FilterTestCase(unittest.TestCase):
         self.assert_filter_result(ff, expected_data)
 
     def test_conditional_filter(self):
-        cf = OddRemover()
+        cf = ConditionalOddRemover()
         result = cf.attach(range(10))
 
         # ensure only even numbers remain
@@ -175,15 +189,17 @@ class FilterTestCase(unittest.TestCase):
                          {'x':1, 'y':10, 'c':100}]
         self.assert_filter_result(fr, expected_data)
 
-    # splitter
-    # flatteners?
-    # unique
-    # unicode filter
-    # string filter
+    # TODO: splitter & flattner tests?
 
-    # phone # cleaner
-    # date cleaner
-    # name cleaner
+    def test_unique_filter(self):
+        u = Unique()
+        in_data = [{'a': 77}, {'a':33}, {'a': 77}]
+        expected_data = [{'a': 77}, {'a':33}]
+        result = u.attach(in_data)
+
+        self.assertEquals(list(result), expected_data)
+
+    # TODO: unicode & string filter tests
 
 if __name__ == '__main__':
     unittest.main()