Moved xml autotests into new directory structure

Task-number: QTBUG-21260

Change-Id: I7bc30227d4e71e8783f274dbfa758399dca546d4
Reviewed-on: http://codereview.qt.nokia.com/4146
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

97 files changed, 416 insertions, 0 deletions

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml
new file mode 100644
index 0000000000..2d6f41a137
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc SYSTEM "001.ent" [

+<!ELEMENT doc EMPTY>

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref
new file mode 100644
index 0000000000..eea47ce41b
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="001.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent
new file mode 100755
index 0000000000..67c3297611
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml
new file mode 100644
index 0000000000..023fce8499
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc SYSTEM "002.ent" [

+<!ELEMENT doc EMPTY>

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref
new file mode 100644
index 0000000000..cbaf6dc22d
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="002.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent
new file mode 100755
index 0000000000..931f3ad6d8
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent
@@ -0,0 +1,3 @@
+<!ELEMENT doc EMPTY>

+<!ENTITY % e SYSTEM "003-2.ent">

+<!ATTLIST doc a1 CDATA %e; "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml
new file mode 100644
index 0000000000..63a5e8bdfc
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "003-1.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref
new file mode 100644
index 0000000000..4f83c741fb
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="003-1.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent
new file mode 100755
index 0000000000..40f7ff58a2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent
@@ -0,0 +1,4 @@
+<!ELEMENT doc EMPTY>

+<!ENTITY % e1 SYSTEM "004-2.ent">

+<!ENTITY % e2 "%e1;">

+%e1;

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent
new file mode 100755
index 0000000000..61def75cb7
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent
@@ -0,0 +1 @@
+<!ATTLIST doc a1 CDATA "value">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml
new file mode 100644
index 0000000000..adc9201496
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "004-1.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref
new file mode 100644
index 0000000000..e2d3af888e
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="004-1.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent
new file mode 100755
index 0000000000..ade9599032
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent
@@ -0,0 +1,3 @@
+<!ELEMENT doc EMPTY>

+<!ENTITY % e SYSTEM "005-2.ent">

+%e;

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent
new file mode 100755
index 0000000000..bef50b1f38
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent
@@ -0,0 +1 @@
+<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml
new file mode 100644
index 0000000000..6bd44cfee0
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "005-1.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref
new file mode 100644
index 0000000000..8057322cf2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="005-1.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent
new file mode 100755
index 0000000000..8f305a82bd
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent
@@ -0,0 +1,2 @@
+<!ELEMENT doc EMPTY>

+<!ATTLIST doc a1 CDATA "w1" a2 CDATA "w2">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml
new file mode 100644
index 0000000000..eb80bb7409
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc SYSTEM "006.ent" [

+<!ATTLIST doc a1 CDATA "v1">

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref
new file mode 100644
index 0000000000..e2e2584353
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref
@@ -0,0 +1,8 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="006.ent")
+      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent
new file mode 100755
index 0000000000..fbf4ca4947
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent
@@ -0,0 +1,2 @@
+<!ELEMENT doc (#PCDATA)>

+<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml
new file mode 100644
index 0000000000..38897e34ea
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "007.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref
new file mode 100644
index 0000000000..d96790fb37
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="007.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent
new file mode 100755
index 0000000000..fbf4ca4947
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent
@@ -0,0 +1,2 @@
+<!ELEMENT doc (#PCDATA)>

+<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml
new file mode 100644
index 0000000000..bf777a7ff2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc PUBLIC "whatever" "008.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref
new file mode 100644
index 0000000000..08ba9c035b
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="whatever", systemId="008.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent
new file mode 100755
index 0000000000..fbf4ca4947
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent
@@ -0,0 +1,2 @@
+<!ELEMENT doc (#PCDATA)>

+<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml
new file mode 100644
index 0000000000..c17562fe68
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc PUBLIC "whatever" "009.ent" [

+<!ATTLIST doc a2 CDATA "v2">

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref
new file mode 100644
index 0000000000..d789785173
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref
@@ -0,0 +1,8 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="whatever", systemId="009.ent")
+      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent
new file mode 100755
index 0000000000..52a28f5deb
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent
@@ -0,0 +1,2 @@
+<!ELEMENT doc (#PCDATA)>

+<!ATTLIST doc a1 CDATA "v2">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml
new file mode 100644
index 0000000000..2786b328f3
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc SYSTEM "010.ent" [

+<!ATTLIST doc a1 CDATA "v1">

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref
new file mode 100644
index 0000000000..6045d46296
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref
@@ -0,0 +1,8 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="010.ent")
+      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent
new file mode 100755
index 0000000000..fbf4ca4947
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent
@@ -0,0 +1,2 @@
+<!ELEMENT doc (#PCDATA)>

+<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml
new file mode 100644
index 0000000000..03b482bbb6
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ENTITY % e SYSTEM "011.ent">

+%e;

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref
new file mode 100644
index 0000000000..09fd89bd38
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="%e", publicId="", systemId="011.ent")
+      resolveEntity(publicId="", systemId="011.ent", ret={})
+      skippedEntity(name="%e")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent
new file mode 100755
index 0000000000..7e372e65e9
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!ELEMENT doc (#PCDATA)>

+<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml
new file mode 100644
index 0000000000..1967edbba7
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [

+<!ENTITY % e SYSTEM "012.ent">

+%e;

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref
new file mode 100644
index 0000000000..8d90b187dd
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref
@@ -0,0 +1,10 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="%e", publicId="", systemId="012.ent")
+      resolveEntity(publicId="", systemId="012.ent", ret={})
+      skippedEntity(name="%e")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent
new file mode 100755
index 0000000000..a3691d9f08
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent
@@ -0,0 +1,4 @@
+<!ELEMENT doc (#PCDATA)>

+<![ INCLUDE [

+<!ATTLIST doc a1 CDATA "v1">

+]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml
new file mode 100644
index 0000000000..cf44f2600a
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "013.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref
new file mode 100644
index 0000000000..d84839e625
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="013.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent
new file mode 100755
index 0000000000..6eaf779329
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent
@@ -0,0 +1,4 @@
+<!ELEMENT doc (#PCDATA)>

+<![ %e; [

+<!ATTLIST doc a1 CDATA "v1">

+]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml
new file mode 100644
index 0000000000..bd08502489
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc SYSTEM "014.ent" [

+<!ENTITY % e "INCLUDE">

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref
new file mode 100644
index 0000000000..f9c8220bbb
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref
@@ -0,0 +1,8 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="014.ent")
+      internatlEntityDecl(name="%e", value="INCLUDE")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent
new file mode 100755
index 0000000000..00d2f30e1d
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent
@@ -0,0 +1,5 @@
+<!ELEMENT doc (#PCDATA)>

+<![ %e; [

+<!ATTLIST doc a1 CDATA "v1">

+]]>

+<!ATTLIST doc a2 CDATA "v2">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml
new file mode 100644
index 0000000000..e04e75ffca
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc SYSTEM "015.ent" [

+<!ENTITY % e "IGNORE">

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref
new file mode 100644
index 0000000000..de94a45356
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref
@@ -0,0 +1,8 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="015.ent")
+      internatlEntityDecl(name="%e", value="IGNORE")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent
new file mode 100755
index 0000000000..bf77ef8336
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent
@@ -0,0 +1,4 @@
+<!ELEMENT doc (#PCDATA)>

+<![%e;[

+<!ATTLIST doc a1 CDATA "v1">

+]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml
new file mode 100644
index 0000000000..4ccf4af350
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc SYSTEM "016.ent" [

+<!ENTITY % e "INCLUDE">

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref
new file mode 100644
index 0000000000..7c234cfc5f
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref
@@ -0,0 +1,8 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="016.ent")
+      internatlEntityDecl(name="%e", value="INCLUDE")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent
new file mode 100755
index 0000000000..ffd9adde61
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent
@@ -0,0 +1,3 @@
+<!ELEMENT doc (#PCDATA)>

+<!ENTITY % e "<!ATTLIST doc a1 CDATA 'v1'>">

+%e;

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml
new file mode 100644
index 0000000000..7fe18f4c7a
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "017.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref
new file mode 100644
index 0000000000..25cc198610
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="017.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent
new file mode 100755
index 0000000000..2d46f76fc3
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent
@@ -0,0 +1,3 @@
+<!ELEMENT doc (#PCDATA)>

+<!ENTITY % e "'v1'">

+<!ATTLIST doc a1 CDATA %e;>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml
new file mode 100644
index 0000000000..31e90f2405
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "018.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref
new file mode 100644
index 0000000000..3db7bc846b
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="018.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent
new file mode 100755
index 0000000000..d18201a98b
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent
@@ -0,0 +1,3 @@
+<!ELEMENT doc (#PCDATA)>

+<!ENTITY % e "'v1'">

+<!ATTLIST doc a1 CDATA%e;>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml
new file mode 100644
index 0000000000..b7a18faba0
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "019.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref
new file mode 100644
index 0000000000..9961aa93b4
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="019.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent
new file mode 100755
index 0000000000..815291c6d2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent
@@ -0,0 +1,3 @@
+<!ENTITY % e "doc">

+<!ELEMENT doc (#PCDATA)>

+<!ATTLIST%e;a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml
new file mode 100644
index 0000000000..d70892f7ad
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "020.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref
new file mode 100644
index 0000000000..fc9a0535c1
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="020.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent
new file mode 100755
index 0000000000..9f8f2afd2b
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent
@@ -0,0 +1,3 @@
+<!ENTITY % e "doc a1 CDATA">

+<!ELEMENT doc (#PCDATA)>

+<!ATTLIST %e; "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml
new file mode 100644
index 0000000000..70c28730db
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "021.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref
new file mode 100644
index 0000000000..e6d91722d3
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="021.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent
new file mode 100755
index 0000000000..26f2d8beb2
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent
@@ -0,0 +1,3 @@
+<!ENTITY % e "INCLUDE[">

+<!ELEMENT doc (#PCDATA)>

+<![ %e; <!ATTLIST doc a1 CDATA "v1"> ]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml
new file mode 100644
index 0000000000..b639f2551c
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "022.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref
new file mode 100644
index 0000000000..de3ddf732f
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="022.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent
new file mode 100755
index 0000000000..e3268819f7
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent
@@ -0,0 +1,5 @@
+<!ELEMENT doc (#PCDATA)>

+<!ENTITY % e1 "do">

+<!ENTITY % e2 "c">

+<!ENTITY % e3 "%e1;%e2;">

+<!ATTLIST %e3; a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml
new file mode 100644
index 0000000000..1c2484b70b
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "023.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref
new file mode 100644
index 0000000000..a150bde52a
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="023.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent
new file mode 100755
index 0000000000..aa6d0eccac
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent
@@ -0,0 +1,4 @@
+<!ELEMENT doc (#PCDATA)>

+<!ENTITY % e1 "'v1'">

+<!ENTITY % e2 'a1 CDATA %e1;'>

+<!ATTLIST doc %e2;>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml
new file mode 100644
index 0000000000..96e1ecb61b
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "024.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref
new file mode 100644
index 0000000000..e97c61bd94
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="024.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent
new file mode 100755
index 0000000000..389d259eb1
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent
@@ -0,0 +1,5 @@
+<!ELEMENT doc EMPTY>

+<!ENTITY % e "x">

+<!ENTITY % e "y">

+<!ENTITY % v "'%e;'">

+<!ATTLIST doc a1 CDATA %v;>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml
new file mode 100644
index 0000000000..8fdbc14c47
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "025.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref
new file mode 100644
index 0000000000..1eca607181
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="025.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent
new file mode 100755
index 0000000000..bdc93af639
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent
@@ -0,0 +1 @@
+<!ATTLIST doc a1 CDATA "w1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml
new file mode 100644
index 0000000000..7b109c0913
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE doc [

+<!ELEMENT doc ANY>

+<!ENTITY % e SYSTEM "026.ent">

+%e;

+<!ATTLIST doc a1 CDATA "x1" a2 CDATA "x2">

+]>

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref
new file mode 100644
index 0000000000..1bea883d9c
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref
@@ -0,0 +1,12 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="")
+      externalEntityDecl(name="%e", publicId="", systemId="026.ent")
+      resolveEntity(publicId="", systemId="026.ent", ret={})
+      skippedEntity(name="%e")
+      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
+      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent
new file mode 100755
index 0000000000..712cce3700
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent
@@ -0,0 +1,2 @@
+<!ENTITY % e "">

+<!ELEMENT doc (#PCDATA %e;)>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml
new file mode 100644
index 0000000000..d0c8c7abb5
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "027.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref
new file mode 100644
index 0000000000..d010327624
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="027.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent
new file mode 100755
index 0000000000..ac249d7b2c
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent
@@ -0,0 +1,2 @@
+<!ELEMENT doc (#PCDATA)>

+<![INCLUDE[<!ATTLIST doc a1 CDATA "v1">]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml
new file mode 100644
index 0000000000..50e5248cbf
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "028.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref
new file mode 100644
index 0000000000..8466141897
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="028.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent
new file mode 100755
index 0000000000..df94df5560
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent
@@ -0,0 +1,3 @@
+<!ELEMENT doc (#PCDATA)>

+<![IGNORE[<!ATTLIST doc a1 CDATA "v1">]]>

+<!ATTLIST doc a1 CDATA "v2">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml
new file mode 100644
index 0000000000..07e226c1d7
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "029.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref
new file mode 100644
index 0000000000..0bffc4aaa7
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="029.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent
new file mode 100755
index 0000000000..e3864460df
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent
@@ -0,0 +1,3 @@
+<!ELEMENT doc (#PCDATA)>

+<![IGNORE[]]>

+<![INCLUDE[]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml
new file mode 100644
index 0000000000..01fc2be4ca
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "030.ent">

+<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref
new file mode 100644
index 0000000000..51e7f033f9
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref
@@ -0,0 +1,7 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="030.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent
new file mode 100755
index 0000000000..f7f94ab152
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent
@@ -0,0 +1,3 @@
+<!ELEMENT doc (#PCDATA)>

+<!ENTITY % e SYSTEM "031-2.ent">

+<!ENTITY e "<![CDATA[%e;]]>">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent
new file mode 100755
index 0000000000..bef50b1f38
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent
@@ -0,0 +1 @@
+<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml
new file mode 100644
index 0000000000..c3fe5fca71
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE doc SYSTEM "031-1.ent">

+<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref
new file mode 100644
index 0000000000..72ab9d974f
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref
@@ -0,0 +1,8 @@
+setDocumentLocator(locator={columnNumber=1, lineNumber=1})
+startDocument()
+   startDTD(name="doc", publicId="", systemId="031-1.ent")
+   endDTD()
+   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
+      skippedEntity(name="e")
+   endElement(namespaceURI="", localName="doc", qName="doc")
+endDocument()