Avoid code repetition.

A lot of new tests are coming which will use same functionality.

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreAllocation.py

@@ -6,26 +6,6 @@ from Products.ERP5Type.tests.utils import createZODBPythonScript
 
 class TestSlapOSAllocation(testSlapOSMixin):
 
-  def generateNewId(self):
-    return self.getPortalObject().portal_ids.generateNewId(
-        id_group=('slapos_core_test'))
-
-  def generateNewSoftwareReleaseUrl(self):
-    return 'http://example.org/test%s.cfg' % self.generateNewId()
-
-  def generateNewSoftwareType(self):
-    return 'Type%s' % self.generateNewId()
-
-  def generateNewSoftwareTitle(self):
-    return 'Title%s' % self.generateNewId()
-
-  def generateSafeXml(self):
-    return '<?xml version="1.0" encoding="utf-8"?><instance><parameter '\
-      'id="param">%s</parameter></instance>' % self.generateNewId()
-
-  def generateEmptyXml(self):
-    return '<?xml version="1.0" encoding="utf-8"?><instance></instance>'
-
   def afterSetUp(self):
     super(TestSlapOSAllocation, self).afterSetUp()
     portal = self.getPortalObject()

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonComputerSupply.py

@@ -7,13 +7,6 @@ from Products.ERP5Type.Errors import UnsupportedWorkflowMethod
 
 class TestSlapOSCorePersonComputerSupply(testSlapOSMixin):
 
-  def generateNewId(self):
-    return self.getPortalObject().portal_ids.generateNewId(
-                                     id_group=('slapos_core_test'))
-
-  def generateNewSoftwareReleaseUrl(self):
-    return 'http://example.org/test%s.cfg' % self.generateNewId()
-
   def afterSetUp(self):
     super(TestSlapOSCorePersonComputerSupply, self).afterSetUp()
     portal = self.getPortalObject()

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonRequest.py

@@ -6,13 +6,6 @@ from Products.ERP5Type.tests.backportUnittest import expectedFailure
 
 class TestSlapOSCorePersonRequest(testSlapOSMixin):
 
-  def generateNewId(self):
-    return self.getPortalObject().portal_ids.generateNewId(
-                                     id_group=('slapos_core_test'))
-
-  def generateNewSoftwareReleaseUrl(self):
-    return 'http://example.org/test%s.cfg' % self.generateNewId()
-
   def afterSetUp(self):
     super(TestSlapOSCorePersonRequest, self).afterSetUp()
     portal = self.getPortalObject()

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonRequestComputer.py

@@ -7,10 +7,6 @@ from AccessControl.SecurityManagement import getSecurityManager, \
 
 class TestSlapOSCorePersonRequestComputer(testSlapOSMixin):
 
-  def generateNewId(self):
-    return self.getPortalObject().portal_ids.generateNewId(
-        id_group=('slapos_core_test'))
-
   def generateNewComputerTitle(self):
     return 'My Comp %s' % self.generateNewId()
 

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreSoftwareInstanceRequest.py

@@ -7,23 +7,6 @@ from Products.ERP5Type.tests.backportUnittest import expectedFailure
 
 class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
 
-  def generateNewId(self):
-    return self.getPortalObject().portal_ids.generateNewId(
-        id_group=('slapos_core_test'))
-
-  def generateNewSoftwareReleaseUrl(self):
-    return 'http://example.org/test%s.cfg' % self.generateNewId()
-
-  def generateNewSoftwareType(self):
-    return 'Type%s' % self.generateNewId()
-
-  def generateNewSoftwareTitle(self):
-    return 'Title%s' % self.generateNewId()
-
-  def generateSafeXml(self):
-    return '<?xml version="1.0" encoding="utf-8"?><instance><parameter '\
-      'id="param">%s</parameter></instance>' % self.generateNewId()
-
   def afterSetUp(self):
     super(TestSlapOSCoreSoftwareInstanceRequest, self).afterSetUp()
     portal = self.getPortalObject()

master/bt5/slapos_cloud/bt/revision

-146
\ No newline at end of file
+147
\ No newline at end of file

master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py

@@ -32,23 +32,6 @@ class Simulator:
     open(self.outfile, 'w').write(repr(l))
 
 class TestSlapOSSlapToolMixin(testSlapOSMixin):
-  def generateNewId(self):
-    return self.portal.portal_ids.generateNewId(
-        id_group=('slapos_core_test'))
-
-  def generateNewSoftwareReleaseUrl(self):
-    return 'http://example.org/test%s.cfg' % self.generateNewId()
-
-  def generateNewSoftwareType(self):
-    return 'Type%s' % self.generateNewId()
-
-  def generateNewSoftwareTitle(self):
-    return 'Title%s' % self.generateNewId()
-
-  def generateSafeXml(self):
-    return '<?xml version="1.0" encoding="utf-8"?><instance><parameter '\
-      'id="param">%s</parameter></instance>' % self.generateNewId()
-
   def afterSetUp(self):
     super(TestSlapOSSlapToolMixin, self).afterSetUp()
     self.portal_slap = self.portal.portal_slap

master/bt5/slapos_slap_tool/bt/revision

-8
\ No newline at end of file
+9
\ No newline at end of file

master/product/SlapOS/tests/testSlapOSMixin.py

@@ -315,6 +315,26 @@ class testSlapOSMixin(Products.Vifib.tests.VifibMixin.testVifibMixin):
     self.portal.REQUEST['request_instance'] = None
     self.portal.REQUEST.headers = {}
 
+  def generateNewId(self):
+    return self.portal.portal_ids.generateNewId(
+        id_group=('slapos_core_test'))
+
+  def generateNewSoftwareReleaseUrl(self):
+    return 'http://example.org/test%s.cfg' % self.generateNewId()
+
+  def generateNewSoftwareType(self):
+    return 'Type%s' % self.generateNewId()
+
+  def generateNewSoftwareTitle(self):
+    return 'Title%s' % self.generateNewId()
+
+  def generateSafeXml(self):
+    return '<?xml version="1.0" encoding="utf-8"?><instance><parameter '\
+      'id="param">%s</parameter></instance>' % self.generateNewId()
+
+  def generateEmptyXml(self):
+    return '<?xml version="1.0" encoding="utf-8"?><instance></instance>'
+
 class TestSlapOSDummy(testSlapOSMixin):
   run_all_test = 1
   def test(self):