From 1d053746b933c15439ba8c1ae9e22ace369b578e Mon Sep 17 00:00:00 2001 From: StefanBerlin Date: Tue, 16 Dec 2014 11:58:08 +0100 Subject: [PATCH] fixed bug in regex -> invalid xml --- main.py | 5 +- main_2.py | 43 -------------- papi/main.py | 43 -------------- papi/main_2.py | 43 -------------- papi/tests/TestCore.py | 123 ----------------------------------------- 5 files changed, 3 insertions(+), 254 deletions(-) delete mode 100644 main_2.py delete mode 100644 papi/main.py delete mode 100644 papi/main_2.py delete mode 100644 papi/tests/TestCore.py diff --git a/main.py b/main.py index ef94db29..c3f00f5b 100644 --- a/main.py +++ b/main.py @@ -30,11 +30,12 @@ import sys from papi.core import Core -from papi.gui.qt_dev.gui_main import startGUI +from papi.gui.qt_dev.gui_main import startGUI as dev_startGui +from papi.gui.qt_new.main import startGUI as new_startGui def main(): - core = Core(startGUI) + core = Core(new_startGui) core.run() diff --git a/main_2.py b/main_2.py deleted file mode 100644 index c3f00f5b..00000000 --- a/main_2.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/python3 -# -*- coding: latin-1 -*- - -""" -Copyright (C) 2014 Technische Universität Berlin, -Fakultät IV - Elektrotechnik und Informatik, -Fachgebiet Regelungssysteme, -Einsteinufer 17, D-10587 Berlin, Germany - -This file is part of PaPI. - -PaPI is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -PaPI is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with PaPI. If not, see . - -Contributors -Sven Knuth -""" - -__author__ = 'control' - -import sys -from papi.core import Core -from papi.gui.qt_dev.gui_main import startGUI as dev_startGui -from papi.gui.qt_new.main import startGUI as new_startGui - - -def main(): - core = Core(new_startGui) - core.run() - - -if __name__ == '__main__': - sys.exit(main()) diff --git a/papi/main.py b/papi/main.py deleted file mode 100644 index b35e608e..00000000 --- a/papi/main.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/python3 -# -*- coding: latin-1 -*- - -""" -Copyright (C) 2014 Technische Universität Berlin, -Fakultät IV - Elektrotechnik und Informatik, -Fachgebiet Regelungssysteme, -Einsteinufer 17, D-10587 Berlin, Germany - -This file is part of PaPI. - -PaPI is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -PaPI is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with PaPI. If not, see . - -Contributors -Sven Knuth -""" - -__author__ = 'control' - -import sys -from papi.core import Core -from papi.gui.qt_dev.gui_main import startGUI as dev_startGui - - - -def main(): - core = Core(dev_startGui) - core.run() - - -if __name__ == '__main__': - sys.exit(main()) diff --git a/papi/main_2.py b/papi/main_2.py deleted file mode 100644 index c3f00f5b..00000000 --- a/papi/main_2.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/python3 -# -*- coding: latin-1 -*- - -""" -Copyright (C) 2014 Technische Universität Berlin, -Fakultät IV - Elektrotechnik und Informatik, -Fachgebiet Regelungssysteme, -Einsteinufer 17, D-10587 Berlin, Germany - -This file is part of PaPI. - -PaPI is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -PaPI is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with PaPI. If not, see . - -Contributors -Sven Knuth -""" - -__author__ = 'control' - -import sys -from papi.core import Core -from papi.gui.qt_dev.gui_main import startGUI as dev_startGui -from papi.gui.qt_new.main import startGUI as new_startGui - - -def main(): - core = Core(new_startGui) - core.run() - - -if __name__ == '__main__': - sys.exit(main()) diff --git a/papi/tests/TestCore.py b/papi/tests/TestCore.py deleted file mode 100644 index 057c17f0..00000000 --- a/papi/tests/TestCore.py +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/python3 -#-*- coding: latin-1 -*- - -""" -Copyright (C) 2014 Technische Universität Berlin, -Fakultät IV - Elektrotechnik und Informatik, -Fachgebiet Regelungssysteme, -Einsteinufer 17, D-10587 Berlin, Germany - -This file is part of PaPI. - -PaPI is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -PaPI is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with PaPI. If not, see . - -Contributors: -Stefan Ruppin -""" - - -import unittest -from papi.core import Core -from papi.PapiEvent import PapiEvent -from papi.data.DCore import DPlugin,DCore -from multiprocessing import Process, Array, Lock, Queue -import time -from papi.main import main - -class TestCore(unittest.TestCase): - - def setUp(self): - self.core = Core() - - - def test_process_event_alive(self): - self.core.__debugLevel__ = 0 - event = PapiEvent(1,2,'status_event','alive','') - self.core.__process_event__(event) - assert self.core.__debug_var__ == 'alive' - - def test_process_event_check_alive(self): - self.core.__debugLevel__ = 0 - event = PapiEvent(1,2,'status_event','check_alive_status','') - self.core.__process_event__(event) - assert self.core.__debug_var__ == 'check_alive_status' - - def test_process_event_start_successfull(self): - self.core.__debugLevel__ = 0 - print('Test start successfull -----------------------') - event = PapiEvent(1,2,'status_event','start_successfull','') - self.core.__process_event__(event) - assert self.core.__debug_var__ == 'start_successfull' - - def test_process_event_join_request(self): - print('Test join request -----------------------') - event = PapiEvent(1,0,'instr_event','create_plugin','TestPL1') - self.core.plugin_manager.setPluginPlaces(["plugin","../plugin"]) - self.core.plugin_manager.collectPlugins() - self.core.__process_event__(event) - - pl = self.core.core_data.dbg_get_first_dplugin() - - self.assert_(pl.process.is_alive()) - event = PapiEvent(id,0,'instr_event','stop','') - pl.queue.put(event) - time.sleep(1) - assert pl.process.is_alive() == False - - - def test_process_event_start_failed(self): - self.core.__debugLevel__ = 0 - event = PapiEvent(1,2,'status_event','start_failed','') - self.core.__process_event__(event) - assert self.core.__debug_var__ == 'start_failed' - - def test_process_event_new_data(self): - self.core.__debugLevel__ = 0 - event = PapiEvent(1,2,'data_event','new_data','') - self.core.__process_event__(event) - assert self.core.__debug_var__ == 'new_data' - - def test_process_event_get_output_size(self): - self.core.__debugLevel__ = 0 - event = PapiEvent(1,2,'data_event','get_output_size','') - self.core.__process_event__(event) - assert self.core.__debug_var__ == 'get_output_size' - - def test_process_event_response_output_size(self): - self.core.__debugLevel__ = 0 - event = PapiEvent(1,2,'data_event','response_output_size','') - self.core.__process_event__(event) - assert self.core.__debug_var__ == 'response_output_size' - - def test_process_event_create_plugin(self): - self.core.__debugLevel__ = 0 - return True - event = PapiEvent(1,2,'instr_event','create_plugin','TestPL1') - self.core.plugin_manager.setPluginPlaces(["plugin","../plugin"]) - self.core.plugin_manager.collectPlugins() - self.core.__process_event__(event) - assert self.core.__debug_var__ == 'create_plugin' - - def test_process_event_stop_plugin(self): - self.core.__debugLevel__ = 0 - event = PapiEvent(1,2,'instr_event','stop_plugin','') - self.core.__process_event__(event) - assert self.core.__debug_var__ == 'stop_plugin' - - - - -if __name__ == "__main__": - unittest.main(); -