From 73bf45e64bc8899a8f53b06e3727ea8733817473 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Tue, 16 Feb 2021 14:13:31 +0100 Subject: [PATCH 1/4] Support `Map` and `Set`, with `postMessage`, when workers are disabled The `LoopbackPort` currently doesn't support `Map` and `Set`, which it should since the "structured clone algorithm" used in browsers does support both of them; please see https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm#supported_types --- src/display/api.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/display/api.js b/src/display/api.js index c8c5c025b..86b564e48 100644 --- a/src/display/api.js +++ b/src/display/api.js @@ -1656,8 +1656,24 @@ class LoopbackPort { cloned.set(value, result); return result; } + if (value instanceof Map) { + result = new Map(); + cloned.set(value, result); // Adding to cache now for cyclic references. + for (const [key, val] of value) { + result.set(key, cloneValue(val)); + } + return result; + } + if (value instanceof Set) { + result = new Set(); + cloned.set(value, result); // Adding to cache now for cyclic references. + for (const val of value) { + result.add(cloneValue(val)); + } + return result; + } result = Array.isArray(value) ? [] : {}; - cloned.set(value, result); // adding to cache now for cyclic references + cloned.set(value, result); // Adding to cache now for cyclic references. // Cloning all value and object properties, however ignoring properties // defined via getter. for (const i in value) { From cc3a6563eef044df6ee6347186e844d57a06e7a6 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Tue, 16 Feb 2021 14:13:39 +0100 Subject: [PATCH 2/4] Move the Metadata parsing to the worker-thread The only reason, as far as I can tell, for parsing the Metadata on the main-thread is how it was originally implemented. When Metadata support was first implemented, it utilized the [`DOMParser`](https://developer.mozilla.org/en-US/docs/Web/API/DOMParser) which isn't available in workers. Today, with the custom XML-parser being used, that's no longer an issue and it seems reasonable to move the Metadata parsing to the worker-thread[1], since that's where all parsing should happen (for performance reasons). Based on these changes, we'll be able to reduce the now unnecessary duplication of the XML-parser (and related code) in both of the *built* `pdf.js`/`pdf.worker.js` files. Finally, this patch changes the `_repair` method to use "Array + join" rather than string concatenation. --- [1] This needed the previous patch, to enable sending of `Map`s between threads with workers disabled. --- src/core/metadata_parser.js | 146 ++++++++++++++++++++++++++++++++++++ src/core/obj.js | 17 +++-- src/display/metadata.js | 125 +----------------------------- src/shared/xml_parser.js | 2 +- test/unit/metadata_spec.js | 22 ++++-- web/app.js | 7 +- 6 files changed, 177 insertions(+), 142 deletions(-) create mode 100644 src/core/metadata_parser.js diff --git a/src/core/metadata_parser.js b/src/core/metadata_parser.js new file mode 100644 index 000000000..5d60f5c8c --- /dev/null +++ b/src/core/metadata_parser.js @@ -0,0 +1,146 @@ +/* Copyright 2012 Mozilla Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { SimpleXMLParser } from "../shared/xml_parser.js"; + +class MetadataParser { + constructor(data) { + // Ghostscript may produce invalid metadata, so try to repair that first. + data = this._repair(data); + + // Convert the string to an XML document. + const parser = new SimpleXMLParser({ lowerCaseName: true }); + const xmlDocument = parser.parseFromString(data); + + this._metadataMap = new Map(); + this._data = data; + + if (xmlDocument) { + this._parse(xmlDocument); + } + } + + _repair(data) { + // Start by removing any "junk" before the first tag (see issue 10395). + return data + .replace(/^[^<]+/, "") + .replace(/>\\376\\377([^<]+)/g, function (all, codes) { + const bytes = codes + .replace(/\\([0-3])([0-7])([0-7])/g, function (code, d1, d2, d3) { + return String.fromCharCode(d1 * 64 + d2 * 8 + d3 * 1); + }) + .replace(/&(amp|apos|gt|lt|quot);/g, function (str, name) { + switch (name) { + case "amp": + return "&"; + case "apos": + return "'"; + case "gt": + return ">"; + case "lt": + return "<"; + case "quot": + return '"'; + } + throw new Error(`_repair: ${name} isn't defined.`); + }); + + const charBuf = []; + for (let i = 0, ii = bytes.length; i < ii; i += 2) { + const code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1); + if ( + code >= /* Space = */ 32 && + code < /* Delete = */ 127 && + code !== /* '<' = */ 60 && + code !== /* '>' = */ 62 && + code !== /* '&' = */ 38 + ) { + charBuf.push(String.fromCharCode(code)); + } else { + charBuf.push( + "&#x" + (0x10000 + code).toString(16).substring(1) + ";" + ); + } + } + return ">" + charBuf.join(""); + }); + } + + _getSequence(entry) { + const name = entry.nodeName; + if (name !== "rdf:bag" && name !== "rdf:seq" && name !== "rdf:alt") { + return null; + } + return entry.childNodes.filter(node => node.nodeName === "rdf:li"); + } + + _parseArray(entry) { + if (!entry.hasChildNodes()) { + return; + } + // Child must be a Bag (unordered array) or a Seq. + const [seqNode] = entry.childNodes; + const sequence = this._getSequence(seqNode) || []; + + this._metadataMap.set( + entry.nodeName, + sequence.map(node => node.textContent.trim()) + ); + } + + _parse(xmlDocument) { + let rdf = xmlDocument.documentElement; + + if (rdf.nodeName !== "rdf:rdf") { + // Wrapped in + rdf = rdf.firstChild; + while (rdf && rdf.nodeName !== "rdf:rdf") { + rdf = rdf.nextSibling; + } + } + + if (!rdf || rdf.nodeName !== "rdf:rdf" || !rdf.hasChildNodes()) { + return; + } + + for (const desc of rdf.childNodes) { + if (desc.nodeName !== "rdf:description") { + continue; + } + + for (const entry of desc.childNodes) { + const name = entry.nodeName; + switch (name) { + case "#text": + continue; + case "dc:creator": + case "dc:subject": + this._parseArray(entry); + continue; + } + this._metadataMap.set(name, entry.textContent.trim()); + } + } + } + + get serializable() { + return { + parsedData: this._metadataMap, + rawData: this._data, + }; + } +} + +export { MetadataParser }; diff --git a/src/core/obj.js b/src/core/obj.js index 8352c23fa..3d4226d79 100644 --- a/src/core/obj.js +++ b/src/core/obj.js @@ -59,6 +59,7 @@ import { Lexer, Parser } from "./parser.js"; import { CipherTransformFactory } from "./crypto.js"; import { ColorSpace } from "./colorspace.js"; import { GlobalImageCache } from "./image_utils.js"; +import { MetadataParser } from "./metadata_parser.js"; function fetchDestination(dest) { return isDict(dest) ? dest.get("D") : dest; @@ -131,20 +132,22 @@ class Catalog { this.xref.encrypt && this.xref.encrypt.encryptMetadata ); const stream = this.xref.fetch(streamRef, suppressEncryption); - let metadata; + let metadata = null; - if (stream && isDict(stream.dict)) { + if (isStream(stream) && isDict(stream.dict)) { const type = stream.dict.get("Type"); const subtype = stream.dict.get("Subtype"); if (isName(type, "Metadata") && isName(subtype, "XML")) { // XXX: This should examine the charset the XML document defines, - // however since there are currently no real means to decode - // arbitrary charsets, let's just hope that the author of the PDF - // was reasonable enough to stick with the XML default charset, - // which is UTF-8. + // however since there are currently no real means to decode arbitrary + // charsets, let's just hope that the author of the PDF was reasonable + // enough to stick with the XML default charset, which is UTF-8. try { - metadata = stringToUTF8String(bytesToString(stream.getBytes())); + const data = stringToUTF8String(bytesToString(stream.getBytes())); + if (data) { + metadata = new MetadataParser(data).serializable; + } } catch (e) { if (e instanceof MissingDataException) { throw e; diff --git a/src/display/metadata.js b/src/display/metadata.js index 4b6c4b74f..3c7da06f7 100644 --- a/src/display/metadata.js +++ b/src/display/metadata.js @@ -13,129 +13,12 @@ * limitations under the License. */ -import { assert, objectFromEntries } from "../shared/util.js"; -import { SimpleXMLParser } from "../shared/xml_parser.js"; +import { objectFromEntries } from "../shared/util.js"; class Metadata { - constructor(data) { - assert(typeof data === "string", "Metadata: input is not a string"); - - // Ghostscript may produce invalid metadata, so try to repair that first. - data = this._repair(data); - - // Convert the string to an XML document. - const parser = new SimpleXMLParser({ lowerCaseName: true }); - const xmlDocument = parser.parseFromString(data); - - this._metadataMap = new Map(); - - if (xmlDocument) { - this._parse(xmlDocument); - } - this._data = data; - } - - _repair(data) { - // Start by removing any "junk" before the first tag (see issue 10395). - return data - .replace(/^[^<]+/, "") - .replace(/>\\376\\377([^<]+)/g, function (all, codes) { - const bytes = codes - .replace(/\\([0-3])([0-7])([0-7])/g, function (code, d1, d2, d3) { - return String.fromCharCode(d1 * 64 + d2 * 8 + d3 * 1); - }) - .replace(/&(amp|apos|gt|lt|quot);/g, function (str, name) { - switch (name) { - case "amp": - return "&"; - case "apos": - return "'"; - case "gt": - return ">"; - case "lt": - return "<"; - case "quot": - return '"'; - } - throw new Error(`_repair: ${name} isn't defined.`); - }); - - let chars = ""; - for (let i = 0, ii = bytes.length; i < ii; i += 2) { - const code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1); - if ( - code >= /* Space = */ 32 && - code < /* Delete = */ 127 && - code !== /* '<' = */ 60 && - code !== /* '>' = */ 62 && - code !== /* '&' = */ 38 - ) { - chars += String.fromCharCode(code); - } else { - chars += "&#x" + (0x10000 + code).toString(16).substring(1) + ";"; - } - } - - return ">" + chars; - }); - } - - _getSequence(entry) { - const name = entry.nodeName; - if (name !== "rdf:bag" && name !== "rdf:seq" && name !== "rdf:alt") { - return null; - } - - return entry.childNodes.filter(node => node.nodeName === "rdf:li"); - } - - _parseArray(entry) { - if (!entry.hasChildNodes()) { - return; - } - // Child must be a Bag (unordered array) or a Seq. - const [seqNode] = entry.childNodes; - const sequence = this._getSequence(seqNode) || []; - - this._metadataMap.set( - entry.nodeName, - sequence.map(node => node.textContent.trim()) - ); - } - - _parse(xmlDocument) { - let rdf = xmlDocument.documentElement; - - if (rdf.nodeName !== "rdf:rdf") { - // Wrapped in - rdf = rdf.firstChild; - while (rdf && rdf.nodeName !== "rdf:rdf") { - rdf = rdf.nextSibling; - } - } - - if (!rdf || rdf.nodeName !== "rdf:rdf" || !rdf.hasChildNodes()) { - return; - } - - for (const desc of rdf.childNodes) { - if (desc.nodeName !== "rdf:description") { - continue; - } - - for (const entry of desc.childNodes) { - const name = entry.nodeName; - switch (name) { - case "#text": - continue; - case "dc:creator": - case "dc:subject": - this._parseArray(entry); - continue; - } - this._metadataMap.set(name, entry.textContent.trim()); - } - } + constructor({ parsedData, rawData }) { + this._metadataMap = parsedData; + this._data = rawData; } getRaw() { diff --git a/src/shared/xml_parser.js b/src/shared/xml_parser.js index 6f3c94b80..96bf6d3df 100644 --- a/src/shared/xml_parser.js +++ b/src/shared/xml_parser.js @@ -16,7 +16,7 @@ // The code for XMLParserBase copied from // https://github.com/mozilla/shumway/blob/16451d8836fa85f4b16eeda8b4bda2fa9e2b22b0/src/avm2/natives/xml.ts -import { encodeToXmlString } from "./util.js"; +import { encodeToXmlString } from "../shared/util.js"; const XMLParserErrorCode = { NoError: 0, diff --git a/test/unit/metadata_spec.js b/test/unit/metadata_spec.js index 557e957bb..bbc8e6760 100644 --- a/test/unit/metadata_spec.js +++ b/test/unit/metadata_spec.js @@ -15,6 +15,12 @@ import { isEmptyObj } from "./test_utils.js"; import { Metadata } from "../../src/display/metadata.js"; +import { MetadataParser } from "../../src/core/metadata_parser.js"; + +function createMetadata(data) { + const metadataParser = new MetadataParser(data); + return new Metadata(metadataParser.serializable); +} describe("metadata", function () { it("should handle valid metadata", function () { @@ -24,7 +30,7 @@ describe("metadata", function () { "" + 'Foo bar baz' + ""; - const metadata = new Metadata(data); + const metadata = createMetadata(data); expect(metadata.has("dc:title")).toBeTruthy(); expect(metadata.has("dc:qux")).toBeFalsy(); @@ -42,7 +48,7 @@ describe("metadata", function () { "" + "\\376\\377\\000P\\000D\\000F\\000&" + ""; - const metadata = new Metadata(data); + const metadata = createMetadata(data); expect(metadata.has("dc:title")).toBeTruthy(); expect(metadata.has("dc:qux")).toBeFalsy(); @@ -85,7 +91,7 @@ describe("metadata", function () { "\\376\\377\\000O\\000D\\000I\\000S" + "" + ""; - const metadata = new Metadata(data); + const metadata = createMetadata(data); expect(metadata.has("dc:title")).toBeTruthy(); expect(metadata.has("dc:qux")).toBeFalsy(); @@ -128,7 +134,7 @@ describe("metadata", function () { "" + "" + ''; - const metadata = new Metadata(data); + const metadata = createMetadata(data); expect(isEmptyObj(metadata.getAll())).toEqual(true); }); @@ -159,7 +165,7 @@ describe("metadata", function () { '' + "application/pdf" + ''; - const metadata = new Metadata(data); + const metadata = createMetadata(data); expect(metadata.has("dc:title")).toBeTruthy(); expect(metadata.has("dc:qux")).toBeFalsy(); @@ -191,7 +197,7 @@ describe("metadata", function () { "" + ''Foo bar baz'' + ""; - const metadata = new Metadata(data); + const metadata = createMetadata(data); expect(metadata.has("dc:title")).toBeTruthy(); expect(metadata.has("dc:qux")).toBeFalsy(); @@ -220,7 +226,7 @@ describe("metadata", function () { "uuid:00000000-1c84-3cf9-89ba-bef0e729c831" + "" + ''; - const metadata = new Metadata(data); + const metadata = createMetadata(data); expect(isEmptyObj(metadata.getAll())).toEqual(true); }); @@ -249,7 +255,7 @@ describe("metadata", function () { " " + " " + ""; - const metadata = new Metadata(data); + const metadata = createMetadata(data); expect(metadata.has("dc:title")).toBeTruthy(); expect(metadata.has("dc:qux")).toBeFalsy(); diff --git a/web/app.js b/web/app.js index eb3c0abc6..e849e113d 100644 --- a/web/app.js +++ b/web/app.js @@ -1755,11 +1755,8 @@ const PDFViewerApplication = { `${this.pdfViewer.enableWebGL ? " [WebGL]" : ""})` ); - let pdfTitle; - const infoTitle = info?.Title; - if (infoTitle) { - pdfTitle = infoTitle; - } + let pdfTitle = info?.Title; + const metadataTitle = metadata?.get("dc:title"); if (metadataTitle) { // Ghostscript can produce invalid 'dc:title' Metadata entries: From b66f294f644fed777f329319230b73a4f40c9555 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Tue, 16 Feb 2021 14:13:46 +0100 Subject: [PATCH 3/4] Move the XML-parser to the `src/core/`-folder With the previous patch this functionality is now *only* accessed on the worker-thread, hence it's no longer necessary to include it in the *built* `pdf.js` file. --- src/core/metadata_parser.js | 2 +- src/core/writer.js | 2 +- src/core/xfa/parser.js | 2 +- src/{shared => core}/xml_parser.js | 0 test/unit/xml_spec.js | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/{shared => core}/xml_parser.js (100%) diff --git a/src/core/metadata_parser.js b/src/core/metadata_parser.js index 5d60f5c8c..8d65cd32c 100644 --- a/src/core/metadata_parser.js +++ b/src/core/metadata_parser.js @@ -13,7 +13,7 @@ * limitations under the License. */ -import { SimpleXMLParser } from "../shared/xml_parser.js"; +import { SimpleXMLParser } from "./xml_parser.js"; class MetadataParser { constructor(data) { diff --git a/src/core/writer.js b/src/core/writer.js index 555c5f034..b94db0094 100644 --- a/src/core/writer.js +++ b/src/core/writer.js @@ -16,7 +16,7 @@ import { bytesToString, escapeString, warn } from "../shared/util.js"; import { Dict, isDict, isName, isRef, isStream, Name } from "./primitives.js"; import { escapePDFName, parseXFAPath } from "./core_utils.js"; -import { SimpleDOMNode, SimpleXMLParser } from "../shared/xml_parser.js"; +import { SimpleDOMNode, SimpleXMLParser } from "./xml_parser.js"; import { calculateMD5 } from "./crypto.js"; function writeDict(dict, buffer, transform) { diff --git a/src/core/xfa/parser.js b/src/core/xfa/parser.js index c0dddc003..7af2bd27c 100644 --- a/src/core/xfa/parser.js +++ b/src/core/xfa/parser.js @@ -14,7 +14,7 @@ */ import { $clean, $finalize, $onChild, $onText } from "./xfa_object.js"; -import { XMLParserBase, XMLParserErrorCode } from "../../shared/xml_parser.js"; +import { XMLParserBase, XMLParserErrorCode } from "../xml_parser.js"; import { Builder } from "./builder.js"; import { warn } from "../../shared/util.js"; diff --git a/src/shared/xml_parser.js b/src/core/xml_parser.js similarity index 100% rename from src/shared/xml_parser.js rename to src/core/xml_parser.js diff --git a/test/unit/xml_spec.js b/test/unit/xml_spec.js index f7fbbc94f..1b653fa84 100644 --- a/test/unit/xml_spec.js +++ b/test/unit/xml_spec.js @@ -14,7 +14,7 @@ */ import { parseXFAPath } from "../../src/core/core_utils.js"; -import { SimpleXMLParser } from "../../src/shared/xml_parser.js"; +import { SimpleXMLParser } from "../../src/core/xml_parser.js"; describe("XML", function () { describe("searchNode", function () { From d366bbdf5137681a492ff14495b5c56fc6bad069 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Tue, 16 Feb 2021 14:13:51 +0100 Subject: [PATCH 4/4] Move the `encodeToXmlString` helper function to `src/core/core_utils.js` With the previous patch this function is now *only* accessed on the worker-thread, hence it's no longer necessary to include it in the *built* `pdf.js` file. --- src/core/core_utils.js | 46 ++++++++++++++++++++++++++++++++++ src/core/xml_parser.js | 2 +- src/shared/util.js | 48 ------------------------------------ test/unit/core_utils_spec.js | 15 +++++++++++ test/unit/util_spec.js | 15 ----------- 5 files changed, 62 insertions(+), 64 deletions(-) diff --git a/src/core/core_utils.js b/src/core/core_utils.js index cb205f141..70309919e 100644 --- a/src/core/core_utils.js +++ b/src/core/core_utils.js @@ -316,8 +316,54 @@ function collectActions(xref, dict, eventType) { return objectSize(actions) > 0 ? actions : null; } +const XMLEntities = { + /* < */ 0x3c: "<", + /* > */ 0x3e: ">", + /* & */ 0x26: "&", + /* " */ 0x22: """, + /* ' */ 0x27: "'", +}; + +function encodeToXmlString(str) { + const buffer = []; + let start = 0; + for (let i = 0, ii = str.length; i < ii; i++) { + const char = str.codePointAt(i); + if (0x20 <= char && char <= 0x7e) { + // ascii + const entity = XMLEntities[char]; + if (entity) { + if (start < i) { + buffer.push(str.substring(start, i)); + } + buffer.push(entity); + start = i + 1; + } + } else { + if (start < i) { + buffer.push(str.substring(start, i)); + } + buffer.push(`&#x${char.toString(16).toUpperCase()};`); + if (char > 0xd7ff && (char < 0xe000 || char > 0xfffd)) { + // char is represented by two u16 + i++; + } + start = i + 1; + } + } + + if (buffer.length === 0) { + return str; + } + if (start < str.length) { + buffer.push(str.substring(start, str.length)); + } + return buffer.join(""); +} + export { collectActions, + encodeToXmlString, escapePDFName, getArrayLookupTableFactory, getInheritableProperty, diff --git a/src/core/xml_parser.js b/src/core/xml_parser.js index 96bf6d3df..bf053f156 100644 --- a/src/core/xml_parser.js +++ b/src/core/xml_parser.js @@ -16,7 +16,7 @@ // The code for XMLParserBase copied from // https://github.com/mozilla/shumway/blob/16451d8836fa85f4b16eeda8b4bda2fa9e2b22b0/src/avm2/natives/xml.ts -import { encodeToXmlString } from "../shared/util.js"; +import { encodeToXmlString } from "./core_utils.js"; const XMLParserErrorCode = { NoError: 0, diff --git a/src/shared/util.js b/src/shared/util.js index 391072709..e0159595a 100644 --- a/src/shared/util.js +++ b/src/shared/util.js @@ -967,53 +967,6 @@ const createObjectURL = (function createObjectURLClosure() { }; })(); -const XMLEntities = { - /* < */ 0x3c: "<", - /* > */ 0x3e: ">", - /* & */ 0x26: "&", - /* " */ 0x22: """, - /* ' */ 0x27: "'", -}; - -function encodeToXmlString(str) { - const buffer = []; - let start = 0; - for (let i = 0, ii = str.length; i < ii; i++) { - const char = str.codePointAt(i); - if (0x20 <= char && char <= 0x7e) { - // ascii - const entity = XMLEntities[char]; - if (entity) { - if (start < i) { - buffer.push(str.substring(start, i)); - } - buffer.push(entity); - start = i + 1; - } - } else { - if (start < i) { - buffer.push(str.substring(start, i)); - } - buffer.push(`&#x${char.toString(16).toUpperCase()};`); - if (char > 0xd7ff && (char < 0xe000 || char > 0xfffd)) { - // char is represented by two u16 - i++; - } - start = i + 1; - } - } - - if (buffer.length === 0) { - return str; - } - - if (start < str.length) { - buffer.push(str.substring(start, str.length)); - } - - return buffer.join(""); -} - export { AbortException, AnnotationActionEventType, @@ -1035,7 +988,6 @@ export { createPromiseCapability, createValidAbsoluteUrl, DocumentActionEventType, - encodeToXmlString, escapeString, FONT_IDENTITY_MATRIX, FontType, diff --git a/test/unit/core_utils_spec.js b/test/unit/core_utils_spec.js index 033df42df..4a597d075 100644 --- a/test/unit/core_utils_spec.js +++ b/test/unit/core_utils_spec.js @@ -15,6 +15,7 @@ import { Dict, Ref } from "../../src/core/primitives.js"; import { + encodeToXmlString, escapePDFName, getInheritableProperty, isWhiteSpace, @@ -218,4 +219,18 @@ describe("core_utils", function () { ); }); }); + + describe("encodeToXmlString", function () { + it("should get a correctly encoded string with some entities", function () { + const str = "\"\u0397ell😂' & "; + expect(encodeToXmlString(str)).toEqual( + ""Ηell😂' & <W😂rld>" + ); + }); + + it("should get a correctly encoded basic ascii string", function () { + const str = "hello world"; + expect(encodeToXmlString(str)).toEqual(str); + }); + }); }); diff --git a/test/unit/util_spec.js b/test/unit/util_spec.js index 52c9f41d7..3ac30e717 100644 --- a/test/unit/util_spec.js +++ b/test/unit/util_spec.js @@ -17,7 +17,6 @@ import { bytesToString, createPromiseCapability, createValidAbsoluteUrl, - encodeToXmlString, escapeString, getModificationDate, isArrayBuffer, @@ -335,20 +334,6 @@ describe("util", function () { }); }); - describe("encodeToXmlString", function () { - it("should get a correctly encoded string with some entities", function () { - const str = "\"\u0397ell😂' & "; - expect(encodeToXmlString(str)).toEqual( - ""Ηell😂' & <W😂rld>" - ); - }); - - it("should get a correctly encoded basic ascii string", function () { - const str = "hello world"; - expect(encodeToXmlString(str)).toEqual(str); - }); - }); - describe("isAscii", function () { it("handles ascii/non-ascii strings", function () { expect(isAscii("hello world")).toEqual(true);