[Testbot] Plone 5.0 - Python 2.7 - Build # 1433 - Fixed! - 0 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1433 - Fixed!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/1433/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-02-11T03:05:50-08:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/plone.app.contenttypes/commit/e20be7bbfb9c778cd01ad4be77d8fbb810aca3aa

add folders to test for migrating references

Files changed:
M plone/app/contenttypes/tests/test_migration.py

diff --git a/plone/app/contenttypes/tests/test_migration.py b/plone/app/contenttypes/tests/test_migration.py
index ebaa11b..705726c 100644
--- a/plone/app/contenttypes/tests/test_migration.py
+++ b/plone/app/contenttypes/tests/test_migration.py
@@ -806,32 +806,45 @@ def test_relations_are_migrated(self):
         from plone.app.contenttypes.migration.migration import (
             restoreReferences,
             migrate_documents,
+            migrate_folders
         )
 
         # IIntIds is not registered in the test env. So register it here
         sm = getSiteManager(self.portal)
         addUtility(sm, IIntIds, IntIds, ofs_name='intids', findroot=False)
 
+        # create folders
+        self.portal.invokeFactory('Folder', 'folder1')
+        at_folder1 = self.portal['folder1']
+        self.portal.invokeFactory('Folder', 'folder2')
+        at_folder2 = self.portal['folder2']
+
         # create ATDocuments
-        self.portal.invokeFactory('Document', 'doc1')
-        at_doc1 = self.portal['doc1']
-        self.portal.invokeFactory('Document', 'doc2')
-        at_doc2 = self.portal['doc2']
+        at_folder1.invokeFactory('Document', 'doc1')
+        at_doc1 = at_folder1['doc1']
+        at_folder2.invokeFactory('Document', 'doc2')
+        at_doc2 = at_folder2['doc2']
         self.portal.invokeFactory('Document', 'doc3')
         at_doc3 = self.portal['doc3']
-        self.portal.invokeFactory('News Item', 'newsitem')
-        at_newsitem = self.portal['newsitem']
+        at_folder1.invokeFactory('News Item', 'newsitem')
+        at_newsitem = at_folder1['newsitem']
 
         # relate them
         at_doc1.setRelatedItems([at_doc2])
         at_doc2.setRelatedItems([at_newsitem, at_doc3, at_doc1])
         at_doc3.setRelatedItems(at_doc1)
+        at_folder1.setRelatedItems([at_doc2])
+        at_folder2.setRelatedItems([at_doc1])
 
         # migrate content
         applyProfile(self.portal, 'plone.app.contenttypes:default')
         migrate_documents(self.portal)
-        dx_doc1 = self.portal['doc1']
-        dx_doc2 = self.portal['doc2']
+        migrate_folders(self.portal)
+        dx_folder1 = self.portal['folder1']
+        dx_folder2 = self.portal['folder2']
+
+        dx_doc1 = dx_folder1['doc1']
+        dx_doc2 = dx_folder2['doc2']
         dx_doc3 = self.portal['doc3']
 
         # migrate references
@@ -844,6 +857,12 @@ def test_relations_are_migrated(self):
         dx_doc3_related = [x.to_object for x in dx_doc3.relatedItems]
         self.assertEqual(dx_doc3_related, [dx_doc1])
 
+        dx_folder1_related = [x.to_object for x in dx_folder1.relatedItems]
+        self.assertEqual(dx_folder1_related, [dx_doc2])
+
+        dx_folder2_related = [x.to_object for x in dx_folder2.relatedItems]
+        self.assertEqual(dx_folder2_related, [dx_doc1])
+
         # assert multi references, order is restored
         dx_doc2_related = [x.to_object for x in dx_doc2.relatedItems]
         self.assertEqual(dx_doc2_related, [at_newsitem, dx_doc3, dx_doc1])




-------------------------------------------------------------------------------