[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/File/tests - testFile.py:1.1.2.3 testNaiveFile.py:1.1.2.3

[Shane Hathaway]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/File/tests
In directory cvs.zope.org:/tmp/cvs-serv20835/lib/python/Zope/App/OFS/Content/File/tests

Modified Files:
      Tag: Zope-3x-branch
	testFile.py testNaiveFile.py 
Log Message:
Merged Zope3-Server-Branch.


=== Zope3/lib/python/Zope/App/OFS/Content/File/tests/testFile.py 1.1.2.2 => 1.1.2.3 ===
 
         self.assertEqual(file.getContentType(), '')
-        self.assertEqual(file.getData(), None)
+        self.assertEqual(file.getData(), '')
 
 
     def testConstructor(self):


=== Zope3/lib/python/Zope/App/OFS/Content/File/tests/testNaiveFile.py 1.1.2.2 => 1.1.2.3 ===
 
         self.assertEqual(file.getContentType(), '')
-        self.assertEqual(file.getData(), None)
+        self.assertEqual(file.getData(), '')
 
 
     def testConstructor(self):