Changeset 5000 for ndgCommon


Ignore:
Timestamp:
18/02/09 17:37:31 (10 years ago)
Author:
cbyrom
Message:

Fix issues with the granlite tests.

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

Legend:

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

    r4997 r5000  
    4848             
    4949         
    50          
    5150    def testProcessGranulite(self): 
    5251        atom = None 
     
    135134        self.assertEqual(tc.GRANULITE_LOGO, self.g._atom.getLogos()[0].href) 
    136135        self.assertEquals(tc.GRANULITE_AUTHOR_NAME, self.g._atom.ME.responsibleParties[0].name) 
    137         self.assertEqual(self.g._atom.minX, '-8.26171875') 
    138         self.assertEqual(self.g._atom.minY, '-11.25') 
    139         self.assertEqual(self.g._atom.maxX, '-3.33984375') 
    140         self.assertEqual(self.g._atom.maxY, '-17.578125') 
     136        self.assertEqual(-9.140625, atom.minX) 
     137        self.assertEqual(-11.25, atom.maxY) 
     138        self.assertEqual(-3.1640625, atom.maxX) 
     139        self.assertEqual(-17.578125, atom.minY) 
    141140        self.assertEqual(self.g._atom.t1, tc.GRANULITE_T1) 
    142141        self.assertEqual(self.g._atom.t2, tc.GRANULITE_T2) 
     
    146145        self._initGranule() 
    147146        self.g._extractSpatialData("POLYGON((-8.26171875 -11.25,-9.140625 -17.40234375,-3.33984375 -17.578125,-3.1640625 -12.65625,-8.26171875 -11.25))") 
    148         self.assertEqual(self.g._atom.minX, '-8.26171875') 
    149         self.assertEqual(self.g._atom.minY, '-11.25') 
    150         self.assertEqual(self.g._atom.maxX, '-3.33984375') 
    151         self.assertEqual(self.g._atom.maxY, '-17.578125') 
     147        self.assertEqual(-9.140625, atom.minX) 
     148        self.assertEqual(-11.25, atom.maxY) 
     149        self.assertEqual(-3.1640625, atom.maxX) 
     150        self.assertEqual(-17.578125, atom.minY) 
    152151 
    153152 
  • ndgCommon/trunk/ndg/common/unittests/testconstants.py

    r4997 r5000  
    3939TEST_FILE_PATH = TEST_COLLECTION_PATH + '/' + TEST_FILE_NAME 
    4040 
    41 #EXIST_DB = 'chinook.badc.rl.ac.uk' 
    42 EXIST_DB = 'localhost' 
     41EXIST_DB = 'chinook.badc.rl.ac.uk' 
     42#EXIST_DB = 'localhost' 
    4343PG_DBCONFIG_FILE = TEST_DATA_DIR + 'pg.config' 
    4444EXIST_DBCONFIG_FILE = TEST_DATA_DIR + 'exist.config' 
     
    5959GRANULITE_PROVIDER_ID2 = 'neodc.nerc.ac.uk' 
    6060GRANULITE_DATASETID = 'calum_data_set' 
    61 GRANULITE_LOGO = 'http:/blah/blah/a_logo_icon.png' 
     61GRANULITE_LOGO = 'http://www.tessella.com/wp-content/themes/tessella/images/Tessella_Logo.png' 
    6262GRANULITE_AUTHOR_NAME = 'calum byrom' 
    6363GRANULITE_AUTHOR_URI = 'www.cb.org' 
Note: See TracChangeset for help on using the changeset viewer.