xan/python-awips
1
0
Fork 0
mirror of https://github.com/Unidata/python-awips.git synced 2025-02-23 22:57:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

dafTest updates for encoding, binlightning default source

Browse source
This commit is contained in:
Michael James 2018-10-05 17:15:42 -06:00
parent efa301c100
commit e2b05f5587
2 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
awips/test/dafTests/baseDafTestCase.py
View file

@ -157,7 +157,7 @@ class DafTestCase(unittest.TestCase):
self.assertIn(record.getDataTime(), times[:self.numTimesToLimit]) self.assertIn(record.getDataTime(), times[:self.numTimesToLimit])
print("geometry=" + str(record.getGeometry()), end="") print("geometry=" + str(record.getGeometry()), end="")
for p in req.getParameters(): for p in req.getParameters():
print(" " + p + "=" + record.getString(p), end="") print(" " + p + "=" + str(record.getString(p)), end="")
print() print()
return geomData return geomData

55
awips/test/dafTests/testBinLightning.py
View file

@ -34,6 +34,7 @@ class BinLightningTestCase(baseDafTestCase.DafTestCase):
"""Test DAF support for binlightning data""" """Test DAF support for binlightning data"""
datatype = "binlightning" datatype = "binlightning"
source = "GLMfl"
def testGetAvailableParameters(self): def testGetAvailableParameters(self):
req = DAL.newDataRequest(self.datatype) req = DAL.newDataRequest(self.datatype)
@ -41,18 +42,18 @@ class BinLightningTestCase(baseDafTestCase.DafTestCase):
def testGetAvailableTimes(self): def testGetAvailableTimes(self):
req = DAL.newDataRequest(self.datatype) req = DAL.newDataRequest(self.datatype)
req.addIdentifier("source", "NLDN") req.addIdentifier('source', self.source)
self.runTimesTest(req) self.runTimesTest(req)
def testGetGeometryDataSingleSourceSingleParameter(self): def testGetGeometryDataSingleSourceSingleParameter(self):
req = DAL.newDataRequest(self.datatype) req = DAL.newDataRequest(self.datatype)
req.addIdentifier("source", "NLDN") req.addIdentifier('source', self.source)
req.setParameters('intensity') req.setParameters('intensity')
self.runGeometryDataTest(req, checkDataTimes=False) self.runGeometryDataTest(req, checkDataTimes=False)
def testGetGeometryDataInvalidParamRaisesIncompatibleRequestException(self): def testGetGeometryDataInvalidParamRaisesIncompatibleRequestException(self):
req = DAL.newDataRequest(self.datatype) req = DAL.newDataRequest(self.datatype)
req.addIdentifier("source", "NLDN") req.addIdentifier('source', self.source)
req.setParameters('blahblahblah') req.setParameters('blahblahblah')
with self.assertRaises(ThriftRequestException) as cm: with self.assertRaises(ThriftRequestException) as cm:
self.runGeometryDataTest(req) self.runGeometryDataTest(req)
@ -60,7 +61,7 @@ class BinLightningTestCase(baseDafTestCase.DafTestCase):
def testGetGeometryDataSingleSourceAllParameters(self): def testGetGeometryDataSingleSourceAllParameters(self):
req = DAL.newDataRequest(self.datatype) req = DAL.newDataRequest(self.datatype)
req.addIdentifier("source", "NLDN") req.addIdentifier('source', self.source)
req.setParameters(*DAL.getAvailableParameters(req)) req.setParameters(*DAL.getAvailableParameters(req))
self.runGeometryDataTest(req, checkDataTimes=False) self.runGeometryDataTest(req, checkDataTimes=False)
@ -84,14 +85,14 @@ class BinLightningTestCase(baseDafTestCase.DafTestCase):
return self.runGeometryDataTest(req, checkDataTimes=False) return self.runGeometryDataTest(req, checkDataTimes=False)
def testGetDataWithEqualsString(self): def testGetDataWithEqualsString(self):
geomData = self._runConstraintTest('source', '=', 'NLDN') geomData = self._runConstraintTest('source', '=', self.source)
for record in geomData: for record in geomData:
self.assertEqual(record.getAttribute('source'), 'NLDN') self.assertEqual(record.getAttribute('source'), self.source)
def testGetDataWithEqualsUnicode(self): def testGetDataWithEqualsUnicode(self):
geomData = self._runConstraintTest('source', '=', u'NLDN') geomData = self._runConstraintTest('source', '=', self.source)
for record in geomData: for record in geomData:
self.assertEqual(record.getAttribute('source'), 'NLDN') self.assertEqual(record.getAttribute('source'), self.source)
def testGetDataWithEqualsInt(self): def testGetDataWithEqualsInt(self):
geomData = self._runConstraintTest('source', '=', 1000) geomData = self._runConstraintTest('source', '=', 1000)
@ -114,9 +115,9 @@ class BinLightningTestCase(baseDafTestCase.DafTestCase):
self.assertIsNone(record.getAttribute('source')) self.assertIsNone(record.getAttribute('source'))
def testGetDataWithNotEquals(self): def testGetDataWithNotEquals(self):
geomData = self._runConstraintTest('source', '!=', 'NLDN') geomData = self._runConstraintTest('source', '!=', self.source)
for record in geomData: for record in geomData:
self.assertNotEqual(record.getAttribute('source'), 'NLDN') self.assertNotEqual(record.getAttribute('source'), self.source)
def testGetDataWithNotEqualsNone(self): def testGetDataWithNotEqualsNone(self):
geomData = self._runConstraintTest('source', '!=', None) geomData = self._runConstraintTest('source', '!=', None)
@ -124,49 +125,49 @@ class BinLightningTestCase(baseDafTestCase.DafTestCase):
self.assertIsNotNone(record.getAttribute('source')) self.assertIsNotNone(record.getAttribute('source'))
def testGetDataWithGreaterThan(self): def testGetDataWithGreaterThan(self):
geomData = self._runConstraintTest('source', '>', 'NLDN') geomData = self._runConstraintTest('source', '>', self.source)
for record in geomData: for record in geomData:
self.assertGreater(record.getAttribute('source'), 'NLDN') self.assertGreater(record.getAttribute('source'), self.source)
def testGetDataWithLessThan(self): def testGetDataWithLessThan(self):
geomData = self._runConstraintTest('source', '<', 'NLDN') geomData = self._runConstraintTest('source', '<', self.source)
for record in geomData: for record in geomData:
self.assertLess(record.getAttribute('source'), 'NLDN') self.assertLess(record.getAttribute('source'), self.source)
def testGetDataWithGreaterThanEquals(self): def testGetDataWithGreaterThanEquals(self):
geomData = self._runConstraintTest('source', '>=', 'NLDN') geomData = self._runConstraintTest('source', '>=', self.source)
for record in geomData: for record in geomData:
self.assertGreaterEqual(record.getAttribute('source'), 'NLDN') self.assertGreaterEqual(record.getAttribute('source'), self.source)
def testGetDataWithLessThanEquals(self): def testGetDataWithLessThanEquals(self):
geomData = self._runConstraintTest('source', '<=', 'NLDN') geomData = self._runConstraintTest('source', '<=', self.source)
for record in geomData: for record in geomData:
self.assertLessEqual(record.getAttribute('source'), 'NLDN') self.assertLessEqual(record.getAttribute('source'), self.source)
def testGetDataWithInTuple(self): def testGetDataWithInTuple(self):
geomData = self._runConstraintTest('source', 'in', ('NLDN', 'ENTLN')) geomData = self._runConstraintTest('source', 'in', (self.source, 'GLMev'))
for record in geomData: for record in geomData:
self.assertIn(record.getAttribute('source'), ('NLDN', 'ENTLN')) self.assertIn(record.getAttribute('source'), (self.source, 'GLMev'))
def testGetDataWithInList(self): def testGetDataWithInList(self):
geomData = self._runConstraintTest('source', 'in', ['NLDN', 'ENTLN']) geomData = self._runConstraintTest('source', 'in', [self.source, 'GLMev'])
for record in geomData: for record in geomData:
self.assertIn(record.getAttribute('source'), ('NLDN', 'ENTLN')) self.assertIn(record.getAttribute('source'), (self.source, 'GLMev'))
def testGetDataWithInGenerator(self): def testGetDataWithInGenerator(self):
generator = (item for item in ('NLDN', 'ENTLN')) generator = (item for item in (self.source, 'GLMev'))
geomData = self._runConstraintTest('source', 'in', generator) geomData = self._runConstraintTest('source', 'in', generator)
for record in geomData: for record in geomData:
self.assertIn(record.getAttribute('source'), ('NLDN', 'ENTLN')) self.assertIn(record.getAttribute('source'), (self.source, 'GLMev'))
def testGetDataWithNotInList(self): def testGetDataWithNotInList(self):
geomData = self._runConstraintTest('source', 'not in', ['NLDN', 'blah']) geomData = self._runConstraintTest('source', 'not in', [self.source, 'blah'])
for record in geomData: for record in geomData:
self.assertNotIn(record.getAttribute('source'), ('NLDN', 'blah')) self.assertNotIn(record.getAttribute('source'), (self.source, 'blah'))
def testGetDataWithInvalidConstraintTypeThrowsException(self): def testGetDataWithInvalidConstraintTypeThrowsException(self):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
self._runConstraintTest('source', 'junk', 'NLDN') self._runConstraintTest('source', 'junk', self.source)
def testGetDataWithInvalidConstraintValueThrowsException(self): def testGetDataWithInvalidConstraintValueThrowsException(self):
with self.assertRaises(TypeError): with self.assertRaises(TypeError):