Fixes #145: Implement missing subject property

drmacro · May 12, 2024 · 1733c19 · 1733c19
1 parent cfdbffa
commit 1733c19
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/src/main/doctypes/simplewpml/simplewpml-base.rng b/src/main/doctypes/simplewpml/simplewpml-base.rng
@@ -88,6 +88,7 @@
           <optional><element name="lastPrinted"><text/></element></optional>
           <optional><element name="modified"><text/></element></optional>
           <optional><element name="revision"><text/></element></optional>
+          <optional><element name="subject"><text/></element></optional>
           <optional><element name="title"><text/></element></optional>
           <optional><element name="version"><text/></element></optional>
 

diff --git a/src/main/java/org/wordinator/xml2docx/generator/DocxGenerator.java b/src/main/java/org/wordinator/xml2docx/generator/DocxGenerator.java
@@ -552,6 +552,8 @@ private void handleCoreProperties(XWPFDocument doc, XmlObject xml) {
 				}				
 			} else if ("revision".equals(tagName)) {
 				coreProperties.setRevision(value);
+			} else if ("subject".equals(tagName)) {
+				coreProperties.setSubjectProperty(value);
 			} else if ("title".equals(tagName)) {
 				coreProperties.setTitle(value);
 			} else if ("version".equals(tagName)) {

diff --git a/src/test/java/org/wordinator/xml2docx/TestDocxGenerator.java b/src/test/java/org/wordinator/xml2docx/TestDocxGenerator.java
@@ -551,6 +551,11 @@ public void testDocumentPropertiesGeneration() throws Exception {
     assertNotNull("Expected a value for 'revision' property", value);
     assertEquals("Expected \"" + expected + "\", got \"" + value + "\"", expected, value);
 
+    value = coreProperties.getSubject();
+    expected = "subject value";
+    assertNotNull("Expected a value for 'subject' property", value);
+    assertEquals("Expected \"" + expected + "\", got \"" + value + "\"", expected, value);
+
     value = coreProperties.getTitle();
     expected = "Issue 140 Test of document properties";
     assertNotNull("Expected a value for 'title' property", value);

diff --git a/src/test/resources/simplewp/simplewpml-issue-140-document-properties.swpx b/src/test/resources/simplewp/simplewpml-issue-140-document-properties.swpx
@@ -16,6 +16,7 @@
       <lastPrinted>2024-04-21T10:11:12Z</lastPrinted>
       <modified>2024-04-21T10:10:12Z</modified>
       <revision>2</revision>
+      <subject>subject value</subject>
       <title>Issue 140 Test of document properties</title>
       <version>1</version>
     </core-properties>