test fixup

spacetelescope · Dec 1, 2023 · dae6f90 · dae6f90
1 parent 5753913
commit dae6f90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/tests/uws/models_test.py b/tests/uws/models_test.py
@@ -212,7 +212,7 @@ def test_read_from_xml(self):
         self.assertEqual(short_job_description.href, "http://uri1")
         self.assertEqual(short_job_description.phase, "PENDING")
         self.assertEqual(short_job_description.run_id, "runId1")
-        self.assertEqual(short_job_description.owner_id, None)
+        self.assertEqual(short_job_description.owner_id.value, None)
         self.assertEqual(short_job_description.creation_time, VODateTime(1900, 1, 1, 1, 1, 1, tzinfo=tz.utc))
 
     def test_write_to_xml(self):
@@ -433,6 +433,7 @@ def test_write_to_xml(self):
             jobref=[
                 ShortJobDescription(
                     job_id="id1",
+                    owner_id=None,
                     href="http://uri1",
                     phase=ExecutionPhase.PENDING,
                     creation_time=VODateTime(1900, 1, 1, 1, 1, 1, tzinfo=tz.utc),

diff --git a/vo/models/xml/uws/models.py b/vo/models/xml/uws/models.py
@@ -158,7 +158,7 @@ class ShortJobDescription(BaseXmlModel, tag="jobref", ns="uws", nsmap=NSMAP):
 
     phase: ExecutionPhase = element()
     run_id: Optional[str] = element(tag="runId", default=None)
-    owner_id: Optional[NillElement] = element(tag="ownerId", default=NillElement())
+    owner_id: Optional[NillElement] = element(tag="ownerId", default=None)
     creation_time: Optional[VODateTime] = element(tag="creationTime", default=None)
 
     job_id: str = attr(name="id")
@@ -168,9 +168,7 @@ class ShortJobDescription(BaseXmlModel, tag="jobref", ns="uws", nsmap=NSMAP):
     @field_validator("owner_id", mode="before")
     def validate_owner_id(cls, value):
         """Sets default for owner_id if None"""
-        if not value:
-            return NillElement()
-        return value
+        return validate_nillable(value, str)
 
 class Jobs(BaseXmlModel, tag="jobs", ns="uws", nsmap=NSMAP):
     """The list of job references returned at /(jobs)
@@ -251,7 +249,7 @@ class JobSummary(BaseXmlModel, tag="job", ns="uws", nsmap=NSMAP, skip_empty=True
 
     @field_validator("owner_id", "quote", "start_time", "end_time", "destruction", mode="before")
     def validate_nillables(cls, value):
-        """Sets default for owner_id if None"""
+        """Sets default for nillable fields if None"""
         if isinstance(value, VODateTime):
             value = value.isoformat()
         return validate_nillable(value, str)