From 9105617e035569273baf313a63d896e2cff18e85 Mon Sep 17 00:00:00 2001
From: Felix Kleinert <f.kleinert@fz-juelich.de>
Date: Mon, 23 Mar 2020 11:05:05 +0100
Subject: [PATCH] update tests for None handling in multiply extremes #87

---
 test/test_data_handling/test_data_preparation.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/test_data_handling/test_data_preparation.py b/test/test_data_handling/test_data_preparation.py
index 1fe6fa20..a73ff761 100644
--- a/test/test_data_handling/test_data_preparation.py
+++ b/test/test_data_handling/test_data_preparation.py
@@ -427,6 +427,9 @@ class TestDataPrep:
         assert f(upsampled, lt, -1) == sum([f(orig, lt, -1), f(orig, lt, -1.5), f(orig, lt, -2) * 2, f(orig, lt, -3) * 4])
 
     def test_multiply_extremes_wrong_extremes(self, data):
+        data.transform("datetime")
+        data.make_history_window("variables", 3, "datetime")
+        data.make_labels("variables", "o3", "datetime", 2)
         with pytest.raises(TypeError) as e:
             data.multiply_extremes([1, "1.5", 2])
         assert "Elements of list extreme_values have to be (<class 'float'>, <class 'int'>), but at least element 1.5" \
@@ -448,15 +451,13 @@ class TestDataPrep:
     def test_multiply_extremes_none_label(self, data):
         data.transform("datetime")
         data.make_history_window("variables", 3, "datetime")
-        # data.make_labels("variables", "o3", "datetime", 2)
         data.label = None
         assert data.multiply_extremes([1], extremes_on_right_tail_only=False) is None
 
     def test_multiply_extremes_none_history(self,data ):
         data.transform("datetime")
-        data.make_history_window("variables", 3, "datetime")
-        # data.make_labels("variables", "o3", "datetime", 2)
-        data.label = None
+        data.history = None
+        data.make_labels("variables", "o3", "datetime", 2)
         assert data.multiply_extremes([1], extremes_on_right_tail_only=False) is None
 
     def test_get_extremes_history(self, data):
-- 
GitLab