Fix tests after changes in entities with multi-d elements

spinetoolbox/spine_db_manager.py

@@ -1487,9 +1487,7 @@ def duplicate_entity(self, orig_name, dup_name, class_name, db_maps):
                     index = item["dimension_name_list"].index(class_name)
                     name_list = element_name_list
                     dup_name_list = name_list[:index] + (dup_name,) + name_list[index + 1 :]
-                    dup_entity_import_data.append(
-                        (item_class_name, name_from_elements(dup_name_list), dup_name_list, item["description"])
-                    )
+                    dup_entity_import_data.append((item_class_name, dup_name_list, item["description"]))
             dup_import_data[db_map] = {"entities": dup_entity_import_data}
             dup_value_import_data = []
             for item in db_map.get_parameter_value_items(entity_class_name=class_name, entity_name=orig_name):

tests/spine_db_editor/widgets/test_SpineDBEditorWithDBMapping.py

@@ -97,7 +97,7 @@ def test_duplicate_object_in_object_tree_model(self):
         fish_dog_item.fetch_more()
         self.assertEqual(fish_dog_item.row_count(), 2)
         nemo_pluto_dupe = fish_dog_item.child(1)
-        self.assertEqual(nemo_pluto_dupe.display_data, "nemo (1)__pluto[nemo (1) ǀ pluto]")
+        self.assertEqual(nemo_pluto_dupe.display_data, "nemo (1) ǀ pluto")
         root_index = self.spine_db_editor.entity_tree_model.index_from_item(root_item)
         self.spine_db_editor.ui.treeView_entity.selectionModel().setCurrentIndex(
             root_index, QItemSelectionModel.SelectionFlags.ClearAndSelect

tests/spine_db_editor/widgets/test_custom_qtreeview.py

@@ -222,7 +222,7 @@ def test_add_entity_with_single_dimension(self):
         self.assertEqual(model.rowCount(class_index), 1)
         entity_index = model.index(0, 0, class_index)
         self.assertEqual(model.rowCount(entity_index), 0)
-        self.assertEqual(entity_index.data(), "a_relationship[an_entity]")
+        self.assertEqual(entity_index.data(), "an_entity")
         database_index = model.index(0, 1, class_index)
         self.assertEqual(database_index.data(), self.db_codename)
         self._commit_changes_to_database("Add an entities.")
@@ -471,13 +471,13 @@ def test_database_contents_shown_correctly(self):
         entity_ndex = model.index(0, 0, class_index)
         self.assertEqual(model.rowCount(entity_ndex), 0)
         self.assertEqual(model.columnCount(entity_ndex), 2)
-        self.assertEqual(entity_ndex.data(), "object_11__object_21[object_11 ǀ object_21]")
+        self.assertEqual(entity_ndex.data(), "object_11 ǀ object_21")
         database_index = model.index(0, 1, class_index)
         self.assertEqual(database_index.data(), self.db_codename)
         entity_ndex = model.index(1, 0, class_index)
         self.assertEqual(model.rowCount(entity_ndex), 0)
         self.assertEqual(model.columnCount(entity_ndex), 2)
-        self.assertEqual(entity_ndex.data(), "object_11__object_22[object_11 ǀ object_22]")
+        self.assertEqual(entity_ndex.data(), "object_11 ǀ object_22")
         database_index = model.index(1, 1, class_index)
         self.assertEqual(database_index.data(), self.db_codename)
 
@@ -549,7 +549,7 @@ def test_modify_entitys_elements(self):
         view.setCurrentIndex(entity_index)
         _edit_entity_tree_item({0: "object_12"}, view, "Edit...", EditEntitiesDialog)
         QApplication.processEvents()  # Fixes "silent" Traceback.
-        self.assertEqual(entity_index.data(), "object_11__object_21[object_12 ǀ object_21]")
+        self.assertEqual(entity_index.data(), "object_12 ǀ object_21")
         self._commit_changes_to_database("Change relationship's objects.")
         class_id = (
             self._db_map.query(self._db_map.entity_class_sq)
@@ -658,7 +658,7 @@ def test_removing_element_removes_corresponding_entity(self):
         while model.rowCount(class_index) != 1:
             QApplication.processEvents()
         entity_index = model.index(0, 0, class_index)
-        self.assertEqual(entity_index.data(), "object_11__object_22[object_11 ǀ object_22]")
+        self.assertEqual(entity_index.data(), "object_11 ǀ object_22")
         self._commit_changes_to_database("Remove object.")
         data = self._db_map.query(self._db_map.entity_sq).all()
         self.assertEqual(len(data), 4)