Fixed the test instance data so that it actually matches the yaml (🤦), checked the contents against an instance file that goes through the empty item cleanup function.

Author: kevinschaper

tests/test_loaders_dumpers/models/books_normalized_pydantic.py

@@ -1,22 +1,24 @@
 from __future__ import annotations
 from datetime import datetime, date
 from enum import Enum
-from typing import List, Dict, Optional, Any
+from typing import List, Dict, Optional, Any, Union, Literal
 from pydantic import BaseModel as BaseModel, Field
+from linkml_runtime.linkml_model import Decimal
 
 metamodel_version = "None"
 version = "None"
 
 class WeakRefShimBaseModel(BaseModel):
    __slots__ = '__weakref__'
-    
+
 class ConfiguredBaseModel(WeakRefShimBaseModel,
-                validate_assignment = True, 
-                validate_all = True, 
-                underscore_attrs_are_private = True, 
-                extra = 'forbid', 
-                arbitrary_types_allowed = True):
-    pass                    
+                validate_assignment = True,
+                validate_all = True,
+                underscore_attrs_are_private = True,
+                extra = 'forbid',
+                arbitrary_types_allowed = True,
+                use_enum_values = True):
+    pass
 
 
 class GenreEnum(str, Enum):

tests/test_loaders_dumpers/models/kitchen_sink_pydantic.py

@@ -10,14 +10,15 @@
 
 class WeakRefShimBaseModel(BaseModel):
    __slots__ = '__weakref__'
-    
+
 class ConfiguredBaseModel(WeakRefShimBaseModel,
-                validate_assignment = True, 
-                validate_all = True, 
-                underscore_attrs_are_private = True, 
-                extra = 'forbid', 
-                arbitrary_types_allowed = True):
-    pass                    
+                validate_assignment = True,
+                validate_all = True,
+                underscore_attrs_are_private = True,
+                extra = 'forbid',
+                arbitrary_types_allowed = True,
+                use_enum_values = False):
+    pass
 
 
 class FamilialRelationshipType(str, Enum):

tests/test_loaders_dumpers/test_dumpers_pydantic.py

@@ -1,6 +1,11 @@
+import json
+
+import yaml
+
 from linkml_runtime.dumpers import yaml_dumper, json_dumper, csv_dumper
 from tests.test_loaders_dumpers.loaderdumpertestcase import LoaderDumperTestCase
 from tests.test_loaders_dumpers.models.books_normalized_pydantic import Book, BookSeries, Author
+from linkml_runtime.utils.formatutils import remove_empty_items
 
 
 class PydanticDumpersTestCase(LoaderDumperTestCase):
@@ -10,22 +15,29 @@ class PydanticDumpersTestCase(LoaderDumperTestCase):
     def setUpClass(cls) -> None:
         """ Generate a small sample Books instance for testing purposes """
         LoaderDumperTestCase.setUpClass()
-        b1 = Book(name='The Fellowship of the Ring', id="S001.1", price="5.99", summary="Hobbits")
+        b1 = Book(name='Fellowship of the Ring', id="S001.1", price="5.99", summary="Hobbits")
         b2 = Book(name='The Two Towers', id="S001.2", price="5.99", summary="More hobbits")
-        b3 = Book(name='The Return of the King', id="S001.3", price="5.99", summary="Yet more hobbits")
-        jrr = Author(name='JRR Tolkien', from_country='England')
-        cls.bookseries = BookSeries(name='The Lord of the Rings', id="S001", genres=["fantasy"], creator=jrr, books=[b1, b2, b3])
+        b3 = Book(name='Return of the King', id="S001.3", price="6.99", summary="Yet more hobbits")
+        jrr = Author(name='JRR Tolkein', from_country='England')
+        cls.bookseries = BookSeries(name='Lord of the Rings', id="S001", genres=["fantasy"], creator=jrr, books=[b1, b2, b3])
 
     def test_yaml_dumper(self):
         """ Test the yaml emitter """
         self.dump_test('book_series_lotr.yaml', lambda out_fname: yaml_dumper.dump(self.bookseries, out_fname))
         self.dumps_test('book_series_lotr.yaml', lambda: yaml_dumper.dumps(self.bookseries))
 
-        #TODO: test the contents of generated file
+        # test contents of yaml file with cleaned dict made from bookseries instance in setup
+        with open(self.env.input_path('book_series_lotr.yaml'), 'r') as f:
+            data = yaml.safe_load(f)
+            self.assertEqual(data, remove_empty_items(self.bookseries.dict()))
+
 
     def test_json_dumper(self):
         """ Test the json emitter """
         self.dump_test('book_series_lotr.json', lambda out_fname: json_dumper.dump(self.bookseries, out_fname))
         self.dumps_test('book_series_lotr.json', lambda: json_dumper.dumps(self.bookseries))
 
-        #TODO: test the contents of generated file
+        # test contents of json file with cleaned dict made from bookseries instance in setup
+        with open(self.env.input_path('book_series_lotr.json'), 'r') as f:
+            data = json.load(f)
+            self.assertEqual(data, remove_empty_items(self.bookseries.dict()))