Merge pull request #277 from tomkralidis/issue-276

fix response encoding support (#276)
geopython · Oct 10, 2014 · d4b8e95 · d4b8e95
2 parents 7495993 + eb39b93
commit d4b8e95
Show file tree

Hide file tree

Showing 43 changed files with 57 additions and 57 deletions.
diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -11,7 +11,7 @@ pycsw's runtime configuration is defined by ``default.cfg``.  pycsw ships with a
 - **url**: the URL of the resulting service
 - **mimetype**: the MIME type when returning HTTP responses
 - **language**: the ISO 639-1 language and ISO 3166-1 alpha2 country code of the service (e.g. ``en-CA``, ``fr-CA``, ``en-US``)
-- **encoding**: the content type encoding (e.g. ``ISO-8859-1``)
+- **encoding**: the content type encoding (e.g. ``ISO-8859-1``, see https://docs.python.org/2/library/codecs.html#standard-encodings).  Default value is 'UTF-8'
 - **maxrecords**: the maximum number of records to return by default.  This value is enforced if a CSW's client's ``maxRecords`` parameter is greater than ``server.maxrecords`` to limit capacity
 - **loglevel**: the logging level (see http://docs.python.org/library/logging.html#logging-levels)
 - **logfile**: the full file path to the logfile

diff --git a/pycsw/server.py b/pycsw/server.py
@@ -2323,15 +2323,15 @@ def _write_response(self):
         else:  # it's XML
             self.contenttype = self.mimetype
             response = etree.tostring(self.response,
-            pretty_print=self.pretty_print)
+            pretty_print=self.pretty_print, encoding='unicode')
             xmldecl = '<?xml version="1.0" encoding="%s" standalone="no"?>\n' \
             % self.encoding
             appinfo = '<!-- pycsw %s -->\n' % self.context.version
 
         LOGGER.debug('Response:\n%s' % response)
 
         s = '%s%s%s' % (xmldecl, appinfo, response)
-        return s.encode()
+        return s.encode(self.encoding)
 
 
     def _gen_soap_wrapper(self):

diff --git a/tests/expected/suites_atom_get_opensearch-ogc-bbox-and-time.xml b/tests/expected/suites_atom_get_opensearch-ogc-bbox-and-time.xml
@@ -10,7 +10,7 @@
     <atom:category>Hydrography-Oceanographic</atom:category>
     <atom:id>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</atom:id>
     <atom:link href="http://localhost/pycsw/csw.py?config=tests/suites/atom/default.cfg?service=CSW&amp;version=2.0.2&amp;request=GetRepositoryItem&amp;id=urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc"/>
-    <atom:title>&#209;un&#231; elementum</atom:title>
+    <atom:title>Ñunç elementum</atom:title>
     <georss:where>
       <gml:Polygon srsName="urn:x-ogc:def:crs:EPSG:6.11:4326">
         <gml:exterior>

diff --git a/tests/expected/suites_atom_get_opensearch-ogc-bbox.xml b/tests/expected/suites_atom_get_opensearch-ogc-bbox.xml
@@ -40,7 +40,7 @@
     <atom:category>Hydrography-Oceanographic</atom:category>
     <atom:id>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</atom:id>
     <atom:link href="http://localhost/pycsw/csw.py?config=tests/suites/atom/default.cfg?service=CSW&amp;version=2.0.2&amp;request=GetRepositoryItem&amp;id=urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc"/>
-    <atom:title>&#209;un&#231; elementum</atom:title>
+    <atom:title>Ñunç elementum</atom:title>
     <georss:where>
       <gml:Polygon srsName="urn:x-ogc:def:crs:EPSG:6.11:4326">
         <gml:exterior>

diff --git a/tests/expected/suites_atom_get_opensearch-ogc-q-and-time.xml b/tests/expected/suites_atom_get_opensearch-ogc-q-and-time.xml
@@ -10,7 +10,7 @@
     <atom:category>Land titles</atom:category>
     <atom:id>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</atom:id>
     <atom:link href="http://localhost/pycsw/csw.py?config=tests/suites/atom/default.cfg?service=CSW&amp;version=2.0.2&amp;request=GetRepositoryItem&amp;id=urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db"/>
-    <atom:summary>Morbi ultri&#231;es, dui suscipit vestibulum pr&#232;tium, velit ante pretium tortor, eg&#235;t tincidunt pede odio ac nulla.</atom:summary>
-    <atom:title>Fusc&#233; vitae ligul&#228;</atom:title>
+    <atom:summary>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</atom:summary>
+    <atom:title>Fuscé vitae ligulä</atom:title>
   </atom:entry>
 </atom:feed>
diff --git a/tests/expected/suites_atom_get_opensearch-ogc-time.xml b/tests/expected/suites_atom_get_opensearch-ogc-time.xml
@@ -10,7 +10,7 @@
     <atom:category>Land titles</atom:category>
     <atom:id>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</atom:id>
     <atom:link href="http://localhost/pycsw/csw.py?config=tests/suites/atom/default.cfg?service=CSW&amp;version=2.0.2&amp;request=GetRepositoryItem&amp;id=urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db"/>
-    <atom:summary>Morbi ultri&#231;es, dui suscipit vestibulum pr&#232;tium, velit ante pretium tortor, eg&#235;t tincidunt pede odio ac nulla.</atom:summary>
-    <atom:title>Fusc&#233; vitae ligul&#228;</atom:title>
+    <atom:summary>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</atom:summary>
+    <atom:title>Fuscé vitae ligulä</atom:title>
   </atom:entry>
 </atom:feed>
diff --git a/tests/expected/suites_atom_get_opensearch-ogc-timeend.xml b/tests/expected/suites_atom_get_opensearch-ogc-timeend.xml
@@ -10,7 +10,7 @@
     <atom:category>Land titles</atom:category>
     <atom:id>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</atom:id>
     <atom:link href="http://localhost/pycsw/csw.py?config=tests/suites/atom/default.cfg?service=CSW&amp;version=2.0.2&amp;request=GetRepositoryItem&amp;id=urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db"/>
-    <atom:summary>Morbi ultri&#231;es, dui suscipit vestibulum pr&#232;tium, velit ante pretium tortor, eg&#235;t tincidunt pede odio ac nulla.</atom:summary>
-    <atom:title>Fusc&#233; vitae ligul&#228;</atom:title>
+    <atom:summary>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</atom:summary>
+    <atom:title>Fuscé vitae ligulä</atom:title>
   </atom:entry>
 </atom:feed>
diff --git a/tests/expected/suites_atom_get_opensearch-ogc-timestart.xml b/tests/expected/suites_atom_get_opensearch-ogc-timestart.xml
@@ -10,7 +10,7 @@
     <atom:category>Hydrography-Oceanographic</atom:category>
     <atom:id>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</atom:id>
     <atom:link href="http://localhost/pycsw/csw.py?config=tests/suites/atom/default.cfg?service=CSW&amp;version=2.0.2&amp;request=GetRepositoryItem&amp;id=urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc"/>
-    <atom:title>&#209;un&#231; elementum</atom:title>
+    <atom:title>Ñunç elementum</atom:title>
     <georss:where>
       <gml:Polygon srsName="urn:x-ogc:def:crs:EPSG:6.11:4326">
         <gml:exterior>

diff --git a/tests/expected/suites_atom_get_opensearch.xml b/tests/expected/suites_atom_get_opensearch.xml
@@ -78,7 +78,7 @@
     <atom:category>Hydrography-Oceanographic</atom:category>
     <atom:id>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</atom:id>
     <atom:link href="http://localhost/pycsw/csw.py?config=tests/suites/atom/default.cfg?service=CSW&amp;version=2.0.2&amp;request=GetRepositoryItem&amp;id=urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc"/>
-    <atom:title>&#209;un&#231; elementum</atom:title>
+    <atom:title>Ñunç elementum</atom:title>
     <georss:where>
       <gml:Polygon srsName="urn:x-ogc:def:crs:EPSG:6.11:4326">
         <gml:exterior>

diff --git a/tests/expected/suites_atom_post_GetRecords-filter-bbox.xml b/tests/expected/suites_atom_post_GetRecords-filter-bbox.xml
@@ -23,7 +23,7 @@
       <atom:category>Hydrography-Oceanographic</atom:category>
       <atom:id>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</atom:id>
       <atom:link href="http://localhost/pycsw/csw.py?config=tests/suites/atom/default.cfg?service=CSW&amp;version=2.0.2&amp;request=GetRepositoryItem&amp;id=urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc"/>
-      <atom:title>&#209;un&#231; elementum</atom:title>
+      <atom:title>Ñunç elementum</atom:title>
       <georss:where>
         <gml:Polygon srsName="urn:x-ogc:def:crs:EPSG:6.11:4326">
           <gml:exterior>

diff --git a/tests/expected/suites_cite_get_37aa90e2-6ff0-420c-af15-8b9463099a73.xml b/tests/expected/suites_cite_get_37aa90e2-6ff0-420c-af15-8b9463099a73.xml
@@ -3,7 +3,7 @@
 <csw:GetRecordByIdResponse xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope" xmlns:gml="http://www.opengis.net/gml" xmlns:dif="http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ows="http://www.opengis.net/ows" xmlns:fgdc="http://www.opengis.net/cat/csw/csdgm" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:sitemap="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:os="http://a9.com/-/spec/opensearch/1.1/" xmlns:dct="http://purl.org/dc/terms/" xmlns:ogc="http://www.opengis.net/ogc" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
   <csw:SummaryRecord>
     <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-    <dc:title>&#209;un&#231; elementum</dc:title>
+    <dc:title>Ñunç elementum</dc:title>
     <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
     <dc:subject>Hydrography-Oceanographic</dc:subject>
     <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">

diff --git a/tests/expected/suites_cite_get_9bfd17fa-15dc-4a10-8fa7-b3cff7013dd7.xml b/tests/expected/suites_cite_get_9bfd17fa-15dc-4a10-8fa7-b3cff7013dd7.xml
@@ -4,10 +4,10 @@
   <csw:Record>
     <dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
     <dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
-    <dc:title>Fusc&#233; vitae ligul&#228;</dc:title>
+    <dc:title>Fuscé vitae ligulä</dc:title>
     <dc:date>2003-05-09Z</dc:date>
     <dc:subject>Land titles</dc:subject>
     <dc:format>text/rtf</dc:format>
-    <dct:abstract>Morbi ultri&#231;es, dui suscipit vestibulum pr&#232;tium, velit ante pretium tortor, eg&#235;t tincidunt pede odio ac nulla.</dct:abstract>
+    <dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
 </csw:Record>
 </csw:GetRecordByIdResponse>
diff --git a/tests/expected/suites_cite_post_19d2a6ed-be28-4866-ae15-e3bb634486cb.xml b/tests/expected/suites_cite_post_19d2a6ed-be28-4866-ae15-e3bb634486cb.xml
@@ -30,7 +30,7 @@
     </csw:BriefRecord>
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>

diff --git a/tests/expected/suites_cite_post_2d53ffea-60e4-4652-abf5-36eb23042fd5.xml b/tests/expected/suites_cite_post_2d53ffea-60e4-4652-abf5-36eb23042fd5.xml
@@ -53,7 +53,7 @@
     </csw:BriefRecord>
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>

diff --git a/tests/expected/suites_cite_post_6e736fd0-c266-4852-9eb3-0656f5d0f5c4.xml b/tests/expected/suites_cite_post_6e736fd0-c266-4852-9eb3-0656f5d0f5c4.xml
@@ -71,7 +71,7 @@
     </csw:SummaryRecord>
     <csw:SummaryRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <dc:subject>Hydrography-Oceanographic</dc:subject>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">

diff --git a/tests/expected/suites_cite_post_73f1551c-e269-4ef9-9dae-e535b5eebfc7.xml b/tests/expected/suites_cite_post_73f1551c-e269-4ef9-9dae-e535b5eebfc7.xml
@@ -6,7 +6,7 @@
     <csw:Record>
     <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
     <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
-    <dc:title>&#209;un&#231; elementum</dc:title>
+    <dc:title>Ñunç elementum</dc:title>
     <dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
     <dc:date>2005-10-24Z</dc:date>
     <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">

diff --git a/tests/expected/suites_cite_post_a06d04ab-e0d0-4a86-bfe8-71460f41fe37.xml b/tests/expected/suites_cite_post_a06d04ab-e0d0-4a86-bfe8-71460f41fe37.xml
@@ -53,7 +53,7 @@
     </csw:BriefRecord>
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>

diff --git a/tests/expected/suites_cite_post_b90e2de6-3d25-4298-a13e-dc9492a8fc73.xml b/tests/expected/suites_cite_post_b90e2de6-3d25-4298-a13e-dc9492a8fc73.xml
@@ -63,7 +63,7 @@
     </csw:SummaryRecord>
     <csw:SummaryRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <dc:subject>Hydrography-Oceanographic</dc:subject>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
@@ -81,11 +81,11 @@
     </csw:SummaryRecord>
     <csw:SummaryRecord>
       <dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
-      <dc:title>Fusc&#233; vitae ligul&#228;</dc:title>
+      <dc:title>Fuscé vitae ligulä</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
       <dc:subject>Land titles</dc:subject>
       <dc:format>text/rtf</dc:format>
-      <dct:abstract>Morbi ultri&#231;es, dui suscipit vestibulum pr&#232;tium, velit ante pretium tortor, eg&#235;t tincidunt pede odio ac nulla.</dct:abstract>
+      <dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
     </csw:SummaryRecord>
   </csw:SearchResults>
 </csw:GetRecordsResponse>
diff --git a/tests/expected/suites_cite_post_dcb13791-379e-4739-bcd4-dbaa69f0efdb.xml b/tests/expected/suites_cite_post_dcb13791-379e-4739-bcd4-dbaa69f0efdb.xml
@@ -53,7 +53,7 @@
     </csw:BriefRecord>
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>

diff --git a/tests/expected/suites_cite_post_e308f030-c097-4036-a838-44bad74c9ef7.xml b/tests/expected/suites_cite_post_e308f030-c097-4036-a838-44bad74c9ef7.xml
@@ -53,7 +53,7 @@
     </csw:BriefRecord>
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>

diff --git a/tests/expected/suites_cite_post_e6e9efb2-e2b7-4b0a-a3a2-7deea3f9b8e2.xml b/tests/expected/suites_cite_post_e6e9efb2-e2b7-4b0a-a3a2-7deea3f9b8e2.xml
@@ -53,7 +53,7 @@
     </csw:BriefRecord>
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>

diff --git a/tests/expected/suites_cite_post_f7d79701-f10b-4087-a33c-f62df0a04fd1.xml b/tests/expected/suites_cite_post_f7d79701-f10b-4087-a33c-f62df0a04fd1.xml
@@ -53,7 +53,7 @@
     </csw:BriefRecord>
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>

diff --git a/tests/expected/suites_cite_post_fc1bc094-88f1-4851-bc2b-dfc56be9f3c7.xml b/tests/expected/suites_cite_post_fc1bc094-88f1-4851-bc2b-dfc56be9f3c7.xml
@@ -5,7 +5,7 @@
   <csw:SearchResults nextRecord="0" numberOfRecordsMatched="1" numberOfRecordsReturned="1" recordSchema="http://www.opengis.net/cat/csw/2.0.2" elementSet="brief">
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
-      <dc:title>Fusc&#233; vitae ligul&#228;</dc:title>
+      <dc:title>Fuscé vitae ligulä</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
     </csw:BriefRecord>
   </csw:SearchResults>

diff --git a/tests/expected/suites_default_get_GetRecords-sortby-asc.xml b/tests/expected/suites_default_get_GetRecords-sortby-asc.xml
@@ -38,11 +38,11 @@
     <csw:Record>
     <dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
     <dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
-    <dc:title>Fusc&#233; vitae ligul&#228;</dc:title>
+    <dc:title>Fuscé vitae ligulä</dc:title>
     <dc:date>2003-05-09Z</dc:date>
     <dc:subject>Land titles</dc:subject>
     <dc:format>text/rtf</dc:format>
-    <dct:abstract>Morbi ultri&#231;es, dui suscipit vestibulum pr&#232;tium, velit ante pretium tortor, eg&#235;t tincidunt pede odio ac nulla.</dct:abstract>
+    <dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
 </csw:Record>
     <csw:Record>
     <dc:identifier>urn:uuid:19887a8a-f6b0-4a63-ae56-7fba0e17801f</dc:identifier>

diff --git a/tests/expected/suites_default_get_GetRecords-sortby-desc.xml b/tests/expected/suites_default_get_GetRecords-sortby-desc.xml
@@ -6,7 +6,7 @@
     <csw:Record>
     <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
     <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
-    <dc:title>&#209;un&#231; elementum</dc:title>
+    <dc:title>Ñunç elementum</dc:title>
     <dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
     <dc:date>2005-10-24Z</dc:date>
     <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">
@@ -67,11 +67,11 @@
     <csw:Record>
     <dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
     <dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
-    <dc:title>Fusc&#233; vitae ligul&#228;</dc:title>
+    <dc:title>Fuscé vitae ligulä</dc:title>
     <dc:date>2003-05-09Z</dc:date>
     <dc:subject>Land titles</dc:subject>
     <dc:format>text/rtf</dc:format>
-    <dct:abstract>Morbi ultri&#231;es, dui suscipit vestibulum pr&#232;tium, velit ante pretium tortor, eg&#235;t tincidunt pede odio ac nulla.</dct:abstract>
+    <dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
 </csw:Record>
     <csw:Record>
     <dc:identifier>urn:uuid:784e2afd-a9fd-44a6-9a92-a3848371c8ec</dc:identifier>

diff --git a/tests/expected/suites_default_post_GetDomain-property.xml b/tests/expected/suites_default_post_GetDomain-property.xml
@@ -5,14 +5,14 @@
     <csw:PropertyName>dc:title</csw:PropertyName>
     <csw:ListOfValues>
       <csw:Value>Aliquam fermentum purus quis arcu</csw:Value>
-      <csw:Value>Fusc&#233; vitae ligul&#228;</csw:Value>
+      <csw:Value>Fuscé vitae ligulä</csw:Value>
       <csw:Value>Lorem ipsum</csw:Value>
       <csw:Value>Lorem ipsum dolor sit amet</csw:Value>
       <csw:Value>Maecenas enim</csw:Value>
       <csw:Value>Mauris sed neque</csw:Value>
       <csw:Value>Ut facilisis justo ut lacus</csw:Value>
       <csw:Value>Vestibulum massa purus</csw:Value>
-      <csw:Value>&#209;un&#231; elementum</csw:Value>
+      <csw:Value>Ñunç elementum</csw:Value>
     </csw:ListOfValues>
   </csw:DomainValues>
 </csw:GetDomainResponse>
diff --git a/tests/expected/suites_default_post_GetRecords-all-sortby-bbox.xml b/tests/expected/suites_default_post_GetRecords-all-sortby-bbox.xml
@@ -15,7 +15,7 @@
     <csw:Record>
     <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
     <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
-    <dc:title>&#209;un&#231; elementum</dc:title>
+    <dc:title>Ñunç elementum</dc:title>
     <dc:subject scheme="http://www.digest.org/2.1">Hydrography-Oceanographic</dc:subject>
     <dc:date>2005-10-24Z</dc:date>
     <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326">

diff --git a/tests/expected/suites_default_post_GetRecords-end.xml b/tests/expected/suites_default_post_GetRecords-end.xml
@@ -20,11 +20,11 @@
     <csw:Record>
     <dc:identifier>urn:uuid:e9330592-0932-474b-be34-c3a3bb67c7db</dc:identifier>
     <dc:type>http://purl.org/dc/dcmitype/Text</dc:type>
-    <dc:title>Fusc&#233; vitae ligul&#228;</dc:title>
+    <dc:title>Fuscé vitae ligulä</dc:title>
     <dc:date>2003-05-09Z</dc:date>
     <dc:subject>Land titles</dc:subject>
     <dc:format>text/rtf</dc:format>
-    <dct:abstract>Morbi ultri&#231;es, dui suscipit vestibulum pr&#232;tium, velit ante pretium tortor, eg&#235;t tincidunt pede odio ac nulla.</dct:abstract>
+    <dct:abstract>Morbi ultriçes, dui suscipit vestibulum prètium, velit ante pretium tortor, egët tincidunt pede odio ac nulla.</dct:abstract>
 </csw:Record>
   </csw:SearchResults>
 </csw:GetRecordsResponse>
diff --git a/tests/expected/suites_default_post_GetRecords-filter-bbox-reproject.xml b/tests/expected/suites_default_post_GetRecords-filter-bbox-reproject.xml
@@ -14,7 +14,7 @@
     </csw:BriefRecord>
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>

diff --git a/tests/expected/suites_default_post_GetRecords-filter-bbox-sortby.xml b/tests/expected/suites_default_post_GetRecords-filter-bbox-sortby.xml
@@ -5,7 +5,7 @@
   <csw:SearchResults nextRecord="0" numberOfRecordsMatched="2" numberOfRecordsReturned="2" recordSchema="http://www.opengis.net/cat/csw/2.0.2" elementSet="brief">
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>

diff --git a/tests/expected/suites_default_post_GetRecords-filter-bbox.xml b/tests/expected/suites_default_post_GetRecords-filter-bbox.xml
@@ -14,7 +14,7 @@
     </csw:BriefRecord>
     <csw:BriefRecord>
       <dc:identifier>urn:uuid:9a669547-b69b-469f-a11f-2d875366bbdc</dc:identifier>
-      <dc:title>&#209;un&#231; elementum</dc:title>
+      <dc:title>Ñunç elementum</dc:title>
       <dc:type>http://purl.org/dc/dcmitype/Dataset</dc:type>
       <ows:BoundingBox crs="urn:x-ogc:def:crs:EPSG:6.11:4326" dimensions="2">
         <ows:LowerCorner>44.79 -6.17</ows:LowerCorner>