Changeset 4849

Timestamp:

20/01/09 14:36:40 (12 years ago)

Author:

cbyrom

Message:

Add postgres config file to test constants - and rename exist config
file to allow the two to be distinguished.

Location:

ndgCommon/trunk/ndg/common

Files:

• src/lib/fileutilities.pyc (deleted)
• unittests/clients/xmldb/eXist/test_eXistInterface.py (modified) (1 diff)
• unittests/clients/xmldb/eXist/testexistdbclient.py (modified) (1 diff)
• unittests/clients/xmldb/eXist/testexistdbfeedclient.py (modified) (1 diff)
• unittests/dal/test_DocumentRetrieve.py (modified) (3 diffs)
• unittests/dal/test_ndgDirectory.py (modified) (3 diffs)
• unittests/dal/test_ndgRetrieve.py (modified) (2 diffs)
• unittests/lib/testatomvalidator.py (modified) (1 diff)
• unittests/lib/testexistinitialiser.py (modified) (1 diff)
• unittests/lib/testgranulite.py (modified) (1 diff)
• unittests/lib/testutilities.pyc (deleted)
• unittests/models/test_ndgObject.py (modified) (1 diff)
• unittests/models/test_xqueries.py (modified) (1 diff)
• unittests/models/testatom.py (modified) (5 diffs)
• unittests/testconstants.py (modified) (1 diff)

ndgCommon/trunk/ndg/common/unittests/clients/xmldb/eXist/test_eXistInterface.py

@@ -7 +7 @@
         ''' Try to connect to the exist databases available '''
         try:
-            self.pwf= tc.DBCONFIG_FILE
+            self.pwf= tc.EXIST_DBCONFIG_FILE
             f=open(self.pwf,'r')
             pw={}

ndgCommon/trunk/ndg/common/unittests/clients/xmldb/eXist/testexistdbclient.py

@@ -29 +29 @@
         '''
         self.createdAtoms = []    # array to store paths to atoms created - in order to then delete them
-        self.confFile = tc.DBCONFIG_FILE
+        self.confFile = tc.EXIST_DBCONFIG_FILE
         self.utils = tu(self.confFile)
 

ndgCommon/trunk/ndg/common/unittests/clients/xmldb/eXist/testexistdbfeedclient.py

@@ -27 +27 @@
         '''
         self.createdAtoms = []    # array to store paths to atoms created - in order to then delete them
-        self.confFile = tc.DBCONFIG_FILE
+        self.confFile = tc.EXIST_DBCONFIG_FILE
         self.utils = tu(self.confFile)
         self.feedClient = feedClient(self.utils.dbc.xmldb.auth,

ndgCommon/trunk/ndg/common/unittests/dal/test_DocumentRetrieve.py

@@ -29 +29 @@
         set up data used in the tests.
         '''
-        self.pwf = tc.DBCONFIG_FILE
+        self.pwf = tc.EXIST_DBCONFIG_FILE
 
 
@@ -110 +110 @@
                         
     def testGetAtom(self):
-        utils = tu(tc.DBCONFIG_FILE)
+        utils = tu(tc.EXIST_DBCONFIG_FILE)
         createdAtom = utils.createAtomInEXist(tc.xmlString)
         dr = DocumentRetrieve.DocumentRetrieve(tc.VALID_REPOSITORY,
@@ -126 +126 @@
                         
     def testGetAtomBackup(self):
-        utils = tu(tc.DBCONFIG_FILE)
+        utils = tu(tc.EXIST_DBCONFIG_FILE)
         createdAtom = utils.createAtomInEXist(tc.xmlString)
         createdAtom = utils.createAtomInEXist(tc.xmlString)

ndgCommon/trunk/ndg/common/unittests/dal/test_ndgDirectory.py

@@ -11 +11 @@
         self.ndgDir=ndgDirectory('/db/discovery/original/DIF/badc.nerc.ac.uk', 
                                  self.GLUE_DB, docType='DIF', 
-                                 passwordFile = tc.DBCONFIG_FILE)
+                                 passwordFile = tc.EXIST_DBCONFIG_FILE)
     
     def testDirectory(self):
@@ -26 +26 @@
     def testAtomDocsDirectory(self):
         self.ndgDir=ndgDirectory('/db/atoms', self.CHINOOK_DB,docType='ATOM', 
-                                 passwordFile = tc.DBCONFIG_FILE)
+                                 passwordFile = tc.EXIST_DBCONFIG_FILE)
         self.assertTrue(len(self.ndgDir.members) > 0)
         self.assertTrue(len(self.ndgDir.files) > 0)
@@ -34 +34 @@
     def testAtomCreationDates(self):
         self.ndgDir=ndgDirectory('/db/atoms', self.CHINOOK_DB, docType='ATOM', 
-                                 passwordFile = tc.DBCONFIG_FILE)
+                                 passwordFile = tc.EXIST_DBCONFIG_FILE)
         self.assertNotEqual(self.ndgDir.created(), None)
         self.assertNotEqual(self.ndgDir.created(fileName=self.ndgDir.members[0]['fileName']), None)

ndgCommon/trunk/ndg/common/unittests/dal/test_ndgRetrieve.py

@@ -79 +79 @@
     def testRetrieveAtom(self):
         '''Get an atom document '''
-        utils = tu(tc.DBCONFIG_FILE)
+        utils = tu(tc.EXIST_DBCONFIG_FILE)
         createdAtom = utils.createAtomInEXist(tc.xmlString)
         doc= tc.VALID_PROVIDER_ID + "__" + no.ATOM_DOC_TYPE + \
@@ -99 +99 @@
     def testRetrieveAtomBackup(self):
         '''Get a backed up atom document '''
-        utils = tu(tc.DBCONFIG_FILE)
+        utils = tu(tc.EXIST_DBCONFIG_FILE)
         createdAtom = utils.createAtomInEXist(tc.xmlString)
         createdAtom = utils.createAtomInEXist(tc.xmlString)

ndgCommon/trunk/ndg/common/unittests/lib/testatomvalidator.py

@@ -18 +18 @@
         set up data used in the tests.
         '''
-        self.atom = tu(tc.DBCONFIG_FILE).createAtom(tc.xmlString)
-        self.v = v(self.atom, tc.DBCONFIG_FILE)
+        self.atom = tu(tc.EXIST_DBCONFIG_FILE).createAtom(tc.xmlString)
+        self.v = v(self.atom, tc.EXIST_DBCONFIG_FILE)
 
     def __setInvalidAtom(self):
         #self.atom = tc.createAtom(tc.invalidXmlString)
-        self.atom = tu(tc.DBCONFIG_FILE).createAtom(tc.invalidXmlString)
+        self.atom = tu(tc.EXIST_DBCONFIG_FILE).createAtom(tc.invalidXmlString)
         self.v.setAtom(self.atom)
         

ndgCommon/trunk/ndg/common/unittests/lib/testexistinitialiser.py

@@ -16 +16 @@
         set up data used in the tests.
         '''
-        self.utils = tu(tc.DBCONFIG_FILE)
+        self.utils = tu(tc.EXIST_DBCONFIG_FILE)
         self.ei = ei(self.utils.dbc)
         logging.basicConfig(level=logging.DEBUG,

ndgCommon/trunk/ndg/common/unittests/lib/testgranulite.py

@@ -24 +24 @@
         set up data used in the tests.
         '''
-        self.utils = tu(tc.DBCONFIG_FILE)
+        self.utils = tu(tc.EXIST_DBCONFIG_FILE)
         self.g = granulite(tc.TEST_GRANULITE, eXistClient = self.utils.dbc)
 

ndgCommon/trunk/ndg/common/unittests/models/test_ndgObject.py

@@ -89 +89 @@
             tc.datasetID
         
-        self.utils = tu(tc.DBCONFIG_FILE)
+        self.utils = tu(tc.EXIST_DBCONFIG_FILE)
         atom = self.utils.createAtomInEXist(tc.xmlString)
         n=no(uri,self.config)

ndgCommon/trunk/ndg/common/unittests/models/test_xqueries.py

@@ -16 +16 @@
     def setUp(self): 
         ''' Automatically run before test cases '''
-        self.pwf= tc.DBCONFIG_FILE
+        self.pwf= tc.EXIST_DBCONFIG_FILE
         f='test.config'
         self.c=ConfigParser.ConfigParser()

ndgCommon/trunk/ndg/common/unittests/models/testatom.py

@@ -32 +32 @@
         self.link2.rel = 'self'
         self.createdAtoms = []    # array to store paths to atoms created - in order to then delete them
-        self.utils = tu(tc.DBCONFIG_FILE)
+        self.utils = tu(tc.EXIST_DBCONFIG_FILE)
 
                 
@@ -219 +219 @@
         self.createdAtoms.append(atom.getFullPath())
         dr = DocumentRetrieve(tc.VALID_REPOSITORY,
-                              pwfile = tc.DBCONFIG_FILE)
+                              pwfile = tc.EXIST_DBCONFIG_FILE)
 
         atom.lookupAssociatedData(VTD.DE_TERM, dr)
@@ -228 +228 @@
         self.createdAtoms.append(atom.getFullPath())
         dr = DocumentRetrieve(tc.VALID_REPOSITORY,
-                              pwfile = tc.DBCONFIG_FILE)
+                              pwfile = tc.EXIST_DBCONFIG_FILE)
 
         atom.lookupAssociatedData(VTD.DEPLOYMENT_TERM, dr)
@@ -237 +237 @@
         self.createdAtoms.append(atom.getFullPath())
         dr = DocumentRetrieve(tc.VALID_REPOSITORY,
-                              pwfile = tc.DBCONFIG_FILE)
+                              pwfile = tc.EXIST_DBCONFIG_FILE)
 
         atom.lookupAssociatedData(VTD.DEPLOYMENT_TERM, dr,
@@ -247 +247 @@
         self.createdAtoms.append(atom.getFullPath())
         dr = DocumentRetrieve(tc.VALID_REPOSITORY,
-                              pwfile = tc.DBCONFIG_FILE)
+                              pwfile = tc.EXIST_DBCONFIG_FILE)
 
         atom.lookupAssociatedData(VTD.DE_TERM, dr,

ndgCommon/trunk/ndg/common/unittests/testconstants.py

@@ -37 +37 @@
 
 
-DBCONFIG_FILE = TEST_DATA_DIR + 'exist.config'
+PG_DBCONFIG_FILE = TEST_DATA_DIR + 'pg.config'
+EXIST_DBCONFIG_FILE = TEST_DATA_DIR + 'exist.config'
 TEST_GRANULITE = TEST_DATA_DIR + 'example.granulite'