diff --git a/awips/test/dafTests/baseDafTestCase.py b/awips/test/dafTests/baseDafTestCase.py index c90bbca..066d03b 100644 --- a/awips/test/dafTests/baseDafTestCase.py +++ b/awips/test/dafTests/baseDafTestCase.py @@ -74,7 +74,7 @@ class DafTestCase(unittest.TestCase): def testDatatypeIsSupported(self): allSupported = DAL.getSupportedDatatypes() - self.assertIn(self.datatype.lower(), allSupported) + self.assertIn(self.datatype, allSupported) def testGetRequiredIdentifiers(self): req = DAL.newDataRequest(self.datatype) diff --git a/awips/test/dafTests/testModelSounding.py b/awips/test/dafTests/testModelSounding.py index 7be9119..c71cb10 100644 --- a/awips/test/dafTests/testModelSounding.py +++ b/awips/test/dafTests/testModelSounding.py @@ -33,24 +33,26 @@ class ModelSoundingTestCase(baseDafTestCase.DafTestCase): datatype = "modelsounding" + reporttype = "ETA" + def testGetAvailableParameters(self): req = DAL.newDataRequest(self.datatype) self.runParametersTest(req) def testGetAvailableLocations(self): req = DAL.newDataRequest(self.datatype) - req.addIdentifier("reportType", "ETA") + req.addIdentifier("reportType", self.reporttype) self.runLocationsTest(req) def testGetAvailableTimes(self): req = DAL.newDataRequest(self.datatype) - req.addIdentifier("reportType", "ETA") + req.addIdentifier("reportType", self.reporttype) req.setLocationNames(params.OBS_STATION) self.runTimesTest(req) def testGetGeometryData(self): req = DAL.newDataRequest(self.datatype) - req.addIdentifier("reportType", "ETA") + req.addIdentifier("reportType", self.reporttype) req.setLocationNames(params.OBS_STATION) req.setParameters("temperature", "pressure", "specHum", "sfcPress", "temp2", "q2") print("Testing getGeometryData()") @@ -80,7 +82,7 @@ class ModelSoundingTestCase(baseDafTestCase.DafTestCase): def testGetGeometryDataWithEnvelope(self): req = DAL.newDataRequest(self.datatype) - req.addIdentifier("reportType", "ETA") + req.addIdentifier("reportType", self.reporttype) req.setEnvelope(params.ENVELOPE) req.setParameters("temperature", "pressure", "specHum", "sfcPress", "temp2", "q2") print("Testing getGeometryData()")