From 79c96dbc73ea428cf9def17c8218aa1fc2828266 Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Fri, 25 Jan 2019 10:52:51 -0500
Subject: [PATCH] Fix Decl.toString

---
 .../src/main/scala/scala/xml/dtd/Decl.scala   |  1 +
 .../test/scala/scala/xml/dtd/DeclTest.scala   | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 shared/src/test/scala/scala/xml/dtd/DeclTest.scala

diff --git a/shared/src/main/scala/scala/xml/dtd/Decl.scala b/shared/src/main/scala/scala/xml/dtd/Decl.scala
index 9ac9761ea..5bf37403a 100644
--- a/shared/src/main/scala/scala/xml/dtd/Decl.scala
+++ b/shared/src/main/scala/scala/xml/dtd/Decl.scala
@@ -26,6 +26,7 @@ import Utility.sbToString
 sealed abstract class Decl
 
 sealed abstract class MarkupDecl extends Decl {
+  override def toString(): String = sbToString(buildString)
   def buildString(sb: StringBuilder): StringBuilder
 }
 
diff --git a/shared/src/test/scala/scala/xml/dtd/DeclTest.scala b/shared/src/test/scala/scala/xml/dtd/DeclTest.scala
new file mode 100644
index 000000000..a41542897
--- /dev/null
+++ b/shared/src/test/scala/scala/xml/dtd/DeclTest.scala
@@ -0,0 +1,42 @@
+package scala.xml
+package dtd
+
+import org.junit.Test
+import org.junit.Assert.assertEquals
+
+class DeclTest {
+
+  @Test
+  def elemDeclToString: Unit = {
+    assertEquals(
+      "<!ELEMENT x (#PCDATA)>",
+      ElemDecl("x", PCDATA).toString
+    )
+  }
+
+  @Test
+  def attListDeclToString: Unit = {
+
+    val expected =
+      """|<!ATTLIST x
+         |  y CDATA #REQUIRED
+         |  z CDATA #REQUIRED>""".stripMargin
+
+    val actual = AttListDecl("x",
+      List(
+        AttrDecl("y", "CDATA", REQUIRED),
+        AttrDecl("z", "CDATA", REQUIRED)
+      )
+    ).toString
+
+    assertEquals(expected, actual)
+  }
+
+  @Test
+  def parsedEntityDeclToString: Unit = {
+    assertEquals(
+      """<!ENTITY foo SYSTEM "bar">""",
+      ParsedEntityDecl("foo", ExtDef(SystemID("bar"))).toString
+    )
+  }
+}