Ignore:
Timestamp:
12/02/09 17:40:48 (11 years ago)
Author:
cbyrom
Message:

Various fixes, tidy ups and simplications to ndgCommon codebase.

Location:
ndgCommon/trunk/ndg/common/unittests
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ndgCommon/trunk/ndg/common/unittests/lib/testatomvalidator.py

    r4943 r4970  
    2020        self.utils = tu(tc.EXIST_DBCONFIG_FILE) 
    2121        self.atom = self.utils.createAtom(tc.xmlString) 
    22         self.v = v(self.atom, tc.EXIST_DBCONFIG_FILE, dbHostName = tc.EXIST_DB) 
    23         #self.createdAtoms = []    # array to store paths to atoms created - in order to then delete them 
    24         #self.createdAtoms.append(self.atom.getFullPath()) 
    25          
    26     #def tearDown(self): 
    27     #    for path  in self.createdAtoms: 
    28     #        # delete the test file, in case it has been used in a test 
    29     #        self.utils.deleteDoc(path) 
     22        self.v = v(self.atom, dbConfigFile = tc.EXIST_DBCONFIG_FILE,  
     23                   dbHostName = tc.EXIST_DB) 
    3024 
    3125    def __setInvalidAtom(self): 
  • ndgCommon/trunk/ndg/common/unittests/lib/testgranulite.py

    r4943 r4970  
    2222        ''' 
    2323        self.utils = tu(tc.EXIST_DBCONFIG_FILE) 
    24         self.g = granulite(tc.TEST_GRANULITE, eXistClient = self.utils.ac) 
     24        self.g = granulite(tc.VALID_TEST_GRANULITE, eXistClient = self.utils.ac) 
    2525 
    2626    def createGranuliteDEs(self): 
  • ndgCommon/trunk/ndg/common/unittests/testconstants.py

    r4937 r4970  
    4343TEST_FILE_PATH = TEST_COLLECTION_PATH + '/' + TEST_FILE_NAME 
    4444 
    45 EXIST_DB = 'chinook.badc.rl.ac.uk' 
     45EXIST_DB = 'chinook.badc.rl.ac.uk'#'localhost' 
    4646PG_DBCONFIG_FILE = TEST_DATA_DIR + 'pg.config' 
    4747EXIST_DBCONFIG_FILE = TEST_DATA_DIR + 'exist.config' 
    48 TEST_GRANULITE = TEST_DATA_DIR + 'example.granulite' 
     48INVALID_TEST_GRANULITE = TEST_DATA_DIR + 'example.granulite' 
     49VALID_TEST_GRANULITE = TEST_DATA_DIR + 'example.granulite' 
    4950MOLES_FILE_NAME = TEST_DATA_DIR + 'dataent_TESTDATA.xml' 
    5051VALID_MOLES_ID = 'dataent_TESTDATA' 
Note: See TracChangeset for help on using the changeset viewer.