[Erp5-report] r16429 - /erp5/trunk/products/ERP5/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Sep 17 19:28:44 CEST 2007
Author: jerome
Date: Mon Sep 17 19:28:44 2007
New Revision: 16429
URL: http://svn.erp5.org?rev=16429&view=rev
Log:
fix all undefined names in ERP5 unit tests, this was mostly due to the use of framework.py which we no longer use (runUnitTest does it for you)
Modified:
erp5/trunk/products/ERP5/tests/erp5_url_checker.py
erp5/trunk/products/ERP5/tests/extractMessageCatalog.py
erp5/trunk/products/ERP5/tests/testAccountingRules.py
erp5/trunk/products/ERP5/tests/testAccounting_l10n_fr_m9.py
erp5/trunk/products/ERP5/tests/testAlarm.py
erp5/trunk/products/ERP5/tests/testAmount.py
erp5/trunk/products/ERP5/tests/testBug.py
erp5/trunk/products/ERP5/tests/testBusinessTemplate.py
erp5/trunk/products/ERP5/tests/testDivergenceTester.py
erp5/trunk/products/ERP5/tests/testDomainTool.py
erp5/trunk/products/ERP5/tests/testERP5Budget.py
erp5/trunk/products/ERP5/tests/testERP5Core.py
erp5/trunk/products/ERP5/tests/testGeographicalAddress.py
erp5/trunk/products/ERP5/tests/testICal.py
erp5/trunk/products/ERP5/tests/testImmobilisation.py
erp5/trunk/products/ERP5/tests/testInteractionWorkflow.py
erp5/trunk/products/ERP5/tests/testInventory.py
erp5/trunk/products/ERP5/tests/testInventoryAPI.py
erp5/trunk/products/ERP5/tests/testInvoiceVAT.py
erp5/trunk/products/ERP5/tests/testOrder.py
erp5/trunk/products/ERP5/tests/testPackingList.py
erp5/trunk/products/ERP5/tests/testPackingListRoundingPrecision.py
erp5/trunk/products/ERP5/tests/testPerson.py
erp5/trunk/products/ERP5/tests/testProductionOrder.py
erp5/trunk/products/ERP5/tests/testPurchaseOrder.py
erp5/trunk/products/ERP5/tests/testRSS.py
erp5/trunk/products/ERP5/tests/testResource.py
erp5/trunk/products/ERP5/tests/testTrashTool.py
erp5/trunk/products/ERP5/tests/testXHTML.py
Modified: erp5/trunk/products/ERP5/tests/erp5_url_checker.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/erp5_url_checker.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/erp5_url_checker.py (original)
+++ erp5/trunk/products/ERP5/tests/erp5_url_checker.py Mon Sep 17 19:28:44 2007
@@ -13,15 +13,15 @@
# user: user2 password: user2
from threading import Thread
-from threading import Timer
from time import sleep
-from urllib import urlopen
-from urllib import URLopener
from urllib import addinfourl
+from urllib import splithost
+from urllib import splituser
+from urllib import unquote
+from urllib import splittype
import string
-
-from urllib import *
+from urllib import FancyURLopener
from Cookie import SimpleCookie
def main():
Modified: erp5/trunk/products/ERP5/tests/extractMessageCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/extractMessageCatalog.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/extractMessageCatalog.py (original)
+++ erp5/trunk/products/ERP5/tests/extractMessageCatalog.py Mon Sep 17 19:28:44 2007
@@ -37,15 +37,7 @@
"""
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
+import unittest
try:
from transaction import get as get_transaction
except ImportError:
@@ -79,11 +71,8 @@
for msgid in result[i].keys():
f.write('msgid "%s"\nmsgstr ""\n\n' % msgid)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(ExtractMessageCatalog))
- return suite
+
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(ExtractMessageCatalog))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testAccountingRules.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAccountingRules.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAccountingRules.py (original)
+++ erp5/trunk/products/ERP5/tests/testAccountingRules.py Mon Sep 17 19:28:44 2007
@@ -40,13 +40,9 @@
# * test removing cells for a line
#
-import os, sys, random
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+import unittest
+import os
+import random
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
@@ -1776,12 +1772,8 @@
# quantity from sum of receivable movement
# link to sale invoice
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestAccountingRules))
- return suite
-
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestAccountingRules))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testAccounting_l10n_fr_m9.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAccounting_l10n_fr_m9.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAccounting_l10n_fr_m9.py (original)
+++ erp5/trunk/products/ERP5/tests/testAccounting_l10n_fr_m9.py Mon Sep 17 19:28:44 2007
@@ -28,12 +28,7 @@
"""Test suite for erp5_accounting_l10n_m9
"""
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-os.environ.setdefault('EVENT_LOG_FILE', 'zLOG.log')
-os.environ.setdefault('EVENT_LOG_SEVERITY', '-300')
+import unittest
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import reindex
@@ -249,12 +244,8 @@
self.assertEquals(1, len(account.checkConsistency(fixit=1)))
self.assertEquals('liability/payable', account.getAccountType())
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestAccounting_l10n_M9))
- return suite
-
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestAccounting_l10n_M9))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testAlarm.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAlarm.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAlarm.py (original)
+++ erp5/trunk/products/ERP5/tests/testAlarm.py Mon Sep 17 19:28:44 2007
@@ -26,33 +26,14 @@
#
##############################################################################
-
-
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+import unittest
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
+from AccessControl.SecurityManagement import newSecurityManager
from DateTime import DateTime
-from Acquisition import aq_base, aq_inner
from zLOG import LOG
from Products.ERP5Type.DateUtils import addToDate
-import time
-import os
-from Products.ERP5Type import product_path
-from DateTime import DateTime
class TestAlarm(ERP5TypeTestCase):
"""
@@ -466,12 +447,9 @@
# Chen that the second alarm execution did happen
self.assertNotEquals(alarm.getLastActiveProcess(), None)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestAlarm))
- return suite
-
+
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestAlarm))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testAmount.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAmount.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAmount.py (original)
+++ erp5/trunk/products/ERP5/tests/testAmount.py Mon Sep 17 19:28:44 2007
@@ -25,13 +25,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+
+import unittest
+import os
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from AccessControl.SecurityManagement import newSecurityManager, \
@@ -392,13 +388,9 @@
# TODO: more asset price tests
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestAmount))
- suite.addTest(unittest.makeSuite(TestMovement))
- suite.addTest(unittest.makeSuite(TestAccountingTransactionLine))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestAmount))
+ suite.addTest(unittest.makeSuite(TestMovement))
+ suite.addTest(unittest.makeSuite(TestAccountingTransactionLine))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testBug.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testBug.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testBug.py (original)
+++ erp5/trunk/products/ERP5/tests/testBug.py Mon Sep 17 19:28:44 2007
@@ -29,25 +29,12 @@
##############################################################################
-import os
-from zLOG import LOG
-from Testing import ZopeTestCase
+import unittest
from DateTime import DateTime
-from Products.CMFCore.utils import getToolByName
-from Products.ERP5Type.Utils import convertToUpperCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.Sequence import SequenceList
from Products.ERP5Type.tests.utils import DummyMailHost
from AccessControl.SecurityManagement import newSecurityManager
-
-
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
class TestBug(ERP5TypeTestCase):
@@ -243,12 +230,7 @@
sequence_list.play(self, quiet=quiet)
-
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestBug))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestBug))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testBusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testBusinessTemplate.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testBusinessTemplate.py (original)
+++ erp5/trunk/products/ERP5/tests/testBusinessTemplate.py Mon Sep 17 19:28:44 2007
@@ -26,15 +26,7 @@
#
##############################################################################
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+import unittest
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
@@ -4250,15 +4242,7 @@
self.assertRaises(BusinessTemplateMissingDependency, bt5.checkDependencies)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestBusinessTemplate))
- return suite
-
-
-
-# vim: filetype=python syntax=python shiftwidth=2
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestBusinessTemplate))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testDivergenceTester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testDivergenceTester.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testDivergenceTester.py (original)
+++ erp5/trunk/products/ERP5/tests/testDivergenceTester.py Mon Sep 17 19:28:44 2007
@@ -26,33 +26,10 @@
#
##############################################################################
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
+import unittest
+
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, \
- noSecurityManager
-from DateTime import DateTime
-from Acquisition import aq_base, aq_inner
-from zLOG import LOG
-from Products.ERP5Type.DateUtils import addToDate
-from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
-import time
-import os
-from Products.ERP5Type import product_path
-from Products.CMFCore.utils import getToolByName
+from Products.ERP5Type.tests.Sequence import SequenceList
from testPackingList import TestPackingListMixin
class TestDivergenceTester(TestPackingListMixin, ERP5TypeTestCase):
@@ -359,11 +336,9 @@
'
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self, quiet=self.quiet)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestDivergenceTester))
- return suite
+
+
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestDivergenceTester))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testDomainTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testDomainTool.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testDomainTool.py (original)
+++ erp5/trunk/products/ERP5/tests/testDomainTool.py Mon Sep 17 19:28:44 2007
@@ -26,31 +26,12 @@
#
##############################################################################
-
-
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
+import unittest
+
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from DateTime import DateTime
-from Products.ERP5.Document.Person import Person
-from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
-from Products.ERP5SyncML.Conduit.ERP5Conduit import ERP5Conduit
-from Products.ERP5SyncML.SyncCode import SyncCode
+from AccessControl.SecurityManagement import newSecurityManager
from zLOG import LOG
-import time
class TestDomainTool(ERP5TypeTestCase):
@@ -418,12 +399,8 @@
'variation/%s/blue' % self.resource.getRelativeUrl()]),
sort_method=sort_method),45)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestDomainTool))
- return suite
-
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestDomainTool))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testERP5Budget.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5Budget.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5Budget.py (original)
+++ erp5/trunk/products/ERP5/tests/testERP5Budget.py Mon Sep 17 19:28:44 2007
@@ -25,32 +25,13 @@
#
##############################################################################
-#
-# ZopeTestCase Skeleton
-#
-
-
-import os
+import unittest
+
from zLOG import LOG
from Testing import ZopeTestCase
-from DateTime import DateTime
-from Products.CMFCore.utils import getToolByName
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.ERP5Type.tests.Sequence import SequenceList
from AccessControl.SecurityManagement import newSecurityManager
from Products.ERP5Type.Utils import convertToUpperCase
-from Products.CMFCore.utils import getToolByName
-
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-
-from Products.ERP5.Document.Person import Person
-from Products.ERP5.Document.Organisation import Organisation
@@ -555,13 +536,7 @@
LOG('Testing budget transaction 2... ',0,message)
-
-
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestBudget))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestBudget))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testERP5Core.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5Core.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5Core.py (original)
+++ erp5/trunk/products/ERP5/tests/testERP5Core.py Mon Sep 17 19:28:44 2007
@@ -27,15 +27,7 @@
#
##############################################################################
-import os
-import sys
-
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+import unittest
from AccessControl.SecurityManagement import newSecurityManager
from Testing import ZopeTestCase
@@ -250,12 +242,8 @@
module_portal_type,
self.portal.getDefaultModule(module_portal_type).getPortalType())
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestERP5Core))
- return suite
-
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestERP5Core))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testGeographicalAddress.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testGeographicalAddress.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testGeographicalAddress.py (original)
+++ erp5/trunk/products/ERP5/tests/testGeographicalAddress.py Mon Sep 17 19:28:44 2007
@@ -25,18 +25,12 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+
+import unittest
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, \
- noSecurityManager
-from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
+from AccessControl.SecurityManagement import newSecurityManager
+from Products.ERP5Type.tests.Sequence import SequenceList
from Products.ERP5Type.tests.utils import createZODBPythonScript
class TestGeographicalAddress(ERP5TypeTestCase):
@@ -206,11 +200,7 @@
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestGeographicalAddress))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestGeographicalAddress))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testICal.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testICal.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testICal.py (original)
+++ erp5/trunk/products/ERP5/tests/testICal.py Mon Sep 17 19:28:44 2007
@@ -33,38 +33,15 @@
It will be fixed some day.
"""
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
+import unittest
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.CMFCore.utils import getToolByName
from AccessControl.SecurityManagement import newSecurityManager
-from zLOG import LOG
-from glob import glob
-import time
-
-from xml.dom.minidom import parseString
try:
from transaction import get as get_transaction
except ImportError:
pass
-
-#
-# Test Setting
-#
-INSTANCE_HOME = os.environ['INSTANCE_HOME']
-bt5_path = glob(os.path.join(INSTANCE_HOME, 'bt5', '*'))[0]
-# dependency order
-target_business_templates = (
-)
-
class TestICal(ERP5TypeTestCase):
@@ -208,11 +185,7 @@
self.assertEquals(feed_dict['PERCENT-COMPLETE'], '100')
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestICal))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestICal))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testImmobilisation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testImmobilisation.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testImmobilisation.py (original)
+++ erp5/trunk/products/ERP5/tests/testImmobilisation.py Mon Sep 17 19:28:44 2007
@@ -27,31 +27,13 @@
##############################################################################
-
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
+import unittest
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
-from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
-from Products.DCWorkflow.DCWorkflow import Unauthorized, ValidationFailed
+from Products.ERP5Type.tests.Sequence import SequenceList
from DateTime import DateTime
-from Acquisition import aq_base, aq_inner
from zLOG import LOG
from testOrder import TestOrderMixin
-import time
from Products.ERP5.Document.ImmobilisationMovement import UNIMMOBILISING_METHOD, NO_CHANGE_METHOD
try:
@@ -3863,14 +3845,8 @@
sequence_list.play(self)
-
-
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestImmobilisation))
- return suite
-
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestImmobilisation))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testInteractionWorkflow.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInteractionWorkflow.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInteractionWorkflow.py (original)
+++ erp5/trunk/products/ERP5/tests/testInteractionWorkflow.py Mon Sep 17 19:28:44 2007
@@ -26,29 +26,12 @@
#
##############################################################################
-
-
-#
-# Skeleton ZopeTestCase
-#
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
+import unittest
+
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.Base import _aq_reset
from Products.ERP5.Document.Organisation import Organisation
-from DateTime import DateTime
-from Products.ERP5.Document.Person import Person
-from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
-from zLOG import LOG
-import time
+from AccessControl.SecurityManagement import newSecurityManager
class TestInteractionWorkflow(ERP5TypeTestCase):
@@ -442,12 +425,9 @@
# - interaction:setVatCode(bara)
self.assertEquals(organisation.getVatCode(),'bara')
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestInteractionWorkflow))
- return suite
-
+
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestInteractionWorkflow))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testInventory.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInventory.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInventory.py (original)
+++ erp5/trunk/products/ERP5/tests/testInventory.py Mon Sep 17 19:28:44 2007
@@ -39,31 +39,16 @@
# aggregated item ?
-from random import randint
+import unittest
from Products.ERP5Type.Utils import cartesianProduct
from copy import copy
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
+
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, \
- noSecurityManager
from DateTime import DateTime
-from Acquisition import aq_base, aq_inner
from zLOG import LOG
-from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
+from Products.ERP5Type.tests.Sequence import SequenceList
from Products.ERP5Type.DateUtils import addToDate
-import time
-import os
-from Products.ERP5Type import product_path
-from Products.CMFCore.utils import getToolByName
from testOrder import TestOrderMixin
from Products.ERP5Form.Selection import DomainSelection
@@ -1909,12 +1894,8 @@
sequence_list.play(self)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestInventory))
- return suite
-
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestInventory))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testInventoryAPI.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInventoryAPI.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInventoryAPI.py (original)
+++ erp5/trunk/products/ERP5/tests/testInventoryAPI.py Mon Sep 17 19:28:44 2007
@@ -32,12 +32,9 @@
"""
-import sys
+import os
import random
-import os
-
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
+import unittest
from AccessControl.SecurityManagement import newSecurityManager
from DateTime import DateTime
@@ -46,10 +43,6 @@
from Products.ERP5.Document.OrderRule import OrderRule
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import reindex
-
-# Needed in order to have a log file inside the current folder
-os.environ.setdefault('EVENT_LOG_FILE', 'zLOG.log')
-os.environ.setdefault('EVENT_LOG_SEVERITY', '-300')
class InventoryAPITestCase(ERP5TypeTestCase):
"""Base class for Inventory API Tests {{{
@@ -1829,20 +1822,16 @@
self._checkInventoryList(inventory, reference_inventory,
ordered_check=True)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestInventory))
- suite.addTest(unittest.makeSuite(TestInventoryList))
- suite.addTest(unittest.makeSuite(TestMovementHistoryList))
- suite.addTest(unittest.makeSuite(TestInventoryStat))
- suite.addTest(unittest.makeSuite(TestNextNegativeInventoryDate))
- suite.addTest(unittest.makeSuite(TestInventoryStat))
- suite.addTest(unittest.makeSuite(TestTrackingList))
- suite.addTest(unittest.makeSuite(TestInventoryDocument))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestInventory))
+ suite.addTest(unittest.makeSuite(TestInventoryList))
+ suite.addTest(unittest.makeSuite(TestMovementHistoryList))
+ suite.addTest(unittest.makeSuite(TestInventoryStat))
+ suite.addTest(unittest.makeSuite(TestNextNegativeInventoryDate))
+ suite.addTest(unittest.makeSuite(TestInventoryStat))
+ suite.addTest(unittest.makeSuite(TestTrackingList))
+ suite.addTest(unittest.makeSuite(TestInventoryDocument))
+ return suite
# vim: foldmethod=marker
Modified: erp5/trunk/products/ERP5/tests/testInvoiceVAT.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInvoiceVAT.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInvoiceVAT.py (original)
+++ erp5/trunk/products/ERP5/tests/testInvoiceVAT.py Mon Sep 17 19:28:44 2007
@@ -29,13 +29,7 @@
Tests VAT for invoices.
"""
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ.setdefault('EVENT_LOG_FILE', 'zLOG.log')
-os.environ.setdefault('EVENT_LOG_SEVERITY', '-300')
+import unittest
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from AccessControl.SecurityManagement import newSecurityManager
@@ -509,12 +503,8 @@
self._checkInvoiceVAT(invoice, total_price, vat_ratio,
total_vat_amount)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestInvoiceVAT))
- return suite
-
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestInvoiceVAT))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testOrder.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testOrder.py (original)
+++ erp5/trunk/products/ERP5/tests/testOrder.py Mon Sep 17 19:28:44 2007
@@ -27,32 +27,13 @@
#
##############################################################################
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
+import unittest
+
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, \
- noSecurityManager
+from AccessControl.SecurityManagement import newSecurityManager
from DateTime import DateTime
-from Acquisition import aq_base, aq_inner
from zLOG import LOG
-from Products.ERP5Type.DateUtils import addToDate
-from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
-import time
-import os
-from Products.ERP5Type import product_path
+from Products.ERP5Type.tests.Sequence import SequenceList
from Products.CMFCore.utils import getToolByName
class TestOrderMixin:
@@ -1812,11 +1793,7 @@
# if not run: return
# self.failUnless(1==2)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestOrder))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestOrder))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testPackingList.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testPackingList.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testPackingList.py (original)
+++ erp5/trunk/products/ERP5/tests/testPackingList.py Mon Sep 17 19:28:44 2007
@@ -26,33 +26,11 @@
#
##############################################################################
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
+import unittest
+
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, \
- noSecurityManager
-from DateTime import DateTime
-from Acquisition import aq_base, aq_inner
from zLOG import LOG
-from Products.ERP5Type.DateUtils import addToDate
-from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
-import time
-import os
-from Products.ERP5Type import product_path
-from Products.CMFCore.utils import getToolByName
+from Products.ERP5Type.tests.Sequence import SequenceList
from testOrder import TestOrderMixin
class TestPackingListMixin(TestOrderMixin):
@@ -916,12 +894,8 @@
).newContent(portal_type=self.packing_list_portal_type)
self.failUnless(hasattr(pl, 'getPriceCurrency'))
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestPackingList))
- return suite
-
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestPackingList))
+ return suite
+
Modified: erp5/trunk/products/ERP5/tests/testPackingListRoundingPrecision.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testPackingListRoundingPrecision.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testPackingListRoundingPrecision.py (original)
+++ erp5/trunk/products/ERP5/tests/testPackingListRoundingPrecision.py Mon Sep 17 19:28:44 2007
@@ -26,6 +26,7 @@
#
##############################################################################
+import unittest
from testPackingList import TestPackingList
class TestPackingListRoundingPrecision(TestPackingList):
@@ -38,11 +39,7 @@
def getTitle(self):
return "Packing List Rounding Precision"
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestPackingListRoundingPrecision))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestPackingListRoundingPrecision))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testPerson.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testPerson.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testPerson.py (original)
+++ erp5/trunk/products/ERP5/tests/testPerson.py Mon Sep 17 19:28:44 2007
@@ -26,24 +26,10 @@
#
##############################################################################
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
+import unittest
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from AccessControl.SecurityManagement import newSecurityManager
-from zLOG import LOG
-import time
-try:
- from transaction import get as get_transaction
-except ImportError:
- pass
class TestPerson(ERP5TypeTestCase):
@@ -134,11 +120,7 @@
title='title' )
# no infinite loop :) but there's no guarantee on the behaviour
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestPerson))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestPerson))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testProductionOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testProductionOrder.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionOrder.py (original)
+++ erp5/trunk/products/ERP5/tests/testProductionOrder.py Mon Sep 17 19:28:44 2007
@@ -27,32 +27,11 @@
#
##############################################################################
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
+import unittest
+
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, \
- noSecurityManager
-from DateTime import DateTime
-from Acquisition import aq_base, aq_inner
from zLOG import LOG
-from Products.ERP5Type.DateUtils import addToDate
-from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
-import time
-import os
-from Products.ERP5Type import product_path
+from Products.ERP5Type.tests.Sequence import SequenceList
from Products.CMFCore.utils import getToolByName
from testOrder import TestOrderMixin
@@ -1152,11 +1131,7 @@
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestProductionOrder))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestProductionOrder))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testPurchaseOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testPurchaseOrder.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testPurchaseOrder.py (original)
+++ erp5/trunk/products/ERP5/tests/testPurchaseOrder.py Mon Sep 17 19:28:44 2007
@@ -26,21 +26,7 @@
#
##############################################################################
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from zLOG import LOG
+import unittest
from testOrder import TestOrder
@@ -61,12 +47,8 @@
def getTitle(self):
return "Purchase Order"
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestPurchaseOrder))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestPurchaseOrder))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testRSS.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testRSS.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testRSS.py (original)
+++ erp5/trunk/products/ERP5/tests/testRSS.py Mon Sep 17 19:28:44 2007
@@ -25,21 +25,10 @@
#
##############################################################################
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
+import unittest
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.CMFCore.utils import getToolByName
from AccessControl.SecurityManagement import newSecurityManager
-from zLOG import LOG
-from glob import glob
-import time
from xml.dom.minidom import parseString
@@ -48,14 +37,6 @@
except ImportError:
pass
-#
-# Test Setting
-#
-INSTANCE_HOME = os.environ['INSTANCE_HOME']
-bt5_path = glob(os.path.join(INSTANCE_HOME, 'bt5', '*'))[0]
-# dependency order
-target_business_templates = (
-)
def getNodeContent(node):
return node.childNodes[0].nodeValue
@@ -133,11 +114,7 @@
self.assertEquals(one.getCreationDate().rfc822(), getSubnodeContent(item, 'pubDate'))
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestRSS))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestRSS))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testResource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testResource.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testResource.py (original)
+++ erp5/trunk/products/ERP5/tests/testResource.py Mon Sep 17 19:28:44 2007
@@ -26,29 +26,14 @@
#
##############################################################################
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+import unittest
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, \
- noSecurityManager
-from DateTime import DateTime
-from Acquisition import aq_base, aq_inner
+from AccessControl.SecurityManagement import newSecurityManager
from zLOG import LOG
-from Products.ERP5Type.DateUtils import addToDate
-from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
-import time
-import os
-from Products.ERP5Type import product_path
-from Products.CMFCore.utils import getToolByName
+from Products.ERP5Type.tests.Sequence import SequenceList
+
class TestResource(ERP5TypeTestCase):
"""
@@ -760,11 +745,8 @@
resource.setBaseUnitQuantity(0.001)
self.assertEquals(3, resource.getQuantityPrecision())
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestResource))
- return suite
+
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestResource))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testTrashTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testTrashTool.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testTrashTool.py (original)
+++ erp5/trunk/products/ERP5/tests/testTrashTool.py Mon Sep 17 19:28:44 2007
@@ -26,26 +26,14 @@
#
##############################################################################
-#
-# Skeleton ZopeTestCase
-#
-
-from random import randint
-
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
-
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
+import unittest
from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
+from AccessControl.SecurityManagement import newSecurityManager
from zLOG import LOG
-from App.config import getConfiguration
-from Products.ERP5Type.tests.Sequence import Sequence, SequenceList
+from Products.ERP5Type.tests.Sequence import SequenceList
+
class TestTrashTool(ERP5TypeTestCase):
"""
@@ -400,11 +388,7 @@
sequence_list.play(self, quiet=quiet)
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestTrashTool))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestTrashTool))
+ return suite
Modified: erp5/trunk/products/ERP5/tests/testXHTML.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testXHTML.py?rev=16429&r1=16428&r2=16429&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testXHTML.py (original)
+++ erp5/trunk/products/ERP5/tests/testXHTML.py Mon Sep 17 19:28:44 2007
@@ -25,21 +25,13 @@
#
##############################################################################
-import os, sys
-if __name__ == '__main__':
- execfile(os.path.join(sys.path[0], 'framework.py'))
+import unittest
+import os
-# Needed in order to have a log file inside the current folder
-os.environ['EVENT_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log')
-os.environ['EVENT_LOG_SEVERITY'] = '-300'
-
-from Testing import ZopeTestCase
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.CMFCore.utils import getToolByName
from AccessControl.SecurityManagement import newSecurityManager
-from zLOG import LOG
from glob import glob
-import time
try:
from transaction import get as get_transaction
@@ -198,11 +190,7 @@
addTestMethodDynamically()
-if __name__ == '__main__':
- framework()
-else:
- import unittest
- def test_suite():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestXHTML))
- return suite
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTest(unittest.makeSuite(TestXHTML))
+ return suite
More information about the Erp5-report
mailing list