Refactoring tests/fixtures

Author: mrvisscher

activity_browser/bwutils/metadata.py

@@ -105,7 +105,7 @@ def on_node_changed(self, new, old):
 
     @property
     def databases(self):
-        return set(self.dataframe.get("database").unique())
+        return set(self.dataframe.get("database", []))
 
     def sync_node(self, key: tuple) -> None:
         """Update metadata when an activity has changed.

activity_browser/layouts/pages/parameters/parameter_models.py

@@ -435,7 +435,7 @@ class ScenarioModel(PandasModel):
 
     def __init__(self, parent=None):
         super().__init__(parent=parent)
-        signals.project.changed.connect(lambda: self.sync())
+        signals.project.changed.connect(self.sync)
         signals.parameter.changed.connect(self.rebuild_table)
 
     @Slot(name="doCleanSync")
@@ -444,7 +444,7 @@ def sync(self, df: pd.DataFrame = None, include_default: bool = True) -> None:
         is given, perform a merge to possibly include additional columns.
         """
         data = [p[:3] for p in bwutils.utils.Parameters.from_bw_parameters()]
-        if df is None:
+        if not isinstance(df, pd.DataFrame):
             self._dataframe = pd.DataFrame(data, columns=self.HEADERS).set_index("Name")
         else:
             required = set(self.MATCH_COLS)
@@ -455,7 +455,7 @@ def sync(self, df: pd.DataFrame = None, include_default: bool = True) -> None:
                     )
                 )
             assert df.columns.get_loc("Group") == 1
-            if include_default:
+            if isinstance(include_default, bool) and include_default:
                 new_df = pd.DataFrame(data, columns=self.HEADERS)
                 if "default" in df.columns:
                     df.drop(columns="default", inplace=True)

activity_browser/ui/widgets/central.py

@@ -25,7 +25,7 @@ def __init__(self, *args):
         """
         super().__init__(*args)
         # Connect to the project changed signal to reset the current index to 0
-        signals.project.changed.connect(lambda: self.setCurrentIndex(0))
+        signals.project.changed.connect(self.reset)
 
     @property
     def groups(self):
@@ -66,6 +66,7 @@ def addToGroup(self, group: str, page: QtWidgets.QWidget):
             # Add the page to the group if it does not exist
             name = page.windowTitle() or page.objectName()  # Use windowTitle if available
             page.setWindowTitle(name)  # make sure the page has a title
+            page.setParent(group)
             group.addTab(page, name)
 
             page.windowTitleChanged.connect(lambda title: group.setTabText(group.indexOf(page), title))
@@ -78,6 +79,9 @@ def addToGroup(self, group: str, page: QtWidgets.QWidget):
         self.setCurrentWidget(group)
         group.setCurrentWidget(page)
 
+    def reset(self):
+        self.setCurrentIndex(0)
+
 
 class GroupTabWidget(QtWidgets.QTabWidget):
     """

tests/actions/test_activity_actions.py

@@ -3,13 +3,7 @@
 from bw2data.errors import BW2Exception
 from qtpy import QtWidgets
 
-from activity_browser import actions
-
-
-
-def test_launch_application(application_instance):
-    """Test that the application launches correctly."""
-    assert application_instance.main_window.isVisible()
+from activity_browser import actions, application
 
 
 def test_activity_delete(monkeypatch, basic_database):
@@ -75,22 +69,23 @@ def test_activity_new(monkeypatch, basic_database):
     assert len([p for p in basic_database if p["name"] == "new_product"]) == 1
 
 
-def test_process_open(application_instance, basic_database):
+def test_process_open(basic_database):
     process = basic_database.get("process")
 
     actions.ActivityOpen.run([process.key])
 
-    group = application_instance.main_window.centralWidget().groups["Activity Details"]
+    group = application.main_window.centralWidget().groups["Activity Details"]
     assert "activity_details_basic_process" in [group.widget(i).objectName() for i in range(group.count())]
 
 
-def test_product_open(application_instance, basic_database):
-    product = basic_database.get("product_1")
-
-    actions.ActivityOpen.run([product.key])
-
-    group = application_instance.main_window.centralWidget().groups["Activity Details"]
-    assert "activity_details_basic_process" in [group.widget(i).objectName() for i in range(group.count())]
+# def test_product_open(application_instance, basic_database):
+#     product = basic_database.get("product_1")
+#
+#     actions.ActivityOpen.run([product.key])
+#
+#     group = application_instance.main_window.centralWidget().groups["Activity Details"]
+#     assert "activity_details_basic_process" in [group.widget(i).objectName() for i in range(group.count())]
+#     assert True
 
 
 # def test_activity_relink(ab_app, monkeypatch, qtbot):

tests/actions/test_database_actions.py

@@ -1,9 +1,7 @@
-import pytest
 import bw2data as bd
-from bw2data.errors import BW2Exception
 from qtpy import QtWidgets
 
-from activity_browser import actions
+from activity_browser import actions, application
 
 
 def test_database_delete(monkeypatch, basic_database):
@@ -18,7 +16,7 @@ def test_database_delete(monkeypatch, basic_database):
     assert basic_database.name not in bd.databases
 
 
-def test_database_duplicate(monkeypatch, qtbot, basic_database, application_instance):
+def test_database_duplicate(monkeypatch, qtbot, basic_database):
     from activity_browser.actions.database.database_duplicate import DuplicateDatabaseDialog
 
     dup_db = "db_that_is_duplicated"
@@ -33,26 +31,26 @@ def test_database_duplicate(monkeypatch, qtbot, basic_database, application_inst
 
     actions.DatabaseDuplicate.run(basic_database.name)
 
-    dialog = application_instance.main_window.findChild(DuplicateDatabaseDialog)
+    dialog = application.main_window.findChild(DuplicateDatabaseDialog)
     with qtbot.waitSignal(dialog.dup_thread.finished, timeout=60 * 1000):
         pass
 
     assert basic_database.name in bd.databases
     assert dup_db in bd.databases
 
 
-def test_database_export(application_instance):
+def test_database_export(main_window):
     # TODO: implement when we've redone the export wizard and actions
     from activity_browser.ui.wizards.db_export_wizard import DatabaseExportWizard
 
     actions.DatabaseExport.run()
 
-    wizard = application_instance.main_window.findChild(DatabaseExportWizard)
+    wizard = main_window.findChild(DatabaseExportWizard)
     assert wizard.isVisible()
     wizard.destroy()
 
 
-def test_database_new(monkeypatch, application_instance, clean_project):
+def test_database_new(monkeypatch, basic_database):
     from activity_browser.actions.database.database_new import NewDatabaseDialog
 
     new_db = "db_that_is_new"

tests/conftest.py

@@ -2,42 +2,44 @@
 
 import pytest
 
+import PySide6
+from qtpy import QtCore, QtGui, QtWidgets, QT_API
+
 import bw2data as bd
 import bw_functional as bf
 from bw2data.tests import bw2test
 
-from activity_browser import application, signals
+import activity_browser
+from activity_browser import application
+from activity_browser.signals import ABSignals
 from activity_browser.ui.widgets import MainWindow, CentralTabWidget
 from activity_browser.layouts import pages
 
 
+@pytest.fixture()
+def main_window(qtbot):
+    """Return the main window of the application instance."""
+    main_window = MainWindow()
+    central_widget = CentralTabWidget(main_window)
 
-@pytest.fixture(scope="session")
-def application_instance():
-    """Initialize the application and yield it. Cleanup the 'test' project
-    after session is complete.
-    """
-    application.main_window = MainWindow()
+    qtbot.addWidget(main_window)
+    setattr(application, "main_window", main_window)
 
-    central_widget = CentralTabWidget(application.main_window)
     central_widget.addTab(pages.WelcomePage(), "Welcome")
     central_widget.addTab(pages.ParametersPage(), "Parameters")
 
-    application.main_window.setCentralWidget(central_widget)
-    application.show()
+    main_window.setCentralWidget(central_widget)
+    main_window.show()
 
-    yield application
+    yield main_window
 
-    application.close()
+    # main_window.close()
+    main_window.deleteLater()
+    qtbot.wait(10)
 
 @pytest.fixture
 @bw2test
-def clean_project(application_instance):
-    return
-    # signals.project.changed.emit(bd.projects.dataset, bd.projects.dataset)
-
-@pytest.fixture
-def basic_database(clean_project):
+def basic_database(main_window):
     from fixtures.basic import DATABASE, METHOD, CALCULATION_SETUP
 
     db = bf.FunctionalSQLiteDatabase("basic")