update all tests

Author: sreeder

.travis.yml

@@ -34,6 +34,12 @@ addons:
       - e2fsprogs
       - mysql-client
       - libproj-dev
+      - python-wxgtk2.8
+      - python-wxtools
+      - wx2.8-doc
+      - wx2.8-examples
+      - wx2.8-headers
+      - wx2.8-i18n
 
 #  mariadb: '10.1'
 before_script:

odmtools/odmdata/memory_database.py

@@ -126,8 +126,12 @@ def updateValue(self, ids, operator, value):
         #self.updateDF()
 
     def chunking(self, data):
+        if not isinstance(data, list):
+            points = [data]
         return [data[x:x+998] for x in xrange(0, len(data), 998)]
-        
+
+
+
     #break into chunks to get around sqlite's restriction. allowing user to send in only 999 arguments at once
     def updateFlag(self, ids, value):
         chunks=self.chunking(ids)

requirements.txt

@@ -1,4 +1,3 @@
-
 pyodbc
 pymysql
 numpy
@@ -9,14 +8,4 @@ matplotlib
 #pandas
 #geoalchemy2
 
-addons:
-  apt:
-    packages:
-      # for wxPython:
-      - python-wxgtk2.8
-      - python-wxtools
-      - wx2.8-doc
-      - wx2.8-examples
-      - wx2.8-headers
-      - wx2.8-i18n
 

requirements_tests.txt

@@ -2,5 +2,4 @@
 pytest
 pytest-cov
 mock
-
-#mysql-python
+#mysql-python

tests/test_controller/test_bulkInsert.py

@@ -4,7 +4,7 @@
 
 class TestBulkInsert:
     def setup(self):
-        # self.app = wx.App()
+        self.app = wx.App()
         self.BulkInsert = BulkInsert(None)
         path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
         self.CSVPath = os.path.join(path, 'example_files', 'exampleBulkInsert.csv')

tests/test_odmdata/test_FreeTDS.py

@@ -34,6 +34,6 @@ def setup(self):
             print i
         assert q
         print engine
-
-    def test_connection(self):
-        pass
+    #todo: does this work on mac?
+    #def test_connection(self):
+        #pass

tests/test_odmdata/test_memory_db.py

@@ -47,25 +47,26 @@ def test_update_value(self):
 
     def test_add_points(self):
         #with pytest.raises(NotImplementedError):
-        assert len(self.memory_db.df)==10
+        assert len(self.memory_db.getDataValuesDF().index)==10
         point = [('-9999', None, datetime.datetime(2011, 3, 25, 0, 0), '-7', datetime.datetime(2015, 3, 25, 7, 0), None,
                   None, u'nc', None, None, self.series.site_id, self.series.variable_id, self.series.method_id,
                   self.series.source_id, self.series.quality_control_level_id)]
         self.memory_db.addPoints(point)
         dvs = self.memory_db.getDataValuesDF()
 
-        assert len(dvs) == 11
-        assert dvs["DataValue"][-1] == -9999
+        assert len(dvs.index) == 11
+        assert dvs["DataValue"][0] == -9999
 
     def test_update_flag(self):
-        self.memory_db.updateFlag(self.sdate, '50')
+        self.memory_db.updateFlag([self.sdate], '50')
         dvs=self.memory_db.getDataValuesDF()
         assert dvs["QualifierID"][0] == '50'
 
 
     def test_delete_points(self):
-        stlen= len(self.memory_db.getDataValuesDF())
-        self.memory_db.delete([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+        stlen= len(self.memory_db.df.index)
+
+        self.memory_db.delete(self.memory_db.df["LocalDateTime"].tolist()[0:10])
         dvs = self.memory_db.getDataValuesDF()
-        assert len(dvs) == stlen-10
+        assert len(dvs.index) == stlen-10
 

tests/test_odmservices/test_series_service.py

@@ -277,7 +277,7 @@ def test_delete_dvs(self):
         dvs = series.data_values
 
         subset = dvs[:5]
-        self.series_service.delete_dvs([x.id for x in subset])
+        self.series_service.delete_dvs([x.local_date_time for x in subset])
         assert self.series_service.get_data_value_by_id(subset[0].id) == None
         series = self.series_service.get_series_by_id(series.id)  # Reload
         assert len(series.data_values) == 5