fix poetry merge test, add setuptools merge test

Author: mustafasoylu

tests/output/test_pyproject_writer.py

@@ -2,7 +2,7 @@
 import pytest
 
 from somesy.core.models import LicenseEnum, Person, ProjectMetadata
-from somesy.pyproject.writer import Poetry, Pyproject, PyprojectCommon, SetupTools
+from somesy.pyproject.writer import Poetry, SetupTools
 
 
 @pytest.fixture
@@ -23,6 +23,12 @@ def pyproject_setuptools(load_files, file_types):
     return files[file_types.SETUPTOOLS]
 
 
+@pytest.fixture
+def pyproject_setuptools_file(create_files, file_types):
+    folder = create_files([(file_types.SETUPTOOLS, "pyproject.toml")])
+    return folder / Path("pyproject.toml")
+
+
 def test_content_match(pyproject_poetry, pyproject_setuptools):
     # create a function to check both file formats
     def assert_content_match(pyproject_file):
@@ -79,7 +85,7 @@ def test_from_to_person(person):
     assert p.email == person.email
 
 
-def test_person_merge_poetry(pyproject_poetry_file, person: Person):
+def test_person_merge_poetry(pyproject_poetry_file, person):
     pj = Poetry(pyproject_poetry_file)
 
     pm = ProjectMetadata(
@@ -113,11 +119,12 @@ def test_person_merge_poetry(pyproject_poetry_file, person: Person):
     pj.sync(pm)
     pj.save()
 
-    # existing author order preserved
-    # ERROR: not preserved
-    assert pj.authors[0] == f"{person1b.full_name} <{person1b.email}>"
+    # existing author info preserved, order not preserved because no orcid
+    person1b_str = f"{person1b.full_name} <{person1b.email}>"
+    assert (pj.authors[0] == person1b_str) or (pj.authors[1] == person1b_str)
 
-    assert pj.authors[1] == f"{person2.full_name} <{person2.email}>"
+    person2_str = f"{person2.full_name} <{person2.email}>"
+    assert (pj.authors[0] == person2_str) or (pj.authors[1] == person2_str)
 
     # new person
     person3 = Person(
@@ -144,3 +151,71 @@ def test_person_merge_poetry(pyproject_poetry_file, person: Person):
     assert len(pj.maintainers) == 1
     assert pj.authors[0] == f"{person1c.full_name} <{person1c.email}>"
     assert pj.authors[1] == f"{person3.full_name} <{person3.email}>"
+
+
+def test_person_merge_setuptools(pyproject_setuptools_file, person):
+    pj = SetupTools(pyproject_setuptools_file)
+
+    pm = ProjectMetadata(
+        name="My awesome project",
+        description="Project description",
+        license=LicenseEnum.MIT,
+        people=[person.copy(update=dict(author=True, publication_author=True))],
+    )
+    pj.sync(pm)
+    pj.save()
+
+    # jane becomes john -> modified person
+    person1b = person.copy(
+        update={"given_names": "John", "author": True, "publication_author": True}
+    )
+
+    # different Jane Doe with different orcid -> new person
+    person2 = person.copy(
+        update={
+            "orcid": "https://orcid.org/4321-0987-3231",
+            "email": "i.am.jane@doe.com",
+            "author": True,
+            "publication_author": True,
+        }
+    )
+    # use different order, just for some difference
+    person2.set_key_order(["given_names", "orcid", "family_names", "email"])
+
+    # listed in "arbitrary" order in somesy metadata (new person comes first)
+    pm.people = [person2, person1b]  # need to assign like that to keep _key_order
+    pj.sync(pm)
+    pj.save()
+
+    # existing author info preserved, order not preserved because no orcid
+    person1b_dump = {"name": person1b.full_name, "email": person1b.email}
+    assert (pj.authors[0] == person1b_dump) or (pj.authors[1] == person1b_dump)
+
+    person2_dump = {"name": person2.full_name, "email": person2.email}
+    assert (pj.authors[0] == person2_dump) or (pj.authors[1] == person2_dump)
+
+    # new person
+    person3 = Person(
+        **{
+            "given_names": "Janice",
+            "family_names": "Doethan",
+            "email": "jane93@gmail.com",
+            "author": True,
+            "publication_author": True,
+        }
+    )
+    # john has a new email address
+    person1c = person1b.copy(update={"email": "john.of.us@qualityland.com"})
+    # jane 2 is removed from authors, but added to maintainers
+    person2.author = False
+    person2.publication_author = False
+    person2.maintainer = True
+    # reflect in project metadata
+    pm.people = [person3, person2, person1c]
+    # sync to CFF file
+    pj.sync(pm)
+    pj.save()
+
+    assert len(pj.maintainers) == 1
+    assert pj.authors[0] == {"name": person1c.full_name, "email": person1c.email}
+    assert pj.authors[1] == {"name": person3.full_name, "email": person3.email}