[Checkins] SVN: Products.CMFTopic/branches/2.2/Products/CMFTopic/ Backported c121571 from trunk

[Hanno Schlichting]

Log message for revision 121613:
  Backported c121571 from trunk
  

Changed:
  U   Products.CMFTopic/branches/2.2/Products/CMFTopic/CHANGES.txt
  U   Products.CMFTopic/branches/2.2/Products/CMFTopic/tests/test_exportimport.py

-=-
Modified: Products.CMFTopic/branches/2.2/Products/CMFTopic/CHANGES.txt
===================================================================
--- Products.CMFTopic/branches/2.2/Products/CMFTopic/CHANGES.txt	2011-05-08 16:52:46 UTC (rev 121612)
+++ Products.CMFTopic/branches/2.2/Products/CMFTopic/CHANGES.txt	2011-05-08 16:54:26 UTC (rev 121613)
@@ -4,7 +4,10 @@
 2.2.2 (unreleased)
 ------------------
 
+- Correct test assertion about the value of DateCriteria. It's edit method
+  mandates the value to be of type int, so we should respect that in tests.
 
+
 2.2.1 (2010-07-04)
 ------------------
 

Modified: Products.CMFTopic/branches/2.2/Products/CMFTopic/tests/test_exportimport.py
===================================================================
--- Products.CMFTopic/branches/2.2/Products/CMFTopic/tests/test_exportimport.py	2011-05-08 16:52:46 UTC (rev 121612)
+++ Products.CMFTopic/branches/2.2/Products/CMFTopic/tests/test_exportimport.py	2011-05-08 16:54:26 UTC (rev 121613)
@@ -32,7 +32,7 @@
 _CRITERIA_DATA = (
     ('a', 'String Criterion', {'value': 'A'}),
     ('b', 'Integer Criterion', {'value': 3, 'direction': 'min'}),
-    ('c', 'Friendly Date Criterion', {'value': DateTime(_DATE_STR),
+    ('c', 'Friendly Date Criterion', {'value': DateTime(_DATE_STR).timeTime(),
                                       'operation': 'min',
                                       'daterange': 'old',
                                      }),