From aae176252d6ea4c02791cef98dbee93e4d43ea94 Mon Sep 17 00:00:00 2001 From: mistangl Date: Thu, 18 Jan 2024 11:27:52 +0100 Subject: [PATCH] =?UTF-8?q?test=20der=20gui=20nicht=20mehr=20ben=C3=B6tigt?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/test_configread.py | 18 +++++----- lib/test_gui.py | 80 ------------------------------------------ 2 files changed, 10 insertions(+), 88 deletions(-) delete mode 100644 lib/test_gui.py diff --git a/lib/test_configread.py b/lib/test_configread.py index a885c6b..e48db71 100644 --- a/lib/test_configread.py +++ b/lib/test_configread.py @@ -50,6 +50,7 @@ class TestTOSGroupsFromLocalConfigs(unittest.TestCase): 'TOS_MAS_Konfig': 2, 'TOS_ILS_2': 3, 'TOS_ILS_Foerderer': 3, + 'TOS_MAS_Fahrstrecke': 3, 'TOS_Trolley': 3, 'TOS_Trolley_Projekte': 3, 'TOS_Trolley_Omniflo': 4, @@ -72,7 +73,7 @@ class TestTOSGroupsFromLocalConfigs(unittest.TestCase): class TestTOSGroupsGeneral(unittest.TestCase): def setUp(self): - + self.config_dir = os.environ.get('CREMIG_CFG') self.tos_test_str = """ { "root": "TOS-Gruppe", @@ -179,7 +180,7 @@ class TestTOSGroupsGeneral(unittest.TestCase): loaded from local config and environment variable """ - TOS_CFG = manage_configs.TOSGroupsConfig() + TOS_CFG = manage_configs.TOSGroupsConfig(self.config_dir) TOS_CFG.from_json(self.tos_test_str) allKeywords = TOS_CFG.get_all_keywords() @@ -212,7 +213,7 @@ class TestTOSGroupsGeneral(unittest.TestCase): class TestMaterialien(unittest.TestCase): def setUp(self): - + self.config_dir = os.environ.get('CREMIG_CFG') self.materials_str = """ { "1.4301": { @@ -249,7 +250,7 @@ class TestMaterialien(unittest.TestCase): Test whether all materials are found """ - TOS_CFG = manage_configs.MaterialTransConfig() + TOS_CFG = manage_configs.MaterialTransConfig(self.config_dir) TOS_CFG.from_json(self.materials_str) allMaterials = TOS_CFG.get_all_materials() @@ -262,7 +263,7 @@ class TestMaterialien(unittest.TestCase): Test whether material of steel, etc. is found """ - TOS_CFG = manage_configs.MaterialTransConfig() + TOS_CFG = manage_configs.MaterialTransConfig(self.config_dir) TOS_CFG.from_json(self.materials_str) content = TOS_CFG.get_material_of_type("1.4301") @@ -306,6 +307,7 @@ class TestWerkstoffeFromLocalConfigs(unittest.TestCase): class TestWerkstoffe(unittest.TestCase): def setUp(self): + self.config_dir = os.environ.get('CREMIG_CFG') self.wkstoffe = """ [Werkstofftyp] @@ -357,7 +359,7 @@ siehe Hersteller get list of steels """ - WKST_CFG = manage_configs.WerkstoffeConfig() + WKST_CFG = manage_configs.WerkstoffeConfig(self.config_dir) WKST_CFG.from_cfg_str(self.wkstoffe) steels = WKST_CFG.get_werkstoffe_of_name("Stahl") @@ -370,7 +372,7 @@ siehe Hersteller class TestAllgmein(unittest.TestCase): def setUp(self): - + self.config_dir = os.environ.get('CREMIG_CFG') self.allgemein = """ [Kategorien] @@ -412,7 +414,7 @@ Mischteil get list of sections in allgmein """ - ALLG_CFG = manage_configs.AllgemeinConfig() + ALLG_CFG = manage_configs.AllgemeinConfig(self.config_dir) ALLG_CFG.from_cfg_str(self.allgemein) allg_secs = ALLG_CFG.get_sections() diff --git a/lib/test_gui.py b/lib/test_gui.py deleted file mode 100644 index 944078a..0000000 --- a/lib/test_gui.py +++ /dev/null @@ -1,80 +0,0 @@ -import tkinter as tk -from caditem import CadItem -from CreoMigrateGui import App -from controller import Controller, GuiLogic - -json_str = """ -{ - "parent_children_mapping": { - "400102130": [ "400102142" ], - "400102167": [ "821116004" ], - "400102168": [ "821116001" ], - "400102195": [ "822066075", "822066216", "822066154", "822066101", - "822064090", "822066196", "400102129", "822066217", "822066160", - "822066215", "913041045", "913011009", "911011057", "822064035", - "925011006", "911091041", "913051040", "911021112", "911021166", - "825006003", "912041005", "911011014", "911011009", "911021144", - "911021001", "913011016", "929055170", "913011010", "911021035", - "829416065", "712000151", "712000100" ], - "400102196": [ "400102125", "400102126", "400102130", "400102161", - "400102163", "400102165", "400102166", "400102167", "400102168", - "400102190", "400102195", "400102198", "400102246", "400102247", - "400102267", "400102272", "400102274", "400102275", "400102277", - "400102278", "400102282", "400102284", "400102417", "720002003", - "721001034", "821114025", "822064091", "822066085", "822996075", - "829416061", "829516004", "911021113", "911021181", "911021259", - "911091054", "911091096", "911091097", "911251013", "912011009", - "919050006", "924031058", "924031081" ], - "400102235": [ "400102236", "400102237", "400102238", "400102239", - "400102268", "911021143", "911021054", "911021055" ], - "400102236": [ "MA0000006" ], - "400102267": [ "400102235", "829416159", "829416077", "829416079", - "911021260", "911021147", "911251014" ], - "400102282": [ "822066026", "822066089", "919010052" ], - "821114025": [ "911081007", "821116053" ], - "821116004": [ "822026004" ], - "822064035": [ "822066065" ], - "822064091": [ "822066212", "822064093", "822066220", "822066200", - "912011010", "911021156", "822066201", "911071027", "913011109", - "911011070", "913011001", "710005021", "919010055", "720000008", "720000007" ], - "822064093": [ "822066204", "822066205", "822066206", "822066207", "822066208" ], - "822066075": [ "822066157", "822066162", "911261023" ], - "822066160": [ "MA0000004" ], - "822066162": [ "822064013" ], - "822066196": [ "MA0000008" ], - "822066220": [ "924031033" ], - "829416159": [ "829416089" ] - }, - "red_ids": [ "400102274", "400102275", "400102190", "400102198", "400102161", - "400102277", "400102163", "400102278", "400102282", "400102284", - "400102195", "MA0000008", "MA0000004", "929055170", "400102267", - "400102235", "400102236", "MA0000006", "400102237", "400102238", - "400102239", "400102268", "829416159", "924031058", "924031081", - "822064091", "822066199", "822066200" ], - "gui_data": { - "asm_id": "400102196", - "teilenummer": "400102142", - "pdm_kategorie_neu": "Einzelteil", - "neuaufbau": "False", - "lebenszyklus_status_neu": "Serie", - "aus_halbzeug_neu": "True", - "zusatzinfos_text_neu": "Dies sind neue Zusatzinfos" - }, - "data": {} -} -""" -model = CadItem() -model.from_json(json_str) - -root = tk.Tk() -app = App(root) -controller = Controller(model, app) -logic = GuiLogic() -controller.add_logic(logic) -# um ohne Observer pattern auch Rückmeldungen geben zu können -app.set_controller(controller) -model.set_controller(controller) - -# Daten des Modells in der Oberfläche darstellen -controller.refresh_gui() -app.mainloop()