Added tests to check that a date accessed was auto assigned on upload. working on #24

Author: micahjohnson150

snowexsql/__init__.py

@@ -1,5 +1,4 @@
 """Top-level package for snowexsql."""
 
 __author__ = """Micah Johnson"""
-__email__ = '[email protected]'
 __version__ = '0.1.0'

snowexsql/utilities.py

@@ -154,5 +154,5 @@ def get_file_creation_date(file):
                 the system
     """
 
-    result = datetime.datetime.fromtimestamp(getctime(file))
+    result = datetime.datetime.fromtimestamp(getctime(file)).date()
     return result

tests/__init__.py

@@ -1 +1 @@
-"""Unit test package for snowexsql."""
+""" Test package for snowexsql."""

tests/test_layers.py

@@ -1,9 +1,7 @@
 import datetime
-from datetime import date, time
+from datetime import date
 
 import numpy as np
-import pandas as pd
-import pytest
 import pytz
 
 from snowexsql.data import LayerData
@@ -63,20 +61,27 @@ class TestStratigraphyProfile(TableTestBase):
             dict(data_name='manual_wetness', attribute_to_count='value', expected_count=1),
             # Test only 3 hand hardness categories were used
             dict(data_name='hand_hardness', attribute_to_count='value', expected_count=3),
-            # Test only 2 graint type categories were used
+            # Test only 2 grain type categories were used
             dict(data_name='grain_type', attribute_to_count='value', expected_count=2),
             # Test only 2 grain_sizes were used
             dict(data_name='grain_size', attribute_to_count='value', expected_count=2),
 
         ]
     }
 
+    def test_date_accessed(self):
+        """
+        Tests that the date accessed is auto assigned on upload
+        """
+        result = self.session.query(LayerData.date_accessed).limit(1).all()
+        assert type(result[0][0]) is date
+
 
 class TestDensityProfile(TableTestBase):
-    '''
+    """
     Test that a density file is uploaded correctly including sample
     averaging for the main value.
-    '''
+    """
 
     args = ['density.csv']
     kwargs = {'timezone': 'MST'}
@@ -104,17 +109,17 @@ class TestDensityProfile(TableTestBase):
     }
 
     def test_bottom_depth(self):
-        '''
+        """
         Insure bottom depth info is not lost after standardizing it
-        '''
+        """
         records = self.session.query(LayerData.bottom_depth).filter(LayerData.id <= 2).all()
         assert records[0][0] - records[1][0] == 10
 
 
 class TestLWCProfile(TableTestBase):
-    '''
+    """
     Test the permittivity file is uploaded correctly
-    '''
+    """
 
     args = ['LWC.csv']
     kwargs = {'timezone': 'MST'}
@@ -144,9 +149,9 @@ class TestLWCProfile(TableTestBase):
 
 
 class TestLWCProfileB(TableTestBase):
-    '''
+    """
     Test the permittivity file is uploaded correctly
-    '''
+    """
 
     args = ['LWC2.csv']
     kwargs = {'timezone': 'MST'}
@@ -189,9 +194,9 @@ class TestLWCProfileB(TableTestBase):
 
 
 class TestTemperatureProfile(TableTestBase):
-    '''
+    """
     Test that a temperature profile is uploaded to the DB correctly
-    '''
+    """
 
     args = ['temperature.csv']
     kwargs = {'timezone': 'MST'}
@@ -217,9 +222,9 @@ class TestTemperatureProfile(TableTestBase):
 
 
 class TestSSAProfile(TableTestBase):
-    '''
+    """
     Test that all profiles from an SSA file are uploaded correctly
-    '''
+    """
 
     args = ['SSA.csv']
     kwargs = {'timezone': 'MST'}
@@ -253,9 +258,9 @@ class TestSSAProfile(TableTestBase):
 
 
 class TestSMPProfile(TableTestBase):
-    '''
+    """
     Test SMP profile is uploaded with all its attributes and valid data
-    '''
+    """
 
     args = ['S06M0874_2N12_20200131.CSV']
     kwargs = {'timezone': 'UTC', 'units': 'Newtons', 'header_sep': ':'}

tests/test_points.py

@@ -1,7 +1,5 @@
 import datetime
 
-import pytest
-
 from snowexsql.data import PointData
 from snowexsql.upload import PointDataCSV
 
@@ -88,6 +86,12 @@ def test_extended_geom(self):
         r = self.session.query(PointData.geom).limit(1).one()
         assert r[0].srid == 26912
 
+    def test_date_accessed(self):
+        """
+        Tests that the date accessed is auto assigned on upload
+        """
+        result = self.session.query(PointData.date_accessed).limit(1).all()
+        assert type(result[0][0]) is datetime.date
 
 class TestGPRPointData(PointsBase):
     gpr_dt = datetime.date(2019, 1, 28)

tests/test_rasters.py

@@ -1,5 +1,5 @@
 from os.path import join
-
+from datetime import date
 import numpy as np
 from geoalchemy2.shape import to_shape
 from geoalchemy2.types import Raster
@@ -14,63 +14,66 @@
 
 
 class TestRaster(TableTestBase):
-    '''
+    """
     Test uploading a raster
-    '''
+    """
 
     # Class to use to upload the data
     UploaderClass = UploadRaster
 
     # Positional arguments to pass to the uploader class
-    args = [join('be_gm1_0328','w001001x.adf')]
+    args = [join('be_gm1_0328', 'w001001x.adf')]
 
     # Keyword args to pass to the uploader class
-    kwargs = {'type':'dem', 'epsg':26912, 'description':'test'}
+    kwargs = {'type': 'dem', 'epsg': 26912, 'description': 'test'}
 
     # Always define this using a table class from data.py and is used for ORM
     TableClass = ImageData
 
     # First filter to be applied is count_attribute == data_name
     count_attribute = 'type'
 
-
     # Define params which is a dictionary of test names and their args
     params = {
-    'test_count': [dict(data_name='dem', expected_count=1)],
-    'test_value': [dict(data_name='dem', attribute_to_check='description', filter_attribute='id', filter_value=1, expected='test')],
-    'test_unique_count': [dict(data_name='dem', attribute_to_count='id', expected_count=1)]
-            }
+        'test_count': [dict(data_name='dem', expected_count=1)],
+        'test_value': [dict(data_name='dem', attribute_to_check='description',
+                            filter_attribute='id', filter_value=1,
+                            expected='test')],
+        'test_unique_count': [dict(data_name='dem', attribute_to_count='id',
+                                   expected_count=1)]
+    }
+
 
 class TestTiledRaster(DBSetup):
-    '''
+    """
     A class to test common operations and features of tiled raster in the DB
-    '''
+    """
 
     def setup_class(self):
-        '''
+        """
         Setup the database one time for testing
-        '''
+        """
         super().setup_class()
         # Positional arguments to pass to the uploader class
-        args = [join(self.data_dir, 'uavsar','uavsar_utm.amp1.real.tif')]
+        args = [join(self.data_dir, 'uavsar', 'uavsar_utm.amp1.real.tif')]
 
         # Keyword args to pass to the uploader class
-        kwargs = {'type':'insar', 'epsg':26912, 'description':'test', 'tiled':True}
+        kwargs = {'type': 'insar', 'epsg': 26912, 'description': 'test', 'tiled': True}
         # Upload two rasters (next two each other)
         u = UploadRaster(*args, **kwargs)
         u.submit(self.session)
 
     def test_tiled_raster_count(self):
-        '''
+        """
         Test two rasters uploaded
-        '''
+        """
         records = self.session.query(ImageData.id).all()
         assert len(records) == 4
 
     def test_tiled_raster_size(self):
-        '''
+        """
         Tiled raster should be 500x500 in most cases (can be smaller to fit domains)
-        '''
+        """
         rasters = self.session.query(func.ST_AsTiff(ImageData.raster)).all()
         datasets = raster_to_rasterio(self.session, rasters)
 
@@ -79,9 +82,9 @@ def test_tiled_raster_size(self):
             assert d.height <= 500
 
     def test_raster_point_retrieval(self):
-        '''
+        """
         Test we can retrieve coordinates of a point from the database
-        '''
+        """
 
         # Get the first pixel as a point
         records = self.session.query(ST_PixelAsPoint(ImageData.raster, 1, 1)).limit(1).all()
@@ -93,19 +96,27 @@ def test_raster_point_retrieval(self):
         np.testing.assert_almost_equal(received.y, expected.y, 6)
 
     def test_raster_union(self):
-        '''
+        """
         Test we can retrieve coordinates of a point from the database
-        '''
+        """
 
         # Get the first pixel as a point
         rasters = self.session.query(func.ST_AsTiff(func.ST_Union(ImageData.raster, type_=Raster))).all()
         assert len(rasters) == 1
 
     def test_raster_union2(self):
-        '''
+        """
         Test we can retrieve coordinates of a point from the database
-        '''
+        """
 
         # Get the first pixel as a point
-        merged = self.session.query(func.ST_Union(ImageData.raster, type_=Raster)).filter(ImageData.id.in_([1, 2])).all()
+        merged = self.session.query(func.ST_Union(ImageData.raster, type_=Raster)).filter(
+            ImageData.id.in_([1, 2])).all()
         assert len(merged) == 1
+
+    def test_date_accessed(self):
+        """
+        Tests that the date accessed is auto assigned on upload
+        """
+        result = self.session.query(ImageData.date_accessed).limit(1).all()
+        assert type(result[0][0]) is date