2 files changed, 148 insertions, 0 deletions
diff --git a/jni/ruby/test/rexml/parse/test_document_type_declaration.rb b/jni/ruby/test/rexml/parse/test_document_type_declaration.rb
new file mode 100644
index 0000000..59fe561
--- /dev/null
+++ b/jni/ruby/test/rexml/parse/test_document_type_declaration.rb
@@ -0,0 +1,49 @@
+require "test/unit"
+require "rexml/document"
+
+module REXMLTests
+  class TestParseDocumentTypeDeclaration < Test::Unit::TestCase
+    private
+    def xml(internal_subset)
+      <<-XML
+<!DOCTYPE r SYSTEM "urn:x-rexml:test" [
+#{internal_subset}
+]>
+<r/>
+      XML
+    end
+
+    def parse(internal_subset)
+      REXML::Document.new(xml(internal_subset)).doctype
+    end
+
+    class TestMixed < self
+      def test_entity_element
+        doctype = parse(<<-INTERNAL_SUBSET)
+<!ENTITY entity-name "entity content">
+<!ELEMENT element-name EMPTY>
+        INTERNAL_SUBSET
+        assert_equal([REXML::Entity, REXML::ElementDecl],
+                     doctype.children.collect(&:class))
+      end
+
+      def test_attlist_entity
+        doctype = parse(<<-INTERNAL_SUBSET)
+<!ATTLIST attribute-list-name attribute-name CDATA #REQUIRED>
+<!ENTITY entity-name "entity content">
+        INTERNAL_SUBSET
+        assert_equal([REXML::AttlistDecl, REXML::Entity],
+                     doctype.children.collect(&:class))
+      end
+
+      def test_notation_attlist
+        doctype = parse(<<-INTERNAL_SUBSET)
+<!NOTATION notation-name SYSTEM "system-literal">
+<!ATTLIST attribute-list-name attribute-name CDATA #REQUIRED>
+        INTERNAL_SUBSET
+        assert_equal([REXML::NotationDecl, REXML::AttlistDecl],
+                     doctype.children.collect(&:class))
+      end
+    end
+  end
+end
diff --git a/jni/ruby/test/rexml/parse/test_notation_declaration.rb b/jni/ruby/test/rexml/parse/test_notation_declaration.rb
new file mode 100644
index 0000000..0a4e737
--- /dev/null
+++ b/jni/ruby/test/rexml/parse/test_notation_declaration.rb
@@ -0,0 +1,99 @@
+require 'test/unit'
+require 'rexml/document'
+
+module REXMLTests
+  class TestParseNotationDeclaration < Test::Unit::TestCase
+    private
+    def xml(internal_subset)
+      <<-XML
+<!DOCTYPE r SYSTEM "urn:x-henrikmartensson:test" [
+#{internal_subset}
+]>
+<r/>
+      XML
+    end
+
+    def parse(internal_subset)
+      REXML::Document.new(xml(internal_subset)).doctype
+    end
+
+    class TestCommon < self
+      def test_name
+        doctype = parse("<!NOTATION name PUBLIC 'urn:public-id'>")
+        assert_equal("name", doctype.notation("name").name)
+      end
+    end
+
+    class TestExternalID < self
+      class TestSystem < self
+        def test_single_quote
+          doctype = parse(<<-INTERNAL_SUBSET)
+<!NOTATION name SYSTEM 'system-literal'>
+          INTERNAL_SUBSET
+          assert_equal("system-literal", doctype.notation("name").system)
+        end
+
+        def test_double_quote
+          doctype = parse(<<-INTERNAL_SUBSET)
+<!NOTATION name SYSTEM "system-literal">
+          INTERNAL_SUBSET
+          assert_equal("system-literal", doctype.notation("name").system)
+        end
+      end
+
+      class TestPublic < self
+        class TestPublicIDLiteral < self
+          def test_single_quote
+            doctype = parse(<<-INTERNAL_SUBSET)
+<!NOTATION name PUBLIC 'public-id-literal' "system-literal">
+            INTERNAL_SUBSET
+            assert_equal("public-id-literal", doctype.notation("name").public)
+          end
+
+          def test_double_quote
+            doctype = parse(<<-INTERNAL_SUBSET)
+<!NOTATION name PUBLIC "public-id-literal" "system-literal">
+            INTERNAL_SUBSET
+            assert_equal("public-id-literal", doctype.notation("name").public)
+          end
+        end
+
+        class TestSystemLiteral < self
+          def test_single_quote
+            doctype = parse(<<-INTERNAL_SUBSET)
+<!NOTATION name PUBLIC "public-id-literal" 'system-literal'>
+            INTERNAL_SUBSET
+            assert_equal("system-literal", doctype.notation("name").system)
+          end
+
+          def test_double_quote
+            doctype = parse(<<-INTERNAL_SUBSET)
+<!NOTATION name PUBLIC "public-id-literal" "system-literal">
+            INTERNAL_SUBSET
+            assert_equal("system-literal", doctype.notation("name").system)
+          end
+        end
+      end
+
+      class TestMixed < self
+        def test_system_public
+          doctype = parse(<<-INTERNAL_SUBSET)
+<!NOTATION system-name SYSTEM "system-literal">
+<!NOTATION public-name PUBLIC "public-id-literal" 'system-literal'>
+          INTERNAL_SUBSET
+          assert_equal(["system-name", "public-name"],
+                       doctype.notations.collect(&:name))
+        end
+
+        def test_public_system
+          doctype = parse(<<-INTERNAL_SUBSET)
+<!NOTATION public-name PUBLIC "public-id-literal" 'system-literal'>
+<!NOTATION system-name SYSTEM "system-literal">
+          INTERNAL_SUBSET
+          assert_equal(["public-name", "system-name"],
+                       doctype.notations.collect(&:name))
+        end
+      end
+    end
+  end
+end