mikebridge commented on code in PR #40129: URL: https://github.com/apache/superset/pull/40129#discussion_r3344696219
########## tests/integration_tests/charts/soft_delete_tests.py: ########## @@ -0,0 +1,406 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +"""Integration tests for chart soft-delete and restore.""" + +from superset.constants import SKIP_VISIBILITY_FILTER_CLASSES +from superset.extensions import db +from superset.models.dashboard import Dashboard +from superset.models.slice import Slice +from superset.utils import json +from tests.integration_tests.base_tests import SupersetTestCase +from tests.integration_tests.constants import ADMIN_USERNAME, ALPHA_USERNAME +from tests.integration_tests.insert_chart_mixin import InsertChartMixin + + +def _hard_delete_chart(chart_id: int) -> None: + """Hard-delete a chart row regardless of soft-delete state.""" + row = ( + db.session.query(Slice) + .execution_options(**{SKIP_VISIBILITY_FILTER_CLASSES: {Slice}}) + .filter(Slice.id == chart_id) + .one_or_none() + ) + if row: + db.session.delete(row) + db.session.commit() + + +def _hard_delete_dashboard_for_charts_test(dashboard_id: int) -> None: + """Hard-delete a dashboard row regardless of soft-delete state.""" + row = ( + db.session.query(Dashboard) + .execution_options(**{SKIP_VISIBILITY_FILTER_CLASSES: {Dashboard}}) + .filter(Dashboard.id == dashboard_id) + .one_or_none() + ) + if row: + db.session.delete(row) + db.session.commit() + + +class TestChartSoftDelete(InsertChartMixin, SupersetTestCase): + """Tests for chart soft-delete behaviour (T013, T016).""" + + def test_delete_chart_soft_deletes(self): Review Comment: (1) `-> None` annotations added on all 12 test methods in b2b34b79e8. (2) `addCleanup` pattern deferred — agree it's the right shape but the diff to switch all 12 tests would be substantive and the trailing `_hard_delete_chart(chart_id)` pattern matches what the sibling soft-delete test suites do. Worth a follow-up cleanup commit once the entity PRs land. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
