Changeset 11

Show
Ignore:
Timestamp:
07/24/06 19:59:51 (2 years ago)
Author:
johnbywater
Message:

Reworked building of test application and model.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bin/domainmodel-test

    r5 r11  
    1313import unittest 
    1414from optparse import OptionParser 
     15from dm.testunit import ApplicationTestSuite 
     16ApplicationTestSuite.buildApplication() 
    1517 
    1618if __name__ == "__main__": 

  • trunk/src/dm/test.py

    r9 r11  
    1212import dm.applicationtest 
    1313import dm.viewtest 
     14from dm.testunit import ApplicationTestSuite 
    1415 
    1516def suite(): 
    …… 
    2728        dm.viewtest.suite(), 
    2829    ] 
    29     return unittest.TestSuite(suites) 
     30    return ApplicationTestSuite(suites) 
    3031 

  • trunk/src/dm/testbase.py

    r8 r11  
    44    pass 
    55 
    6 TestBase.buildApplication() 
    7  

  • trunk/src/dm/testunit.py

    r8 r11  
     1""" 
     2Module of extensions to the unittest suite. 
     3 
     4(This module wanted to be called dm.unittest but that breaks "import unittest".) 
     5 
     6""" 
     7 
    18import unittest 
    29import dm.builder 
    …… 
    512features.allowReplace = True 
    613 
     14class ApplicationTestSuite(unittest.TestSuite): 
     15 
     16    appBuilderClass = dm.builder.ApplicationBuilder 
     17 
     18    def buildApplication(self): 
     19        appBuilder = self.appBuilderClass() 
     20        appBuilder.construct() 
     21        domBuilder = RequiredFeature('ModelBuilder') 
     22        domBuilder.construct() 
     23 
     24    buildApplication = classmethod(buildApplication) 
     25  
     26 
    727class TestCase(unittest.TestCase): 
    8  
    9     builderClass = dm.builder.ApplicationBuilder 
    1028 
    1129    dictionary   = RequiredFeature('SystemDictionary') 
    1230    registry     = RequiredFeature('DomainRegistry') 
    13          
     31 
    1432    def __init__(self, *args, **kwds): 
    1533        super(TestCase, self).__init__(*args, **kwds) 
    16          
    17     def setUp(self): 
    18         super(TestCase, self).setUp() 
    1934 
    20     def tearDown(self): 
    21         super(TestCase, self).tearDown() 
    22  
    23     def buildApplication(self): 
    24         appBuilder = self.builderClass() 
    25         appBuilder.construct() 
    26         domBuilder = RequiredFeature('ModelBuilder') 
    27         domBuilder.construct() 
    28          
    29     buildApplication = classmethod(buildApplication) 
    30