Change Series Volume sub-element type to nonNegativeInteger

Metron-Project · Nov 14, 2024 · 94db9c4 · 94db9c4
1 parent d5f7219
commit 94db9c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/drafts/v1.0/MetronInfo.xsd b/drafts/v1.0/MetronInfo.xsd
@@ -92,7 +92,7 @@
         <xs:all>
             <xs:element name="Name" type="xs:string" />
             <xs:element name="SortName" type="xs:string" minOccurs="0" />
-            <xs:element name="Volume" type="xs:int" minOccurs="0" />
+            <xs:element name="Volume" type="xs:nonNegativeInteger" minOccurs="0" />
             <xs:element name="Format" type="formatType" minOccurs="0" />
             <xs:element name="StartYear" type="xs:gYear" minOccurs="0" />
             <xs:element name="IssueCount" type="xs:positiveInteger" minOccurs="0" />

diff --git a/tests/test.py b/tests/test.py
@@ -16,8 +16,13 @@
             '<?xml version="1.0" encoding="UTF-8"?><MetronInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'
             "<Series><Name>Foo</Name></Series><Number /><PageCount>0</PageCount></MetronInfo>",
         ),
+        (
+            TEST_XSD,
+            '<?xml version="1.0" encoding="UTF-8"?><MetronInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'
+            "<Series><Name>Foo</Name><Volume>0</Volume></Series><Number /></MetronInfo>",
+        ),
     ],
-    ids=["valid_xml", "zero_page_count"],
+    ids=["valid_xml", "zero_page_count", "volume_zero"],
 )
 def test_valid(xsd: Path, xml: Path | str) -> None:
     schema = XMLSchema11(xsd)
@@ -33,8 +38,13 @@ def test_valid(xsd: Path, xml: Path | str) -> None:
             '<?xml version="1.0" encoding="UTF-8"?><MetronInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'
             "<Series><Name>Foo</Name></Series><Number /><PageCount>-1</PageCount></MetronInfo>",
         ),
+        (
+            TEST_XSD,
+            '<?xml version="1.0" encoding="UTF-8"?><MetronInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'
+            "<Series><Name>Foo</Name><Volume>-1</Volume></Series><Number /></MetronInfo>",
+        ),
     ],
-    ids=["dup_primary_attr_xml", "negative_page_count"],
+    ids=["dup_primary_attr_xml", "negative_page_count", "negative_volume"],
 )
 def test_invalid(xsd: Path, xml: Path | str) -> None:
     schema = XMLSchema11(xsd)