Add support for git-pull requests

[patchwork] / apps / patchwork / tests / bundles.py

diff --git a/apps/patchwork/tests/bundles.py b/apps/patchwork/tests/bundles.py
index 1346cd836621a3f0faf261c506b354f75e6279dd..659500e559d2dcfda7d42231d53a0673946ee41b 100644 (file)
--- a/apps/patchwork/tests/bundles.py
+++ b/apps/patchwork/tests/bundles.py
@@ -48,8 +48,8 @@ class BundleListTest(TestCase):
         self.user.delete()
 
 class BundleTestBase(TestCase):
-    def setUp(self):
-        patch_names = ['testpatch1', 'testpatch2', 'testpatch3']
+    def setUp(self, patch_count=3):
+        patch_names = ['testpatch%d' % (i) for i in range(1, patch_count+1)]
         self.user = create_user()
         self.client.login(username = self.user.username,
                 password = self.user.username)
@@ -155,6 +155,28 @@ class BundleCreateFromListTest(BundleTestBase):
         self.failUnlessEqual(bundle.patches.count(), 1)
         self.failUnlessEqual(bundle.patches.all()[0], patch)
 
+    def testCreateNonEmptyBundleEmptyName(self):
+        newbundlename = 'testbundle-new'
+        patch = self.patches[0]
+
+        n_bundles = Bundle.objects.count()
+
+        params = {'form': 'patchlistform',
+                  'bundle_name': '',
+                  'action': 'Create',
+                  'project': defaults.project.id,
+                  'patch_id:%d' % patch.id: 'checked'}
+
+        response = self.client.post(
+                '/project/%s/list/' % defaults.project.linkname,
+                params)
+
+        self.assertContains(response, 'No bundle name was specified',
+                status_code = 200)
+
+        # test that no new bundles are present
+        self.failUnlessEqual(n_bundles, Bundle.objects.count())
+
 class BundleCreateFromPatchTest(BundleTestBase):
     def testCreateNonEmptyBundle(self):
         newbundlename = 'testbundle-new'
@@ -172,6 +194,20 @@ class BundleCreateFromPatchTest(BundleTestBase):
         self.failUnlessEqual(bundle.patches.count(), 1)
         self.failUnlessEqual(bundle.patches.all()[0], patch)
 
+    def testCreateWithExistingName(self):
+        newbundlename = self.bundle.name
+        patch = self.patches[0]
+
+        params = {'name': newbundlename,
+                  'action': 'createbundle'}
+
+        response = self.client.post('/patch/%d/' % patch.id, params)
+
+        self.assertContains(response,
+                'A bundle called %s already exists' % newbundlename)
+
+        count = Bundle.objects.count()
+        self.failUnlessEqual(Bundle.objects.count(), 1)
 
 class BundleAddFromListTest(BundleTestBase):
     def testAddToEmptyBundle(self):
@@ -218,6 +254,49 @@ class BundleAddFromListTest(BundleTestBase):
                 for i in [0, 1] ]
         self.failUnless(bps[0].order < bps[1].order)
 
+    def testAddDuplicate(self):
+        self.bundle.append_patch(self.patches[0])
+        count = self.bundle.patches.count()
+        patch = self.patches[0]
+
+        params = {'form': 'patchlistform',
+                  'action': 'Add',
+                  'project': defaults.project.id,
+                  'bundle_id': self.bundle.id,
+                  'patch_id:%d' % patch.id: 'checked'}
+
+        response = self.client.post(
+                '/project/%s/list/' % defaults.project.linkname,
+                params)
+
+        self.assertContains(response, 'Patch &#39;%s&#39; already in bundle' \
+                            % patch.name, count = 1, status_code = 200)
+
+        self.assertEquals(count, self.bundle.patches.count())
+
+    def testAddNewAndDuplicate(self):
+        self.bundle.append_patch(self.patches[0])
+        count = self.bundle.patches.count()
+        patch = self.patches[0]
+
+        params = {'form': 'patchlistform',
+                  'action': 'Add',
+                  'project': defaults.project.id,
+                  'bundle_id': self.bundle.id,
+                  'patch_id:%d' % patch.id: 'checked',
+                  'patch_id:%d' % self.patches[1].id: 'checked'}
+
+        response = self.client.post(
+                '/project/%s/list/' % defaults.project.linkname,
+                params)
+
+        self.assertContains(response, 'Patch &#39;%s&#39; already in bundle' \
+                            % patch.name, count = 1, status_code = 200)
+        self.assertContains(response, 'Patch &#39;%s&#39; added to bundle' \
+                            % self.patches[1].name, count = 1,
+                            status_code = 200)
+        self.assertEquals(count + 1, self.bundle.patches.count())
+
 class BundleAddFromPatchTest(BundleTestBase):
     def testAddToEmptyBundle(self):
         patch = self.patches[0]
@@ -257,31 +336,50 @@ class BundleAddFromPatchTest(BundleTestBase):
 
 class BundleReorderTest(BundleTestBase):
     def setUp(self):
-        super(BundleReorderTest, self).setUp()
-        self.bundle.append_patch(self.patches[0])
-        self.bundle.append_patch(self.patches[1])
-        self.bundle.append_patch(self.patches[2])
+        super(BundleReorderTest, self).setUp(5)
+        for i in range(5):
+            self.bundle.append_patch(self.patches[i])
 
-    def testBundleReorder(self):
-        bundlepatch = BundlePatch.objects.get(bundle = self.bundle,
-                patch = self.patches[0])
+    def checkReordering(self, neworder, start, end):
+        neworder_ids = [ self.patches[i].id for i in neworder ]
 
-        neworder = [self.patches[2], self.patches[0], self.patches[1]]
-        neworder_ids = [ p.id for p in neworder ]
+        firstpatch = BundlePatch.objects.get(bundle = self.bundle,
+                patch = self.patches[start]).patch
 
+        slice_ids = neworder_ids[start:end]
         params = {'form': 'reorderform',
-                  'order_start': bundlepatch.order,
-                  'neworder': neworder_ids}
+                  'order_start': firstpatch.id,
+                  'neworder': slice_ids}
 
         response = self.client.post('/user/bundle/%d/' % self.bundle.id,
                                     params)
 
         self.failUnlessEqual(response.status_code, 200)
 
-        bundle_ids = [ bp.patch.id for bp in \
-                        BundlePatch.objects.filter(bundle = self.bundle) \
-                        .order_by('order') ]
+        bps = BundlePatch.objects.filter(bundle = self.bundle) \
+                        .order_by('order')
 
+        # check if patch IDs are in the expected order:
+        bundle_ids = [ bp.patch.id for bp in bps ]
         self.failUnlessEqual(neworder_ids, bundle_ids)
 
+        # check if order field is still sequential:
+        order_numbers = [ bp.order for bp in bps ]
+        expected_order = range(1, len(neworder)+1) # [1 ... len(neworder)]
+        self.failUnlessEqual(order_numbers, expected_order)
+
+    def testBundleReorderAll(self):
+        # reorder all patches:
+        self.checkReordering([2,1,4,0,3], 0, 5)
+
+    def testBundleReorderEnd(self):
+        # reorder only the last three patches
+        self.checkReordering([0,1,3,2,4], 2, 5)
+
+    def testBundleReorderBegin(self):
+        # reorder only the first three patches
+        self.checkReordering([2,0,1,3,4], 0, 3)
 
+    def testBundleReorderMiddle(self):
+        # reorder only 2nd, 3rd, and 4th patches
+        self.checkReordering([0,2,3,1,4], 1, 4)