Move test to data tests

Author: uvchik

tests/test_data_handling.py

@@ -4,14 +4,16 @@
 """
 
 import os
+import time
 from datetime import datetime
-
 from shutil import copyfile
 
 import pandas as pd
 import pytest
 
-from windpowerlib.data import check_imported_data, check_data_integretiy
+from windpowerlib.data import (
+    check_data_integrity, check_imported_data, get_turbine_types,
+    store_turbine_data_from_oedb)
 
 
 class TestDataCheck:
@@ -58,7 +60,7 @@ def test_normal_data_check(self):
     def test_data_check_logging_warnings(self, caplog):
         self.df.loc["GE158/4800", "has_power_curve"] = True
         self.df.loc["GE100/2750", "has_cp_curve"] = True
-        check_data_integretiy(self.df, min_pc_length=26)
+        check_data_integrity(self.df, min_pc_length=26)
         assert "E48/800: power_curve is to short (25 values)" in caplog.text
         assert "GE158/4800: No power curve" in caplog.text
         assert "GE100/2750: No cp-curve but has_cp_curve" in caplog.text
@@ -75,3 +77,22 @@ def test_broken_pwr_curve(self):
         msg = "could not convert string to float"
         with pytest.raises(ValueError, match=msg):
             check_imported_data(self.df, self.filename, self.time_stamp)
+
+    def test_get_turbine_types(self, capsys):
+        get_turbine_types()
+        captured = capsys.readouterr()
+        assert "Enercon" in captured.out
+        get_turbine_types("oedb", print_out=False, filter_=False)
+        msg = "`turbine_library` is 'wrong' but must be 'local' or 'oedb'."
+        with pytest.raises(ValueError, match=msg):
+            get_turbine_types("wrong")
+
+    def test_store_turbine_data_from_oedb(self):
+        store_turbine_data_from_oedb()
+
+    def test_wrong_url_load_turbine_data(self):
+        """Load turbine data from oedb."""
+        with pytest.raises(
+            ConnectionError, match="Database connection not successful"
+        ):
+            store_turbine_data_from_oedb("wrong_schema")

tests/test_wind_turbine.py

@@ -5,17 +5,13 @@
 SPDX-License-Identifier: MIT
 """
 
-import pytest
 import os
-from windpowerlib.tools import WindpowerlibUserWarning
 
-from windpowerlib.wind_turbine import (
-    get_turbine_data_from_file,
-    WindTurbine,
-    WindTurbineGroup,
-)
+import pytest
 
-from windpowerlib.data import store_turbine_data_from_oedb, get_turbine_types
+from windpowerlib.tools import WindpowerlibUserWarning
+from windpowerlib.wind_turbine import (
+    WindTurbine, WindTurbineGroup, get_turbine_data_from_file)
 
 
 class TestWindTurbine:
@@ -39,25 +35,6 @@ def test_get_turbine_data_from_file(self):
         with pytest.raises(FileNotFoundError):
             get_turbine_data_from_file(turbine_type="...", path="not_existent")
 
-    def test_get_turbine_types(self, capsys):
-        get_turbine_types()
-        captured = capsys.readouterr()
-        assert "Enercon" in captured.out
-        get_turbine_types("oedb", print_out=False, filter_=False)
-        msg = "`turbine_library` is 'wrong' but must be 'local' or 'oedb'."
-        with pytest.raises(ValueError, match=msg):
-            get_turbine_types("wrong")
-
-    def test_store_turbine_data_from_oedb(self):
-        store_turbine_data_from_oedb()
-
-    def test_wrong_url_load_turbine_data(self):
-        """Load turbine data from oedb."""
-        with pytest.raises(
-            ConnectionError, match="Database connection not successful"
-        ):
-            store_turbine_data_from_oedb("wrong_schema")
-
     @pytest.mark.filterwarnings("ignore:The WindTurbine")
     def test_string_representation_of_wind_turbine(self):
         assert "Wind turbine: ['hub height=120 m'" in repr(WindTurbine(120))