Update tests for new behavior

WikiWatershed · Dec 31, 2019 · a680937 · a680937
1 parent 744b530
commit a680937
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/src/mmw/apps/geoprocessing_api/tests.py b/src/mmw/apps/geoprocessing_api/tests.py
@@ -523,32 +523,32 @@ def test_survey_soil(self):
         self.assertEqual(actual, expected)
 
     def test_analyze_climate(self):
-        histogram = [
-            {"ppt__1": 86.10894775390625},
-            {"ppt__2": 77.05979919433594},
-            {"ppt__3": 97.3456802368164},
-            {"ppt__4": 92.16392517089844},
-            {"ppt__5": 92.18870544433594},
-            {"ppt__6": 98.5276107788086},
-            {"ppt__7": 114.81684112548828},
-            {"ppt__8": 118.24303436279297},
-            {"ppt__9": 93.80207061767578},
-            {"ppt__10": 82.33834075927734},
-            {"ppt__11": 79.2877426147461},
-            {"ppt__12": 91.07259368896484},
-            {"tmean__1": 0.7002114057540894},
-            {"tmean__2": 1.3823009729385376},
-            {"tmean__3": 6.08829927444458},
-            {"tmean__4": 11.881658554077148},
-            {"tmean__5": 17.683929443359375},
-            {"tmean__6": 22.579280853271484},
-            {"tmean__7": 25.288223266601562},
-            {"tmean__8": 24.355039596557617},
-            {"tmean__9": 20.743885040283203},
-            {"tmean__10": 14.532132148742676},
-            {"tmean__11": 8.510452270507812},
-            {"tmean__12": 2.786508560180664},
-        ]
+        histogram = {'nocache': {
+            'ppt__1': {'List(0)': 86.10894775390625},
+            'ppt__2': {'List(0)': 77.05979919433594},
+            'ppt__3': {'List(0)': 97.3456802368164},
+            'ppt__4': {'List(0)': 92.16392517089844},
+            'ppt__5': {'List(0)': 92.18870544433594},
+            'ppt__6': {'List(0)': 98.5276107788086},
+            'ppt__7': {'List(0)': 114.81684112548828},
+            'ppt__8': {'List(0)': 118.24303436279297},
+            'ppt__9': {'List(0)': 93.80207061767578},
+            'ppt__10': {'List(0)': 82.33834075927734},
+            'ppt__11': {'List(0)': 79.2877426147461},
+            'ppt__12': {'List(0)': 91.07259368896484},
+            'tmean__1': {'List(0)': 0.7002114057540894},
+            'tmean__2': {'List(0)': 1.3823009729385376},
+            'tmean__3': {'List(0)': 6.08829927444458},
+            'tmean__4': {'List(0)': 11.881658554077148},
+            'tmean__5': {'List(0)': 17.683929443359375},
+            'tmean__6': {'List(0)': 22.579280853271484},
+            'tmean__7': {'List(0)': 25.288223266601562},
+            'tmean__8': {'List(0)': 24.355039596557617},
+            'tmean__9': {'List(0)': 20.743885040283203},
+            'tmean__10': {'List(0)': 14.532132148742676},
+            'tmean__11': {'List(0)': 8.510452270507812},
+            'tmean__12': {'List(0)': 2.786508560180664},
+        }}
         expected = {
             "survey": {
                 "categories": [
@@ -630,7 +630,7 @@ def test_analyze_climate(self):
             }
         }
 
-        actual = tasks.collect_climate(histogram)
+        actual = tasks.analyze_climate(histogram, 'nocache')
         self.assertEqual(actual, expected)