Changeset 4849
- Timestamp:
- 20/01/09 14:36:40 (12 years ago)
- Location:
- ndgCommon/trunk/ndg/common
- Files:
-
- 2 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
ndgCommon/trunk/ndg/common/unittests/clients/xmldb/eXist/test_eXistInterface.py
r4793 r4849 7 7 ''' Try to connect to the exist databases available ''' 8 8 try: 9 self.pwf= tc. DBCONFIG_FILE9 self.pwf= tc.EXIST_DBCONFIG_FILE 10 10 f=open(self.pwf,'r') 11 11 pw={} -
ndgCommon/trunk/ndg/common/unittests/clients/xmldb/eXist/testexistdbclient.py
r4844 r4849 29 29 ''' 30 30 self.createdAtoms = [] # array to store paths to atoms created - in order to then delete them 31 self.confFile = tc. DBCONFIG_FILE31 self.confFile = tc.EXIST_DBCONFIG_FILE 32 32 self.utils = tu(self.confFile) 33 33 -
ndgCommon/trunk/ndg/common/unittests/clients/xmldb/eXist/testexistdbfeedclient.py
r4810 r4849 27 27 ''' 28 28 self.createdAtoms = [] # array to store paths to atoms created - in order to then delete them 29 self.confFile = tc. DBCONFIG_FILE29 self.confFile = tc.EXIST_DBCONFIG_FILE 30 30 self.utils = tu(self.confFile) 31 31 self.feedClient = feedClient(self.utils.dbc.xmldb.auth, -
ndgCommon/trunk/ndg/common/unittests/dal/test_DocumentRetrieve.py
r4793 r4849 29 29 set up data used in the tests. 30 30 ''' 31 self.pwf = tc. DBCONFIG_FILE31 self.pwf = tc.EXIST_DBCONFIG_FILE 32 32 33 33 … … 110 110 111 111 def testGetAtom(self): 112 utils = tu(tc. DBCONFIG_FILE)112 utils = tu(tc.EXIST_DBCONFIG_FILE) 113 113 createdAtom = utils.createAtomInEXist(tc.xmlString) 114 114 dr = DocumentRetrieve.DocumentRetrieve(tc.VALID_REPOSITORY, … … 126 126 127 127 def testGetAtomBackup(self): 128 utils = tu(tc. DBCONFIG_FILE)128 utils = tu(tc.EXIST_DBCONFIG_FILE) 129 129 createdAtom = utils.createAtomInEXist(tc.xmlString) 130 130 createdAtom = utils.createAtomInEXist(tc.xmlString) -
ndgCommon/trunk/ndg/common/unittests/dal/test_ndgDirectory.py
r4793 r4849 11 11 self.ndgDir=ndgDirectory('/db/discovery/original/DIF/badc.nerc.ac.uk', 12 12 self.GLUE_DB, docType='DIF', 13 passwordFile = tc. DBCONFIG_FILE)13 passwordFile = tc.EXIST_DBCONFIG_FILE) 14 14 15 15 def testDirectory(self): … … 26 26 def testAtomDocsDirectory(self): 27 27 self.ndgDir=ndgDirectory('/db/atoms', self.CHINOOK_DB,docType='ATOM', 28 passwordFile = tc. DBCONFIG_FILE)28 passwordFile = tc.EXIST_DBCONFIG_FILE) 29 29 self.assertTrue(len(self.ndgDir.members) > 0) 30 30 self.assertTrue(len(self.ndgDir.files) > 0) … … 34 34 def testAtomCreationDates(self): 35 35 self.ndgDir=ndgDirectory('/db/atoms', self.CHINOOK_DB, docType='ATOM', 36 passwordFile = tc. DBCONFIG_FILE)36 passwordFile = tc.EXIST_DBCONFIG_FILE) 37 37 self.assertNotEqual(self.ndgDir.created(), None) 38 38 self.assertNotEqual(self.ndgDir.created(fileName=self.ndgDir.members[0]['fileName']), None) -
ndgCommon/trunk/ndg/common/unittests/dal/test_ndgRetrieve.py
r4793 r4849 79 79 def testRetrieveAtom(self): 80 80 '''Get an atom document ''' 81 utils = tu(tc. DBCONFIG_FILE)81 utils = tu(tc.EXIST_DBCONFIG_FILE) 82 82 createdAtom = utils.createAtomInEXist(tc.xmlString) 83 83 doc= tc.VALID_PROVIDER_ID + "__" + no.ATOM_DOC_TYPE + \ … … 99 99 def testRetrieveAtomBackup(self): 100 100 '''Get a backed up atom document ''' 101 utils = tu(tc. DBCONFIG_FILE)101 utils = tu(tc.EXIST_DBCONFIG_FILE) 102 102 createdAtom = utils.createAtomInEXist(tc.xmlString) 103 103 createdAtom = utils.createAtomInEXist(tc.xmlString) -
ndgCommon/trunk/ndg/common/unittests/lib/testatomvalidator.py
r4793 r4849 18 18 set up data used in the tests. 19 19 ''' 20 self.atom = tu(tc. DBCONFIG_FILE).createAtom(tc.xmlString)21 self.v = v(self.atom, tc. DBCONFIG_FILE)20 self.atom = tu(tc.EXIST_DBCONFIG_FILE).createAtom(tc.xmlString) 21 self.v = v(self.atom, tc.EXIST_DBCONFIG_FILE) 22 22 23 23 def __setInvalidAtom(self): 24 24 #self.atom = tc.createAtom(tc.invalidXmlString) 25 self.atom = tu(tc. DBCONFIG_FILE).createAtom(tc.invalidXmlString)25 self.atom = tu(tc.EXIST_DBCONFIG_FILE).createAtom(tc.invalidXmlString) 26 26 self.v.setAtom(self.atom) 27 27 -
ndgCommon/trunk/ndg/common/unittests/lib/testexistinitialiser.py
r4835 r4849 16 16 set up data used in the tests. 17 17 ''' 18 self.utils = tu(tc. DBCONFIG_FILE)18 self.utils = tu(tc.EXIST_DBCONFIG_FILE) 19 19 self.ei = ei(self.utils.dbc) 20 20 logging.basicConfig(level=logging.DEBUG, -
ndgCommon/trunk/ndg/common/unittests/lib/testgranulite.py
r4793 r4849 24 24 set up data used in the tests. 25 25 ''' 26 self.utils = tu(tc. DBCONFIG_FILE)26 self.utils = tu(tc.EXIST_DBCONFIG_FILE) 27 27 self.g = granulite(tc.TEST_GRANULITE, eXistClient = self.utils.dbc) 28 28 -
ndgCommon/trunk/ndg/common/unittests/models/test_ndgObject.py
r4793 r4849 89 89 tc.datasetID 90 90 91 self.utils = tu(tc. DBCONFIG_FILE)91 self.utils = tu(tc.EXIST_DBCONFIG_FILE) 92 92 atom = self.utils.createAtomInEXist(tc.xmlString) 93 93 n=no(uri,self.config) -
ndgCommon/trunk/ndg/common/unittests/models/test_xqueries.py
r4793 r4849 16 16 def setUp(self): 17 17 ''' Automatically run before test cases ''' 18 self.pwf= tc. DBCONFIG_FILE18 self.pwf= tc.EXIST_DBCONFIG_FILE 19 19 f='test.config' 20 20 self.c=ConfigParser.ConfigParser() -
ndgCommon/trunk/ndg/common/unittests/models/testatom.py
r4810 r4849 32 32 self.link2.rel = 'self' 33 33 self.createdAtoms = [] # array to store paths to atoms created - in order to then delete them 34 self.utils = tu(tc. DBCONFIG_FILE)34 self.utils = tu(tc.EXIST_DBCONFIG_FILE) 35 35 36 36 … … 219 219 self.createdAtoms.append(atom.getFullPath()) 220 220 dr = DocumentRetrieve(tc.VALID_REPOSITORY, 221 pwfile = tc. DBCONFIG_FILE)221 pwfile = tc.EXIST_DBCONFIG_FILE) 222 222 223 223 atom.lookupAssociatedData(VTD.DE_TERM, dr) … … 228 228 self.createdAtoms.append(atom.getFullPath()) 229 229 dr = DocumentRetrieve(tc.VALID_REPOSITORY, 230 pwfile = tc. DBCONFIG_FILE)230 pwfile = tc.EXIST_DBCONFIG_FILE) 231 231 232 232 atom.lookupAssociatedData(VTD.DEPLOYMENT_TERM, dr) … … 237 237 self.createdAtoms.append(atom.getFullPath()) 238 238 dr = DocumentRetrieve(tc.VALID_REPOSITORY, 239 pwfile = tc. DBCONFIG_FILE)239 pwfile = tc.EXIST_DBCONFIG_FILE) 240 240 241 241 atom.lookupAssociatedData(VTD.DEPLOYMENT_TERM, dr, … … 247 247 self.createdAtoms.append(atom.getFullPath()) 248 248 dr = DocumentRetrieve(tc.VALID_REPOSITORY, 249 pwfile = tc. DBCONFIG_FILE)249 pwfile = tc.EXIST_DBCONFIG_FILE) 250 250 251 251 atom.lookupAssociatedData(VTD.DE_TERM, dr, -
ndgCommon/trunk/ndg/common/unittests/testconstants.py
r4810 r4849 37 37 38 38 39 DBCONFIG_FILE = TEST_DATA_DIR + 'exist.config' 39 PG_DBCONFIG_FILE = TEST_DATA_DIR + 'pg.config' 40 EXIST_DBCONFIG_FILE = TEST_DATA_DIR + 'exist.config' 40 41 TEST_GRANULITE = TEST_DATA_DIR + 'example.granulite' 41 42
Note: See TracChangeset
for help on using the changeset viewer.