Доработаны тесты

Author: redb0

graph/contour_graph.py

@@ -1,5 +1,4 @@
 import numpy as np
-from mpl_toolkits.mplot3d import Axes3D
 import matplotlib.pyplot as plt
 
 from graph.mpl_canvas import MlpCanvas

gui/mainwindow.py

@@ -339,19 +339,12 @@ def save_min_max(self):
     def draw_graph(self):
         self.parameters = self.read_parameters_function()
         # TODO: добавить комментарии
-        # constraints_high, er = parser_field.parse_number_list(self.display_error_message,
-        #                                                   self.ui.constraints_high.text(),
-        #                                                   self.ui.constraints_x1_label.text())
-        # constraints_down, er = parser_field.parse_number_list(self.display_error_message,
-        #                                                   self.ui.constraints_down.text(),
-        #                                                   self.ui.constraints_x2_label.text())
 
         expr_x1 = self.ui.slice_expr_x1.text()
         expr_x2 = self.ui.slice_expr_x2.text()
 
         # TODO: написать функцию validation для ограничений, != [], x[0]<x[1]
         if (self.parameters is not None) and (self.parameters.constraints_high != []) and (self.parameters.constraints_down != []):
-        # if (constraints_high != []) and (constraints_down != []) and (self.parameters is not None):
             self.graph_3d = None
             self.contour_graph = None
             self.slice_graph_1 = None

tests/draw_graph_test.py

@@ -9,43 +9,16 @@
 
 # тестируемый метод draw_graph
 from gui.mainwindow import MainWindow
+from parameters import Parameters
 
 
 class Closeable:
     def close(self):
         print('closed')
 
 
-type_f = ["", "method_min", "hyperbolic_potential", "exponential_potential"]
-constraints = [[], [-6, 6]]
-params = [True, None]
-# constraints = [[], [-6], [-6, 6], [6, -6], [0, 0], [-1, 0, 1]]
-
-
-@pytest.fixture(params=type_f)
-def param_type_f(request):
-    return request.param
-
-
-@pytest.fixture(params=constraints)
-def param_constraints(request):
-    return request.param
-
-
-@pytest.fixture(params=params)
-def param_loop(request):
-    return request.param
-
-
 class TestDrawGraph:
-    # @patch('gui.mainwindow.MainWindow.create_layout_with_graph')
-    # @patch('gui.mainwindow.MainWindow.delete_widget')
-    # @patch('gui.mainwindow.MainWindow.display_error_message')
-    def setup(self):  # no_print_er, no_dw, no_create_graph
-        # self.no_print_er = no_print_er
-        # self.no_dw = no_dw
-        # self.no_create_graph = no_create_graph
-
+    def setup(self):
         self.app = QApplication(sys.argv)
         self.mw = MainWindow()
         self.mw.show()
@@ -54,78 +27,46 @@ def teardown(self):
         with pytest.raises(SystemExit):
             with contextlib.closing(Closeable()):
                 sys.exit()
-        # sys.exit(self.app.exec_())
 
     @patch('graph.graph_3d.Canvas3dGraph')
     @patch('graph.contour_graph.CanvasContourGraph')
     @patch('graph.slice_graph.CanvasSliceGraph')
     @patch('gui.mainwindow.MainWindow.create_layout_with_graph')
     @patch('gui.mainwindow.MainWindow.delete_widget')
-    @patch('gui.mainwindow.MainWindow.display_error_message')
     @patch('gui.mainwindow.MainWindow.read_type')
-    @patch('parser_field.parse_number_list')
     @patch('gui.mainwindow.MainWindow.read_parameters_function')
-    @patch('gui.mainwindow.MainWindow.get_func')
-    def test_draw_graph(self, no_func, no_rpf, no_parser_field, no_rt, no_print_er, no_dw, no_create_graph,
-                        no_slice, no_contour, no_3d,
-                        param_type_f, param_constraints, param_loop):
-        print(param_type_f)
-        print(param_constraints)
-
-        # замена возвращаемого функцией parser_field.parse_number_list значения
-        no_parser_field.return_value = param_constraints
+    def test_draw_graph(self, read_parameters_function, no_rt, no_dw, no_create_graph,
+                        no_slice, no_contour, no_3d):
 
         # замена возвращаемого методом MainWindow.read_parameters_function значения
-        no_rpf.return_value = param_loop
+        coord = [[-2, 4], [0, 0], [4, 4], [4, 0], [-2, 0],[0, -2], [-4, 2], [2, -4], [2, 2], [-4, -2]]
+        func_value = [0, 3, 5, 6, 7, 8, 9, 10, 11, 12]
+        p = Parameters(1, "feldbaum_function", 10, coord, func_value,
+                       [[0.6, 1.6], [1.6, 2], [0.6, 0.6], [1.1, 1.8], [0.5, 0.5], [1.3, 1.3], [0.8, 1.2], [0.9, 0.3], [1.1, 1.7], [1.2, 0.5]],
+                       [[6, 6], [6, 7], [6, 7], [5, 5], [5, 5], [5, 5], [4, 3], [2, 4], [6, 4], [3, 3]],
+                       [6, 6], [-6, -6], [-2, 4], [6, 6], min_f=0, max_f=23)
+        read_parameters_function.return_value = p
 
         def f(): pass
-        # def log(s): print(s)
 
         no_dw.return_value = f
 
-        no_rt.return_value = param_type_f
-
-        no_func.return_value = f
+        no_rt.return_value = "feldbaum_function"
 
         no_create_graph.return_value = f
 
         self.mw.draw_graph()
 
-        assert no_rpf.called, "метод read_parameters_function не был вызван"
-        assert no_parser_field.called, "функция parser_field.parse_number_list не была вызвана"
-
-        if (not param_constraints) or (param_loop is None):  # param_constraints == []
-            no_print_er.assert_called_once_with("Что-то пошло не так")
-        else:
-            calls = [call(self.mw.ui.v_box_3d_graph), call(self.mw.ui.v_box_contour_graph),
-                     call(self.mw.ui.v_box_slice_graph1), call(self.mw.ui.v_box_slice_graph2)]
-            no_dw.assert_has_calls(calls)
-
-            assert no_rt.called, "метод read_type не вызван"
-            if param_type_f:  # param_type_f != ""
-                no_func.assert_called_once_with(param_type_f)
-                no_create_graph.assert_called()
-                # assert no_3d in no_create_graph.call_args_list, "некорректный вызов метода create_layout_with_graph"
-                no_create_graph.assert_called()
-                # assert no_contour in no_create_graph.call_args_list, "некорректный вызов метода create_layout_with_graph"
-
-                # self.no_create_graph.assert_called()
-                # assert no_slice in self.no_create_graph.call_args_list, "некорректный вызов метода create_layout_with_graph"
-                # self.no_create_graph.assert_called()
-                # assert no_slice in self.no_create_graph.call_args_list, "некорректный вызов метода create_layout_with_graph"
-            else:
-                no_print_er.assert_called_once_with("Выберите метод конструирования тестовой функции")
-
-
-        # data = [('', {'uid': ['happy times']})]
-        # search_s = Mock(return_value=data)
-        # no_ldap.return_value = Mock(search_s=search_s)
-        # count = 0
-        # for i in find_users('', '', '', ''):
-        #     count += 1
-        #     assert i=='happy times'
-        # assert count == 1
-
-
-# if __name__ == '__main__':
-#     unittest.main(verbosity=2)
+        assert read_parameters_function.called, "метод read_parameters_function не был вызван"
+
+        calls = [call(self.mw.ui.v_box_3d_graph), call(self.mw.ui.v_box_contour_graph),
+                 call(self.mw.ui.v_box_slice_graph1), call(self.mw.ui.v_box_slice_graph2)]
+        no_dw.assert_has_calls(calls)
+
+        assert no_rt.called, "метод read_type не вызван"
+
+        for i in range(len(func_value)):
+            assert self.mw.func(coord[i]) == func_value[i]
+
+        no_create_graph.assert_called()
+        no_create_graph.assert_called()

tests/func_test.py

@@ -0,0 +1,100 @@
+import contextlib
+
+import pytest
+
+import sys
+
+from PyQt5.QtWidgets import QApplication
+from mock import patch, call
+
+# тестируемый метод draw_graph
+from gui.mainwindow import MainWindow
+
+
+class Closeable:
+    def close(self):
+        print('closed')
+
+
+type_f = ["", "method_min", "hyperbolic_potential", "exponential_potential"]
+constraints = [[], [-6, -6]]
+params = [True, None]
+# constraints = [[], [-6], [-6, 6], [6, -6], [0, 0], [-1, 0, 1]]
+
+
+@pytest.fixture(params=type_f)
+def param_type_f(request):
+    return request.param
+
+
+@pytest.fixture(params=constraints)
+def param_constraints(request):
+    return request.param
+
+
+@pytest.fixture(params=params)
+def param_loop(request):
+    return request.param
+
+
+@pytest.mark.skip("Не доделан")
+class TestDrawGraph:
+    def setup(self):
+        self.app = QApplication(sys.argv)
+        self.mw = MainWindow()
+        self.mw.show()
+
+    def teardown(self):
+        with pytest.raises(SystemExit):
+            with contextlib.closing(Closeable()):
+                sys.exit()
+
+    @patch('graph.graph_3d.Canvas3dGraph')
+    @patch('graph.contour_graph.CanvasContourGraph')
+    @patch('graph.slice_graph.CanvasSliceGraph')
+    @patch('gui.mainwindow.MainWindow.create_layout_with_graph')
+    @patch('gui.mainwindow.MainWindow.delete_widget')
+    @patch('gui.mainwindow.MainWindow.display_error_message')
+    @patch('gui.mainwindow.MainWindow.read_type')
+    @patch('gui.mainwindow.MainWindow.read_parameters_function')
+    @patch('gui.mainwindow.MainWindow.get_func')
+    def test_draw_graph(self, no_func, no_rpf, no_rt, no_print_er, no_dw, no_create_graph,
+                        no_slice, no_contour, no_3d,
+                        param_type_f, param_constraints, param_loop):
+        print(param_type_f)
+        print(param_constraints)
+
+        # замена возвращаемого методом MainWindow.read_parameters_function значения
+        no_rpf.return_value = param_loop
+
+        def f(): pass
+
+        no_dw.return_value = f
+
+        no_rt.return_value = param_type_f
+
+        no_func.return_value = f
+
+        no_create_graph.return_value = f
+
+        self.mw.draw_graph()
+
+        assert no_rpf.called, "метод read_parameters_function не был вызван"
+
+        if (not param_constraints) or (param_loop is None):  # param_constraints == []
+            no_print_er.assert_called_once_with("Что-то пошло не так")
+        else:
+            calls = [call(self.mw.ui.v_box_3d_graph), call(self.mw.ui.v_box_contour_graph),
+                     call(self.mw.ui.v_box_slice_graph1), call(self.mw.ui.v_box_slice_graph2)]
+            no_dw.assert_has_calls(calls)
+
+            assert no_rt.called, "метод read_type не вызван"
+            if param_type_f:  # param_type_f != ""
+                no_func.assert_called_once_with(param_type_f)
+                no_create_graph.assert_called()
+                no_create_graph.assert_called()
+            else:
+                no_print_er.assert_called_once_with("Выберите метод конструирования тестовой функции")
+
+
+

tests/make_data_slice_graph_test.py

@@ -30,7 +30,7 @@ def teardown(self):
         pass
 
     def test_make_data(self, expression_loop):
-        x, y = self.obj.make_data(self.constraints, self.constraints, mock_func, expression_loop)
+        x, y = self.obj.make_data([6, 6], [-6, -6], mock_func, expression_loop)
         print(x)
         print(y)
         if expression_loop in ["x1", "x2"]:

tests/unut_tests/parser_test.py

@@ -25,35 +25,35 @@ def setUp(self):
     """
     def test_parse_number_list_empty_str(self):
         errors = []
-        res = pf.parse_number_list(lambda x: errors.append(x), "", self.field_name)
-        self.assertEqual(errors[0], "Поле \"" + self.field_name + "\" не заполнено")
+        res, er = pf.parse_number_list("", self.field_name)
+        self.assertEqual(er, "Поле \"" + self.field_name + "\" не заполнено")
         self.assertEqual(res, [])
 
     def test_parse_number_list_int(self):
-        res = pf.parse_number_list(None, "-1, 2, -3, 4, -5", self.field_name)
+        res, er = pf.parse_number_list("-1, 2, -3, 4, -5", self.field_name)
         # self.assertEqual(errors[0], "Поле \"" + self.field_name + "\" не заполнено")
         self.assertEqual(res, [-1, 2, -3, 4, -5])
 
     def test_parse_number_list_float(self):
-        res = pf.parse_number_list(None, "1.185628563, 2.3, -3.0, 4.617, -5.0234820", self.field_name)
+        res, er = pf.parse_number_list("1.185628563, 2.3, -3.0, 4.617, -5.0234820", self.field_name)
         # self.assertEqual(errors[0], "Поле \"" + self.field_name + "\" не заполнено")
         self.assertEqual(res, [1.185628563, 2.3, -3.0, 4.617, -5.0234820])
 
     def test_parse_number_list_str(self):
-        res = pf.parse_number_list(None, "п, 2.3, -3.0, 4.6f7, -5.02sdf20", self.field_name)
+        res, er = pf.parse_number_list("п, 2.3, -3.0, 4.6f7, -5.02sdf20", self.field_name)
         # self.assertEqual(errors[0], "Поле \"" + self.field_name + "\" не заполнено")
-        self.assertEqual(res, "Поле \"" + self.field_name + "\" заполнено некорректно")
+        self.assertEqual(er, "Поле \"" + self.field_name + "\" заполнено некорректно")
 
     # parse_number(number, field_name: str, print_error) -> int
     def test_parse_number_ok(self):
-        res = pf.parse_number(1, self.field_name, None)
+        res, er = pf.parse_number(1, self.field_name)
         # self.assertEqual(errors[0], "Поле \"" + self.field_name + "\" не заполнено")
         self.assertEqual(res, 1)
 
     def test_parse_number_fail(self):
         errors = []
-        res = pf.parse_number(0, self.field_name, lambda x: errors.append(x))
-        self.assertEqual(errors[0], "Поле \"" + self.field_name + "\" заполнено некорректно")
+        res, er = pf.parse_number(0, self.field_name)
+        self.assertEqual(er, "Поле \"" + self.field_name + "\" заполнено некорректно")
         self.assertEqual(res, 0)
 
     """
@@ -67,18 +67,18 @@ def test_parse_number_fail(self):
     """
     def test_parse_coordinates_empty_str(self):
         errors = []
-        res = pf.parse_coordinates("", lambda x: errors.append(x))
-        self.assertEqual(errors[0], "Поле \"Координаты экстремумов\" не заполнено")
+        res, er = pf.parse_coordinates("")
+        self.assertEqual(er, "Поле \"Координаты экстремумов\" не заполнено")
         self.assertEqual(res, [])
 
     def test_parse_coordinates_str(self):
         errors = []
-        res = pf.parse_coordinates("[1, 2], [d, g], [9, 0o]", lambda x: errors.append(x))
-        self.assertEqual(errors[0], "Поле \"Координаты экстремумов\" заполнено некорректно")
+        res, er = pf.parse_coordinates("[1, 2], [d, g], [9, 0o]")
+        self.assertEqual(er, "Поле \"Координаты экстремумов\" заполнено некорректно")
         self.assertEqual(res, [])
 
     def test_parse_coordinates_ok(self):
-        res = pf.parse_coordinates("[1, 2], [8, 3], [9, 0]", None)
+        res, er = pf.parse_coordinates("[1, 2], [8, 3], [9, 0]")
         self.assertEqual(res, [[1, 2], [8, 3], [9, 0]])