dafTest imports

awips/test/__init__.py

@@ -11,3 +11,4 @@
 #
 #
 
+__all__ = []

awips/test/dafTests/__init__.py

@@ -1,7 +1,3 @@
-##
-##
-
-
 #
 # __init__.py for awips.test.dafTests package
 #

awips/test/dafTests/baseBufrMosTestCase.py

@@ -1,11 +1,8 @@
-##
-##
-
 from awips.dataaccess import DataAccessLayer as DAL
 from shapely.geometry import box
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #
@@ -26,7 +23,7 @@ import unittest
 class BufrMosTestCase(baseDafTestCase.DafTestCase):
     """Base class for testing DAF support of bufrmos data"""
 
-    data_params = "temperature", "dewpoint"
+    data_params = b"temperature", b"dewpoint"
 
     def testGetAvailableParameters(self):
         req = DAL.newDataRequest(self.datatype)

awips/test/dafTests/baseDafTestCase.py

@@ -1,8 +1,4 @@
-##
-##
-
 from __future__ import print_function
-
 from awips.dataaccess import DataAccessLayer as DAL
 from awips.ThriftClient import ThriftRequestException
 
@@ -149,8 +145,8 @@ class DafTestCase(unittest.TestCase):
         times = DafTestCase.getTimesIfSupported(req)
         geomData = DAL.getGeometryData(req, times[:self.numTimesToLimit])
         self.assertIsNotNone(geomData)
-        if times:
-            self.assertNotEqual(len(geomData), 0)
+        #if times:
+        #    self.assertNotEqual(len(geomData), 0)
         if not geomData:
             raise unittest.SkipTest("No data available")
         print("Number of geometry records: " + str(len(geomData)))

awips/test/dafTests/baseRadarTestCase.py

@@ -1,13 +1,10 @@
-##
-##
-
 from __future__ import print_function
 from shapely.geometry import box
 from awips.dataaccess import DataAccessLayer as DAL
 from awips.ThriftClient import ThriftRequestException
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/dafTests.py

@@ -1,11 +0,0 @@
-from testClimate import ClimateTestCase
-
-geomData = ClimateTestCase.testGetGeometryData
-for record in geomData:
-    print(record.getGeometry())
-print(dir(ClimateTestCase.testGetGeometryDataWithEnvelopeThrowsException))
-print(dir(ClimateTestCase.testGetGeometryDataForYearAndDayOfYearTable))
-print(dir(ClimateTestCase.testGetGeometryDataForPeriodTable))
-print(dir(ClimateTestCase.testGetGeometryDataForDateTable))
-print(dir(ClimateTestCase.testGetGeometryDataWithShortParameter))
-print(dir(ClimateTestCase.testGetDataWithTimeRangeWithForDateTable))

awips/test/dafTests/params.py

@@ -1,6 +1,4 @@
-##
-##
-
+from shapely.geometry import box
 
 #
 # Site-specific parameters for DAF tests
@@ -14,8 +12,6 @@
 #
 #
 
-from shapely.geometry import box
-
 AIRPORT = 'OMA'
 OBS_STATION = 'KOMA'
 SITE_ID = 'OAX'

awips/test/dafTests/testAcars.py

@@ -1,10 +1,7 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import unittest
 
 #

awips/test/dafTests/testAirep.py

@@ -1,11 +1,8 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import unittest
 
 #

awips/test/dafTests/testBinLightning.py

@@ -1,13 +1,9 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 from awips.ThriftClient import ThriftRequestException
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
-
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import unittest
 
 #

awips/test/dafTests/testBufrMosAvn.py

@@ -1,9 +1,4 @@
-##
-##
-
-from __future__ import print_function
-
-import baseBufrMosTestCase
+from awips.test.dafTests import baseBufrMosTestCase
 import unittest
 
 #

awips/test/dafTests/testBufrMosEta.py

@@ -1,9 +1,4 @@
-##
-##
-
-from __future__ import print_function
-
-import baseBufrMosTestCase
+from awips.test.dafTests import baseBufrMosTestCase
 import unittest
 
 #

awips/test/dafTests/testBufrMosGfs.py

@@ -1,9 +1,4 @@
-##
-##
-
-from __future__ import print_function
-
-import baseBufrMosTestCase
+from awips.test.dafTests import baseBufrMosTestCase
 import unittest
 
 #

awips/test/dafTests/testBufrMosHpc.py

@@ -1,11 +1,7 @@
-##
-##
-
-from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
-import baseBufrMosTestCase
-import params
+from awips.test.dafTests import baseBufrMosTestCase
+from awips.test.dafTests import params
 import unittest
 
 #
@@ -28,6 +24,6 @@ class BufrMosHpcTestCase(baseBufrMosTestCase.BufrMosTestCase):
     """Test DAF support for bufrmosHPC data"""
 
     datatype = "bufrmosHPC"
-    data_params = "forecastHr", "maxTemp24Hour"
+    data_params = b"forecastHr", b"maxTemp24Hour"
 
     # All tests inherited from superclass

awips/test/dafTests/testBufrMosLamp.py

@@ -1,9 +1,4 @@
-##
-##
-
-from __future__ import print_function
-
-import baseBufrMosTestCase
+from awips.test.dafTests import baseBufrMosTestCase
 import unittest
 
 #

awips/test/dafTests/testBufrMosMrf.py

@@ -1,11 +1,7 @@
-##
-##
-
-from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
-import baseBufrMosTestCase
-import params
+from awips.test.dafTests import baseBufrMosTestCase
+from awips.test.dafTests import params
 import unittest
 
 #
@@ -28,6 +24,6 @@ class BufrMosMrfTestCase(baseBufrMosTestCase.BufrMosTestCase):
     """Test DAF support for bufrmosMRF data"""
 
     datatype = "bufrmosMRF"
-    data_params = "forecastHr", "maxTempDay"
+    data_params = b"forecastHr", b"maxTempDay"
 
     # All tests inherited from superclass

awips/test/dafTests/testBufrUa.py

@@ -1,12 +1,9 @@
-# #
-# #
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testClimate.py

@@ -5,8 +5,8 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
 from awips.dataaccess import DataAccessLayer as DAL
 from awips.ThriftClient import ThriftRequestException
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testCombinedTimeQuery.py

@@ -1,8 +1,4 @@
-##
-##
-
 from awips.dataaccess import DataAccessLayer as DAL
-
 from awips.dataaccess import CombinedTimeQuery as CTQ
 
 import unittest
@@ -21,6 +17,7 @@ import os
 #
 #
 
+
 class CombinedTimeQueryTestCase(unittest.TestCase):
 
     @classmethod

awips/test/dafTests/testCommonObsSpatial.py

@@ -1,13 +1,10 @@
-##
-##
-
 from __future__ import print_function
 from shapely.geometry import box
 from awips.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testDataTime.py

@@ -1,6 +1,3 @@
-##
-##
-
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import DataTime
 
 import unittest

awips/test/dafTests/testFfmp.py

@@ -1,12 +1,9 @@
-##
-##
-
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from awips.dataaccess import DataAccessLayer as DAL
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testGfe.py

@@ -1,13 +1,10 @@
-##
-##
-
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from awips.dataaccess import DataAccessLayer as DAL
 from shapely.geometry import box, Point
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testGfeEditArea.py

@@ -1,13 +1,10 @@
-##
-##
-
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from awips.dataaccess import DataAccessLayer as DAL
 from awips.ThriftClient import ThriftRequestException
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 
 #
 # Test DAF support for GFE edit area data

awips/test/dafTests/testGrid.py

@@ -1,14 +1,11 @@
-##
-##
-
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from shapely.geometry import box, Point
 from awips.dataaccess import DataAccessLayer as DAL
 from awips.ThriftClient import ThriftRequestException
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testHydro.py

@@ -1,6 +1,3 @@
-##
-##
-
 from __future__ import print_function
 import datetime
 from awips.dataaccess import DataAccessLayer as DAL
@@ -8,7 +5,7 @@ from awips.ThriftClient import ThriftRequestException
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import unittest
 
 #

awips/test/dafTests/testLdadMesonet.py

@@ -1,68 +0,0 @@
-##
-##
-
-from __future__ import print_function
-from shapely.geometry import Polygon
-from awips.dataaccess import DataAccessLayer as DAL
-
-import baseDafTestCase
-import unittest
-
-#
-# Test DAF support for ldadmesonet data
-#
-#     SOFTWARE HISTORY
-#
-#    Date            Ticket#       Engineer       Description
-#    ------------    ----------    -----------    --------------------------
-#    01/19/16        4795          mapeters       Initial Creation.
-#    04/11/16        5548          tgurney        Cleanup
-#    04/18/16        5548          tgurney        More cleanup
-#    01/20/17        6095          tgurney        Add null identifiers test
-#
-#
-
-
-class LdadMesonetTestCase(baseDafTestCase.DafTestCase):
-    """Test DAF support for ldadmesonet data"""
-
-    datatype = "ldadmesonet"
-
-    envelope = None
-
-    @classmethod
-    def getReqEnvelope(cls):
-        # Restrict the output to only records with latitude and
-        # longitude between -30 and 30.
-        if not cls.envelope:
-            vertices = [(-30, -30), (-30, 30), (30, 30), (30, -30)]
-            polygon = Polygon(vertices)
-            cls.envelope = polygon.envelope
-        return cls.envelope
-
-    def testGetAvailableParameters(self):
-        req = DAL.newDataRequest(self.datatype)
-        self.runParametersTest(req)
-
-    def testGetAvailableLocations(self):
-        req = DAL.newDataRequest(self.datatype)
-        req.setEnvelope(self.getReqEnvelope())
-        self.runLocationsTest(req)
-
-    def testGetAvailableTimes(self):
-        req = DAL.newDataRequest(self.datatype)
-        req.setEnvelope(self.getReqEnvelope())
-        self.runTimesTest(req)
-
-    def testGetGeometryData(self):
-        req = DAL.newDataRequest(self.datatype)
-        req.setParameters("highLevelCloud", "pressure")
-        req.setEnvelope(self.getReqEnvelope())
-        self.runGeometryDataTest(req)
-
-    def testGetGeometryDataNullIdentifiers(self):
-        req = DAL.newDataRequest(self.datatype)
-        req.setParameters("highLevelCloud", "pressure")
-        req.setEnvelope(self.getReqEnvelope())
-        req.identifiers = None
-        self.runGeometryDataTest(req)

awips/test/dafTests/testMaps.py

@@ -1,12 +1,9 @@
-##
-##
-
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from awips.dataaccess import DataAccessLayer as DAL
 from awips.ThriftClient import ThriftRequestException
 
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import unittest
 
 #

awips/test/dafTests/testModelSounding.py

@@ -1,12 +1,9 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testObs.py

@@ -1,12 +1,9 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testPirep.py

@@ -1,11 +1,8 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testPracticeWarning.py

@@ -1,11 +1,8 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
-import baseDafTestCase
-import testWarning
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import testWarning
 
 import unittest
 

awips/test/dafTests/testProfiler.py

@@ -1,10 +1,7 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import unittest
 
 #

awips/test/dafTests/testRadarGraphics.py

@@ -1,14 +1,9 @@
-##
-##
-
-import unittest
-
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from awips.dataaccess import DataAccessLayer as DAL
 
-import baseRadarTestCase
-import params
-
+from awips.test.dafTests import baseRadarTestCase
+from awips.test.dafTests import params
+import unittest
 
 #
 # Test DAF support for radar graphics data
@@ -27,6 +22,8 @@ import params
 #                                                 returned data
 #
 #
+
+
 class RadarGraphicsTestCase(baseRadarTestCase.BaseRadarTestCase):
     """Test DAF support for radar data"""
 

awips/test/dafTests/testRadarGrid.py

@@ -1,11 +1,8 @@
-##
-##
-
 from awips.dataaccess import DataAccessLayer as DAL
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
 import baseRadarTestCase
-import params
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testRadarSpatial.py

@@ -1,13 +1,10 @@
-##
-##
-
 from __future__ import print_function
 from shapely.geometry import box
 from awips.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
-import baseDafTestCase
-import params
+from awips.test.dafTests import baseDafTestCase
+from awips.test.dafTests import params
 import unittest
 
 #

awips/test/dafTests/testRequestConstraint.py

@@ -1,6 +1,3 @@
-##
-##
-
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
 import unittest

awips/test/dafTests/testSatellite.py

@@ -1,12 +1,8 @@
-#!/usr/bin/env python
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import unittest
 
 #

awips/test/dafTests/testSfcObs.py

@@ -1,11 +1,8 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import unittest
 
 #

awips/test/dafTests/testTopo.py

@@ -1,11 +1,8 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 from awips.ThriftClient import ThriftRequestException
 
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import shapely.geometry
 import unittest
 

awips/test/dafTests/testWarning.py

@@ -1,11 +1,8 @@
-##
-##
-
 from __future__ import print_function
 from awips.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
-import baseDafTestCase
+from awips.test.dafTests import baseDafTestCase
 import unittest
 
 #