Move tests to proper module.

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreConstraint.py

@@ -485,3 +485,69 @@ class TestSlapOSPersonConstraint(testSlapOSMixin):
     person.newContent(portal_type='Email')
 
     self.assertFalse(consistency_message in getMessageList(person))
+
+class TestSlapOSAssignmentConstraint(testSlapOSMixin):
+  def test_parent_person_validated(self):
+    person = self.portal.person_module.newContent(portal_type='Person')
+    assignment = person.newContent(portal_type='Assignment')
+
+    consistency_message = 'The person document has to be validated to start '\
+      'assignment'
+    self.assertTrue(consistency_message in getMessageList(assignment))
+
+    person.validate()
+
+    self.assertFalse(consistency_message in getMessageList(assignment))
+
+class TestSlapOSEmailConstraint(testSlapOSMixin):
+  def test_url_string_not_empty(self):
+    email = self.portal.person_module.newContent(portal_type='Person'
+      ).newContent(portal_type='Email')
+    consistency_message = 'Email must be defined'
+
+    self.assertTrue(consistency_message in getMessageList(email))
+
+    email.setUrlString(self.generateNewId())
+
+    self.assertFalse(consistency_message in getMessageList(email))
+
+class TestSlapOSComputerConstraint(testSlapOSMixin):
+  def test_title_not_empty(self):
+    computer = self.portal.computer_module.newContent(portal_type='Computer')
+    consistency_message = 'Title must be defined'
+
+    self.assertTrue(consistency_message in getMessageList(computer))
+
+    computer.setTitle(self.generateNewId())
+
+    self.assertFalse(consistency_message in getMessageList(computer))
+
+  def test_reference_not_empty(self):
+    computer = self.portal.computer_module.newContent(portal_type='Computer')
+    consistency_message = 'Reference must be defined'
+
+    self.assertTrue(consistency_message in getMessageList(computer))
+
+    computer.setReference(self.generateNewId())
+
+    self.assertFalse(consistency_message in getMessageList(computer))
+
+  def test_reference_unique(self):
+    reference = self.generateNewId()
+    reference_2 = self.generateNewId()
+    computer = self.portal.computer_module.newContent(portal_type='Computer',
+      reference=reference)
+    computer_2 = self.portal.computer_module.newContent(portal_type='Computer',
+      reference=reference)
+    consistency_message = 'Reference must be unique'
+
+    self.stepTic()
+
+    self.assertTrue(consistency_message in getMessageList(computer))
+    self.assertTrue(consistency_message in getMessageList(computer_2))
+
+    computer_2.setReference(reference_2)
+    self.stepTic()
+
+    self.assertFalse(consistency_message in getMessageList(computer))
+    self.assertFalse(consistency_message in getMessageList(computer_2))

master/bt5/slapos_cloud/bt/revision

-218
+219
\ No newline at end of file

master/bt5/vifib_erp5/TestTemplateItem/testVifibConstraint.py

@@ -69,81 +69,6 @@ class TestVifibSoftwareProductConstraint(testVifibMixin):
     self.assertFalse(consistency_message in getMessageList(software_product))
     self.assertFalse(consistency_message in getMessageList(software_product_2))
 
-class TestVifibAssignmentConstraint(testVifibMixin):
-  def getTitle(self):
-    return "Vifib Assignment Constraint checks"
-
-  def test_parent_person_validated(self):
-    person = self.portal.person_module.newContent(portal_type='Person')
-    assignment = person.newContent(portal_type='Assignment')
-
-    consistency_message = 'The person document has to be validated to start '\
-      'assignment'
-    self.assertTrue(consistency_message in getMessageList(assignment))
-
-    person.validate()
-
-    self.assertFalse(consistency_message in getMessageList(assignment))
-
-class TestVifibComputerConstraint(testVifibMixin):
-  def getTitle(self):
-    return "Vifib Computer Constraint checks"
-
-  def test_title_not_empty(self):
-    computer = self.portal.computer_module.newContent(portal_type='Computer')
-    consistency_message = 'Title must be defined'
-
-    self.assertTrue(consistency_message in getMessageList(computer))
-
-    computer.setTitle(rndstr())
-
-    self.assertFalse(consistency_message in getMessageList(computer))
-
-  def test_reference_not_empty(self):
-    computer = self.portal.computer_module.newContent(portal_type='Computer')
-    consistency_message = 'Reference must be defined'
-
-    self.assertTrue(consistency_message in getMessageList(computer))
-
-    computer.setReference(rndstr())
-
-    self.assertFalse(consistency_message in getMessageList(computer))
-
-  def test_reference_unique(self):
-    reference = rndstr()
-    reference_2 = rndstr()
-    computer = self.portal.computer_module.newContent(portal_type='Computer',
-      reference=reference)
-    computer_2 = self.portal.computer_module.newContent(portal_type='Computer',
-      reference=reference)
-    consistency_message = 'Reference must be unique'
-
-    self.stepTic()
-
-    self.assertTrue(consistency_message in getMessageList(computer))
-    self.assertTrue(consistency_message in getMessageList(computer_2))
-
-    computer_2.setReference(reference_2)
-    self.stepTic()
-
-    self.assertFalse(consistency_message in getMessageList(computer))
-    self.assertFalse(consistency_message in getMessageList(computer_2))
-
-class TestVifibEmailConstraint(testVifibMixin):
-  def getTitle(self):
-    return "Vifib Email Constraint checks"
-
-  def test_url_string_not_empty(self):
-    email = self.portal.person_module.newContent(portal_type='Person'
-      ).newContent(portal_type='Email')
-    consistency_message = 'Email must be defined'
-
-    self.assertTrue(consistency_message in getMessageList(email))
-
-    email.setUrlString(rndstr())
-
-    self.assertFalse(consistency_message in getMessageList(email))
-
 class TestVifibInternalPackingListConstraint(testVifibMixin):
   def getTitle(self):
     return "Vifib Internal Packing List Constraint checks"

master/bt5/vifib_erp5/bt/revision

-549
+550
\ No newline at end of file