[Erp5-report] r26978 - /erp5/trunk/products/ERP5OOo/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu May 14 13:51:54 CEST 2009
Author: jerome
Date: Thu May 14 13:51:52 2009
New Revision: 26978
URL: http://svn.erp5.org?rev=26978&view=rev
Log:
get_transaction -> transaction
Modified:
erp5/trunk/products/ERP5OOo/tests/testDms.py
erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py
erp5/trunk/products/ERP5OOo/tests/testIngestion.py
erp5/trunk/products/ERP5OOo/tests/testOOoImport.py
erp5/trunk/products/ERP5OOo/tests/testOOoStyle.py
Modified: erp5/trunk/products/ERP5OOo/tests/testDms.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testDms.py?rev=26978&r1=26977&r2=26978&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] Thu May 14 13:51:52 2009
@@ -50,6 +50,7 @@
import unittest
import time
+import transaction
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import FileUpload
@@ -141,12 +142,12 @@
"""
Remove everything after each run
"""
- get_transaction().abort()
+ transaction.abort()
self.tic()
doc_module = self.getDocumentModule()
ids = [i for i in doc_module.objectIds()]
doc_module.manage_delObjects(ids)
- get_transaction().commit()
+ transaction.commit()
self.tic()
## helper methods
@@ -216,22 +217,22 @@
file = makeFileUpload(filename)
document = self.portal.portal_contributions.newContent(file=file)
document.immediateReindexObject()
- get_transaction().commit()
+ transaction.commit()
self.tic()
document_url = document.getRelativeUrl()
def getTestDocument():
return self.portal.restrictedTraverse(document_url)
self.failUnless(getTestDocument().getRevision() == '0')
getTestDocument().edit(file=file)
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.failUnless(getTestDocument().getRevision() == '1')
getTestDocument().edit(title='Hey Joe')
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.failUnless(getTestDocument().getRevision() == '2')
another_document = self.portal.portal_contributions.newContent(file=file)
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.failUnless(getTestDocument().getRevision() == '3')
self.failUnless(getTestDocument().getRevisionList() == ['0', '1', '2'] )
@@ -256,13 +257,13 @@
docs[2] = self.createTestDocument(reference='TEST', version='002', language='en')
docs[3] = self.createTestDocument(reference='TEST', version='004', language='en')
docs[4] = self.createTestDocument(reference='ANOTHER', version='002', language='en')
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.failIf(docs[1].isVersionUnique())
self.failIf(docs[2].isVersionUnique())
self.failUnless(docs[3].isVersionUnique())
docs[2].setVersion('003')
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.failUnless(docs[1].isVersionUnique())
self.failUnless(docs[2].isVersionUnique())
@@ -312,7 +313,7 @@
time.sleep(1)
docs[5] = self.createTestDocument(reference='TEST', version='003', language='sp')
time.sleep(1)
- get_transaction().commit()
+ transaction.commit()
self.tic()
doc = docs[2] # can be any
self.failUnless(doc.getOriginalLanguage() == 'en')
@@ -326,7 +327,7 @@
self.failUnless(doc.getLatestVersionValue() == docs[5]) # there are two latest - it chooses the one in user language
docs[6] = document_module.newContent(reference='TEST', version='004', language='pl')
docs[7] = document_module.newContent(reference='TEST', version='004', language='en')
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.failUnless(doc.getLatestVersionValue() == docs[7]) # there are two latest, neither in user language - it chooses the one in original language
@@ -383,7 +384,7 @@
document7.setSimilarValue([document9])
document11.setSimilarValue(document7)
- get_transaction().commit()
+ transaction.commit()
self.tic()
#if user language is 'en'
@@ -409,7 +410,7 @@
self.assertSameSet([document6, document7],
document13.getSimilarCloudValueList())
- get_transaction().commit()
+ transaction.commit()
# if user language is 'fr', test that latest documents are prefferable returned in user_language (if available)
self.portal.Localizer.changeLanguage('fr')
@@ -425,7 +426,7 @@
self.assertSameSet([document6, document8],
document13.getSimilarCloudValueList())
- get_transaction().commit()
+ transaction.commit()
# if user language is "bg"
self.portal.Localizer.changeLanguage('bg')
@@ -485,7 +486,7 @@
file = makeFileUpload(filename)
document8 = self.portal.portal_contributions.newContent(file=file)
- get_transaction().commit()
+ transaction.commit()
self.tic()
printAndLog('\nTesting Implicit Predecessors')
# the implicit predecessor will find documents by reference.
@@ -500,7 +501,7 @@
sqlresult_to_document_list(document1.getImplicitPredecessorValueList()))
# clear transactional variable cache
- get_transaction().commit()
+ transaction.commit()
printAndLog('\nTesting Implicit Successors')
# the implicit successors should be return document with appropriate
@@ -514,7 +515,7 @@
sqlresult_to_document_list(document5.getImplicitSuccessorValueList()))
# clear transactional variable cache
- get_transaction().commit()
+ transaction.commit()
# if user language is 'fr'.
self.portal.Localizer.changeLanguage('fr')
@@ -523,7 +524,7 @@
sqlresult_to_document_list(document5.getImplicitSuccessorValueList()))
# clear transactional variable cache
- get_transaction().commit()
+ transaction.commit()
# if user language is 'ja'.
self.portal.Localizer.changeLanguage('ja')
@@ -590,9 +591,9 @@
portal_type='Spreadsheet')
doc.edit(file=makeFileUpload('import_data_list.ods'))
doc.publish()
- get_transaction().commit()
- self.tic()
- get_transaction().commit()
+ transaction.commit()
+ self.tic()
+ transaction.commit()
uf = self.portal.acl_users
uf._doAddUser('member_user2', 'secret', ['Member'], [])
@@ -640,7 +641,7 @@
document = self.portal.portal_contributions.newContent(file=file)
self.assertEquals('converting', document.getExternalProcessingState())
- get_transaction().commit()
+ transaction.commit()
self.assertEquals('converting', document.getExternalProcessingState())
# Clone a uploaded document
@@ -650,7 +651,7 @@
new_document = container[paste_result[0]['new_id']]
self.assertEquals('converting', new_document.getExternalProcessingState())
- get_transaction().commit()
+ transaction.commit()
self.assertEquals('converting', new_document.getExternalProcessingState())
# Change workflow state to converted
@@ -665,7 +666,7 @@
new_document = container[paste_result[0]['new_id']]
self.assertEquals('converted', new_document.getExternalProcessingState())
- get_transaction().commit()
+ transaction.commit()
self.assertEquals('converted', new_document.getExternalProcessingState())
self.tic()
self.assertEquals('converted', new_document.getExternalProcessingState())
@@ -683,7 +684,7 @@
sub_document = document.newContent(portal_type='Image')
self.assertEquals('embedded', sub_document.getValidationState())
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.assertEquals('embedded', sub_document.getValidationState())
@@ -698,7 +699,7 @@
self.assertEquals(1, len(new_sub_document_list))
new_sub_document = new_sub_document_list[0]
self.assertEquals('embedded', new_sub_document.getValidationState())
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.assertEquals('embedded', new_sub_document.getValidationState())
@@ -712,7 +713,7 @@
file = makeFileUpload(filename)
document = self.portal.portal_contributions.newContent(file=file)
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.assertEquals(0, len(document.contentValues(portal_type='Image')))
@@ -740,7 +741,7 @@
document_2 = self.portal.document_module.newContent(portal_type='File')
document_2.setDescription('This test make sure that scriptable key feature on ZSQLCatalog works.')
- get_transaction().commit()
+ transaction.commit()
self.tic()
# Use scriptable key to search above documents.
@@ -784,7 +785,7 @@
default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION)
default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION)
default_pref.enable()
- get_transaction().commit()
+ transaction.commit()
self.tic()
def login(self):
@@ -810,14 +811,14 @@
upload_file = makeFileUpload(filename)
document = self.portal.portal_contributions.newContent(file=upload_file)
- get_transaction().commit()
+ transaction.commit()
self.tic()
document.submit()
preview_html = document.Document_getPreviewAsHTML().replace('\n', ' ')
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.assert_('I use reference to look up TEST' in preview_html)
Modified: erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py?rev=26978&r1=26977&r2=26978&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testFormPrintout.py [utf8] Thu May 14 13:51:52 2009
@@ -28,6 +28,7 @@
##############################################################################
import unittest
+import transaction
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import createZODBPythonScript
from AccessControl.SecurityManagement import newSecurityManager
@@ -104,7 +105,7 @@
test1.newContent("foo_1", portal_type='Foo Line')
if test1._getOb("foo_2", None) is None:
test1.newContent("foo_2", portal_type='Foo Line')
- get_transaction().commit()
+ transaction.commit()
self.tic()
# XML validator
@@ -135,7 +136,7 @@
foo_module.newContent(id='test1', portal_type='Foo')
test1 = foo_module.test1
test1.setTitle('Foo title!')
- get_transaction().commit()
+ transaction.commit()
self.tic()
# test target
Modified: erp5/trunk/products/ERP5OOo/tests/testIngestion.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testIngestion.py?rev=26978&r1=26977&r2=26978&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] Thu May 14 13:51:52 2009
@@ -32,6 +32,7 @@
import unittest
import os, cStringIO, zipfile
from xml.dom.minidom import parseString
+import transaction
from Testing import ZopeTestCase
from DateTime import DateTime
from AccessControl.SecurityManagement import newSecurityManager
@@ -224,7 +225,7 @@
if hasattr(new_category, method_id):
method = getattr(new_category, method_id)
method(value.encode('UTF-8'))
- get_transaction().commit()
+ transaction.commit()
self.tic()
def getCategoryList(self, base_category=None):
@@ -274,7 +275,7 @@
document_module.manage_delObjects([id,])
document = document_module.newContent(portal_type=portal_type, id=id)
document.reindexObject()
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.checkIsObjectCatalogged(portal_type, id=id, parent_uid=document_module.getUid())
self.assert_(hasattr(document_module, id))
@@ -304,7 +305,7 @@
context.edit(file=f)
context.convertToBaseFormat()
context.reindexObject()
- get_transaction().commit()
+ transaction.commit()
self.tic()
self.failUnless(context.hasFile())
if context.getPortalType() in ('Image', 'File', 'PDF'):
@@ -328,7 +329,7 @@
context.edit(file=f)
context.convertToBaseFormat()
context.reindexObject()
- get_transaction().commit()
+ transaction.commit()
self.tic()
# We call clear cache to be sure that the target list is updated
self.getPortal().portal_caches.clearCache()
@@ -373,7 +374,7 @@
# reindex
ob.immediateReindexObject()
created_documents.append(ob)
- get_transaction().commit()
+ transaction.commit()
self.tic()
# inspect created objects
count = 0
@@ -425,7 +426,7 @@
# pass to discovery file_name and user_login
context.discoverMetadata(context.getSourceReference(), 'john_doe')
context.reindexObject()
- get_transaction().commit()
+ transaction.commit()
self.tic()
def checkMetadataOrder(self, expected_metadata, document_id='one'):
@@ -471,7 +472,7 @@
)
person.setDefaultEmailText('john at doe.com')
person.reindexObject()
- get_transaction().commit()
+ transaction.commit()
self.tic()
def stepCreateTextDocument(self, sequence=None, sequence_list=None, **kw):
@@ -568,7 +569,7 @@
# Revision is 1 after upload (revisions are strings)
self.assertEquals(document.getRevision(), '1')
document.reindexObject()
- get_transaction().commit()
+ transaction.commit()
def stepUploadFromViewForm(self, sequence=None, sequence_list=None, **kw):
"""
@@ -580,7 +581,7 @@
context.edit(file=f)
self.assertEquals(context.getRevision(), str(int(revision) + 1))
context.reindexObject()
- get_transaction().commit()
+ transaction.commit()
def stepUploadTextFromContributionTool(self, sequence=None, sequence_list=None, **kw):
"""
@@ -588,7 +589,7 @@
"""
f = makeFileUpload('TEST-en-002.doc')
self.portal.portal_contributions.newContent(id='one', file=f)
- get_transaction().commit()
+ transaction.commit()
def stepReuploadTextFromContributionTool(self, sequence=None, sequence_list=None, **kw):
"""
@@ -604,16 +605,16 @@
f.filename = 'TEST-en-002.doc'
self.portal.portal_contributions.newContent(file=f)
- get_transaction().commit()
+ transaction.commit()
self.tic()
- get_transaction().commit()
+ transaction.commit()
self.assertEquals(context.getRevision(), str(int(revision) + 1))
self.assert_('This document is modified.' in context.asText())
self.assertEquals(len(self.portal.document_module.objectIds()),
number_of_document)
context.reindexObject()
- get_transaction().commit()
+ transaction.commit()
def stepUploadAnotherTextFromContributionTool(self, sequence=None, sequence_list=None, **kw):
"""
@@ -622,9 +623,9 @@
f = makeFileUpload('ANOTHE-en-001.doc')
self.portal.portal_contributions.newContent(id='two', file=f)
- get_transaction().commit()
+ transaction.commit()
self.tic()
- get_transaction().commit()
+ transaction.commit()
context = self.getDocument('two')
self.assert_('This is a another very interesting document.' in context.asText())
@@ -689,7 +690,7 @@
context = self.getDocument('one')
f = makeFileUpload('TEST-en-002.doc')
context.edit(file=f)
- get_transaction().commit()
+ transaction.commit()
self.tic()
# Then make sure content discover works
property_dict = context.getPropertyDictFromUserLogin()
@@ -712,7 +713,7 @@
subject='another subject',
description='another description')
context.edit(**kw)
- context.reindexObject(); get_transaction().commit();
+ context.reindexObject(); transaction.commit();
self.tic();
def stepCheckChangedMetadata(self, sequence=None, sequence_list=None, **kw):
@@ -933,7 +934,7 @@
"""
f = open(makeFilePath('email_from.txt'))
document = self.receiveEmail(data=f.read())
- get_transaction().commit()
+ transaction.commit()
self.tic()
def stepReceiveEmailFromJohn(self, sequence=None, sequence_list=None, **kw):
@@ -942,7 +943,7 @@
"""
f = open(makeFilePath('email_from.txt'))
document = self.receiveEmail(f.read())
- get_transaction().commit()
+ transaction.commit()
self.tic()
def stepVerifyEmailedDocuments(self, sequence=None, sequence_list=None, **kw):
@@ -1357,7 +1358,7 @@
f = makeFileUpload('TEST-en-002.doc', 'T&é@{T-en-002.doc')
document = self.portal.portal_contributions.newContent(file=f)
sequence.edit(document_id=document.getId())
- get_transaction().commit()
+ transaction.commit()
def stepDiscoverFromFilenameWithNonASCIIFilename(self,
sequence=None, sequence_list=None, **kw):
Modified: erp5/trunk/products/ERP5OOo/tests/testOOoImport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoImport.py?rev=26978&r1=26977&r2=26978&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoImport.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoImport.py [utf8] Thu May 14 13:51:52 2009
@@ -30,6 +30,7 @@
import unittest
import os
+import transaction
from zLOG import LOG
from Testing import ZopeTestCase
from AccessControl.SecurityManagement import newSecurityManager
@@ -751,7 +752,7 @@
# tests CategoryTool_importCategoryFile with * in the paths columns
self.portal.portal_categories.CategoryTool_importCategoryFile(
import_file=makeFileUpload('import_region_category_path_stars.sxc'))
- get_transaction().commit()
+ transaction.commit()
self.tic()
region = self.portal.portal_categories.region
self.assertEqual(2, len(region))
@@ -770,7 +771,7 @@
self.portal.portal_categories.CategoryTool_importCategoryFile(
import_file=makeFileUpload(
'import_region_category_path_stars_non_ascii.sxc'))
- get_transaction().commit()
+ transaction.commit()
self.tic()
region = self.portal.portal_categories.region
self.assertEqual(2, len(region))
@@ -789,7 +790,7 @@
# bug)
self.portal.portal_categories.CategoryTool_importCategoryFile(
import_file=makeFileUpload('import_region_category_duplicate_ids.sxc'))
- get_transaction().commit()
+ transaction.commit()
self.tic()
region = self.portal.portal_categories.region
self.assertEqual(1, len(region))
Modified: erp5/trunk/products/ERP5OOo/tests/testOOoStyle.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoStyle.py?rev=26978&r1=26977&r2=26978&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoStyle.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoStyle.py [utf8] Thu May 14 13:51:52 2009
@@ -27,6 +27,7 @@
##############################################################################
import unittest
+import transaction
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Form.Selection import Selection
from Testing import ZopeTestCase
@@ -53,7 +54,7 @@
person_module = self.portal.person_module
if person_module._getOb('pers', None) is None:
person_module.newContent(id='pers', portal_type='Person')
- get_transaction().commit()
+ transaction.commit()
self.tic()
person_module.pers.setFirstName('Bob')
if person_module.pers._getOb('img', None) is None:
More information about the Erp5-report
mailing list