Remove variable shadowing from the JavaScript files in the test/unit/ folder

*This is part of a series of patches that will try to split PR 11566 into smaller chunks, to make reviewing more feasible.*

Once all the code has been fixed, we'll be able to eventually enable the ESLint no-shadow rule; see https://eslint.org/docs/rules/no-shadow
This commit is contained in:
Jonas Jenwald 2020-03-24 10:44:17 +01:00
parent 85838fc505
commit 66ee8f5acd
3 changed files with 96 additions and 86 deletions

View File

@ -479,29 +479,30 @@ describe("api", function() {
}); });
}); });
describe("PDFDocument", function() { describe("PDFDocument", function() {
var loadingTask; let pdfLoadingTask, pdfDocument;
var doc;
beforeAll(function(done) { beforeAll(function(done) {
loadingTask = getDocument(basicApiGetDocumentParams); pdfLoadingTask = getDocument(basicApiGetDocumentParams);
loadingTask.promise.then(function(data) { pdfLoadingTask.promise.then(function(data) {
doc = data; pdfDocument = data;
done(); done();
}); });
}); });
afterAll(function(done) { afterAll(function(done) {
loadingTask.destroy().then(done); pdfLoadingTask.destroy().then(done);
}); });
it("gets number of pages", function() { it("gets number of pages", function() {
expect(doc.numPages).toEqual(3); expect(pdfDocument.numPages).toEqual(3);
}); });
it("gets fingerprint", function() { it("gets fingerprint", function() {
expect(doc.fingerprint).toEqual("ea8b35919d6279a369e835bde778611b"); expect(pdfDocument.fingerprint).toEqual(
"ea8b35919d6279a369e835bde778611b"
);
}); });
it("gets page", function(done) { it("gets page", function(done) {
var promise = doc.getPage(1); var promise = pdfDocument.getPage(1);
promise promise
.then(function(data) { .then(function(data) {
expect(data instanceof PDFPageProxy).toEqual(true); expect(data instanceof PDFPageProxy).toEqual(true);
@ -511,9 +512,9 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets non-existent page", function(done) { it("gets non-existent page", function(done) {
var outOfRangePromise = doc.getPage(100); var outOfRangePromise = pdfDocument.getPage(100);
var nonIntegerPromise = doc.getPage(2.5); var nonIntegerPromise = pdfDocument.getPage(2.5);
var nonNumberPromise = doc.getPage("1"); var nonNumberPromise = pdfDocument.getPage("1");
outOfRangePromise = outOfRangePromise.then( outOfRangePromise = outOfRangePromise.then(
function() { function() {
@ -586,7 +587,7 @@ describe("api", function() {
it("gets page index", function(done) { it("gets page index", function(done) {
// reference to second page // reference to second page
var ref = { num: 17, gen: 0 }; var ref = { num: 17, gen: 0 };
var promise = doc.getPageIndex(ref); var promise = pdfDocument.getPageIndex(ref);
promise promise
.then(function(pageIndex) { .then(function(pageIndex) {
expect(pageIndex).toEqual(1); expect(pageIndex).toEqual(1);
@ -596,7 +597,7 @@ describe("api", function() {
}); });
it("gets invalid page index", function(done) { it("gets invalid page index", function(done) {
var ref = { num: 3, gen: 0 }; // Reference to a font dictionary. var ref = { num: 3, gen: 0 }; // Reference to a font dictionary.
var promise = doc.getPageIndex(ref); var promise = pdfDocument.getPageIndex(ref);
promise promise
.then(function() { .then(function() {
done.fail("shall fail for invalid page reference."); done.fail("shall fail for invalid page reference.");
@ -608,7 +609,7 @@ describe("api", function() {
}); });
it("gets destinations, from /Dests dictionary", function(done) { it("gets destinations, from /Dests dictionary", function(done) {
var promise = doc.getDestinations(); var promise = pdfDocument.getDestinations();
promise promise
.then(function(data) { .then(function(data) {
expect(data).toEqual({ expect(data).toEqual({
@ -619,7 +620,7 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets a destination, from /Dests dictionary", function(done) { it("gets a destination, from /Dests dictionary", function(done) {
var promise = doc.getDestination("chapter1"); var promise = pdfDocument.getDestination("chapter1");
promise promise
.then(function(data) { .then(function(data) {
expect(data).toEqual([ expect(data).toEqual([
@ -634,7 +635,9 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets a non-existent destination, from /Dests dictionary", function(done) { it("gets a non-existent destination, from /Dests dictionary", function(done) {
var promise = doc.getDestination("non-existent-named-destination"); var promise = pdfDocument.getDestination(
"non-existent-named-destination"
);
promise promise
.then(function(data) { .then(function(data) {
expect(data).toEqual(null); expect(data).toEqual(null);
@ -645,8 +648,8 @@ describe("api", function() {
it("gets destinations, from /Names (NameTree) dictionary", function(done) { it("gets destinations, from /Names (NameTree) dictionary", function(done) {
var loadingTask = getDocument(buildGetDocumentParams("issue6204.pdf")); var loadingTask = getDocument(buildGetDocumentParams("issue6204.pdf"));
var promise = loadingTask.promise.then(function(pdfDocument) { var promise = loadingTask.promise.then(function(pdfDoc) {
return pdfDocument.getDestinations(); return pdfDoc.getDestinations();
}); });
promise promise
.then(function(destinations) { .then(function(destinations) {
@ -661,8 +664,8 @@ describe("api", function() {
}); });
it("gets a destination, from /Names (NameTree) dictionary", function(done) { it("gets a destination, from /Names (NameTree) dictionary", function(done) {
var loadingTask = getDocument(buildGetDocumentParams("issue6204.pdf")); var loadingTask = getDocument(buildGetDocumentParams("issue6204.pdf"));
var promise = loadingTask.promise.then(function(pdfDocument) { var promise = loadingTask.promise.then(function(pdfDoc) {
return pdfDocument.getDestination("Page.1"); return pdfDoc.getDestination("Page.1");
}); });
promise promise
.then(function(destination) { .then(function(destination) {
@ -680,8 +683,8 @@ describe("api", function() {
}); });
it("gets a non-existent destination, from /Names (NameTree) dictionary", function(done) { it("gets a non-existent destination, from /Names (NameTree) dictionary", function(done) {
var loadingTask = getDocument(buildGetDocumentParams("issue6204.pdf")); var loadingTask = getDocument(buildGetDocumentParams("issue6204.pdf"));
var promise = loadingTask.promise.then(function(pdfDocument) { var promise = loadingTask.promise.then(function(pdfDoc) {
return pdfDocument.getDestination("non-existent-named-destination"); return pdfDoc.getDestination("non-existent-named-destination");
}); });
promise promise
.then(function(destination) { .then(function(destination) {
@ -693,9 +696,9 @@ describe("api", function() {
}); });
it("gets non-string destination", function(done) { it("gets non-string destination", function(done) {
let numberPromise = doc.getDestination(4.3); let numberPromise = pdfDocument.getDestination(4.3);
let booleanPromise = doc.getDestination(true); let booleanPromise = pdfDocument.getDestination(true);
let arrayPromise = doc.getDestination([ let arrayPromise = pdfDocument.getDestination([
{ num: 17, gen: 0 }, { num: 17, gen: 0 },
{ name: "XYZ" }, { name: "XYZ" },
0, 0,
@ -735,7 +738,7 @@ describe("api", function() {
}); });
it("gets non-existent page labels", function(done) { it("gets non-existent page labels", function(done) {
var promise = doc.getPageLabels(); var promise = pdfDocument.getPageLabels();
promise promise
.then(function(data) { .then(function(data) {
expect(data).toEqual(null); expect(data).toEqual(null);
@ -791,8 +794,8 @@ describe("api", function() {
var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf")); var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf"));
loadingTask.promise loadingTask.promise
.then(function(pdfDocument) { .then(function(pdfDoc) {
return pdfDocument.getPageLayout(); return pdfDoc.getPageLayout();
}) })
.then(function(mode) { .then(function(mode) {
expect(mode).toEqual(""); expect(mode).toEqual("");
@ -802,7 +805,7 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets non-default page layout", function(done) { it("gets non-default page layout", function(done) {
doc pdfDocument
.getPageLayout() .getPageLayout()
.then(function(mode) { .then(function(mode) {
expect(mode).toEqual("SinglePage"); expect(mode).toEqual("SinglePage");
@ -815,8 +818,8 @@ describe("api", function() {
var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf")); var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf"));
loadingTask.promise loadingTask.promise
.then(function(pdfDocument) { .then(function(pdfDoc) {
return pdfDocument.getPageMode(); return pdfDoc.getPageMode();
}) })
.then(function(mode) { .then(function(mode) {
expect(mode).toEqual("UseNone"); expect(mode).toEqual("UseNone");
@ -826,7 +829,7 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets non-default page mode", function(done) { it("gets non-default page mode", function(done) {
doc pdfDocument
.getPageMode() .getPageMode()
.then(function(mode) { .then(function(mode) {
expect(mode).toEqual("UseOutlines"); expect(mode).toEqual("UseOutlines");
@ -839,8 +842,8 @@ describe("api", function() {
var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf")); var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf"));
loadingTask.promise loadingTask.promise
.then(function(pdfDocument) { .then(function(pdfDoc) {
return pdfDocument.getViewerPreferences(); return pdfDoc.getViewerPreferences();
}) })
.then(function(prefs) { .then(function(prefs) {
expect( expect(
@ -852,7 +855,7 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets non-default viewer preferences", function(done) { it("gets non-default viewer preferences", function(done) {
doc pdfDocument
.getViewerPreferences() .getViewerPreferences()
.then(function(prefs) { .then(function(prefs) {
expect(prefs).toEqual({ expect(prefs).toEqual({
@ -867,8 +870,8 @@ describe("api", function() {
var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf")); var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf"));
loadingTask.promise loadingTask.promise
.then(function(pdfDocument) { .then(function(pdfDoc) {
return pdfDocument.getOpenAction(); return pdfDoc.getOpenAction();
}) })
.then(function(openAction) { .then(function(openAction) {
expect(openAction).toEqual(null); expect(openAction).toEqual(null);
@ -878,7 +881,7 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets non-default open action (with destination)", function(done) { it("gets non-default open action (with destination)", function(done) {
doc pdfDocument
.getOpenAction() .getOpenAction()
.then(function(openAction) { .then(function(openAction) {
expect(openAction.dest).toEqual([ expect(openAction.dest).toEqual([
@ -904,8 +907,8 @@ describe("api", function() {
); );
const promise1 = loadingTask1.promise const promise1 = loadingTask1.promise
.then(function(pdfDocument) { .then(function(pdfDoc) {
return pdfDocument.getOpenAction(); return pdfDoc.getOpenAction();
}) })
.then(function(openAction) { .then(function(openAction) {
expect(openAction.dest).toBeUndefined(); expect(openAction.dest).toBeUndefined();
@ -914,8 +917,8 @@ describe("api", function() {
return loadingTask1.destroy(); return loadingTask1.destroy();
}); });
const promise2 = loadingTask2.promise const promise2 = loadingTask2.promise
.then(function(pdfDocument) { .then(function(pdfDoc) {
return pdfDocument.getOpenAction(); return pdfDoc.getOpenAction();
}) })
.then(function(openAction) { .then(function(openAction) {
expect(openAction.dest).toBeUndefined(); expect(openAction.dest).toBeUndefined();
@ -928,7 +931,7 @@ describe("api", function() {
}); });
it("gets non-existent attachments", function(done) { it("gets non-existent attachments", function(done) {
var promise = doc.getAttachments(); var promise = pdfDocument.getAttachments();
promise promise
.then(function(data) { .then(function(data) {
expect(data).toEqual(null); expect(data).toEqual(null);
@ -955,7 +958,7 @@ describe("api", function() {
}); });
it("gets javascript", function(done) { it("gets javascript", function(done) {
var promise = doc.getJavaScript(); var promise = pdfDocument.getJavaScript();
promise promise
.then(function(data) { .then(function(data) {
expect(data).toEqual(null); expect(data).toEqual(null);
@ -966,8 +969,8 @@ describe("api", function() {
it("gets javascript with printing instructions (JS action)", function(done) { it("gets javascript with printing instructions (JS action)", function(done) {
// PDF document with "JavaScript" action in the OpenAction dictionary. // PDF document with "JavaScript" action in the OpenAction dictionary.
var loadingTask = getDocument(buildGetDocumentParams("issue6106.pdf")); var loadingTask = getDocument(buildGetDocumentParams("issue6106.pdf"));
var promise = loadingTask.promise.then(function(doc) { var promise = loadingTask.promise.then(function(pdfDoc) {
return doc.getJavaScript(); return pdfDoc.getJavaScript();
}); });
promise promise
.then(function(data) { .then(function(data) {
@ -983,8 +986,8 @@ describe("api", function() {
it("gets non-existent outline", function(done) { it("gets non-existent outline", function(done) {
var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf")); var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf"));
var promise = loadingTask.promise.then(function(pdfDocument) { var promise = loadingTask.promise.then(function(pdfDoc) {
return pdfDocument.getOutline(); return pdfDoc.getOutline();
}); });
promise promise
.then(function(outline) { .then(function(outline) {
@ -995,7 +998,7 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets outline", function(done) { it("gets outline", function(done) {
var promise = doc.getOutline(); var promise = pdfDocument.getOutline();
promise promise
.then(function(outline) { .then(function(outline) {
// Two top level entries. // Two top level entries.
@ -1025,8 +1028,8 @@ describe("api", function() {
var loadingTask = getDocument(buildGetDocumentParams("issue3214.pdf")); var loadingTask = getDocument(buildGetDocumentParams("issue3214.pdf"));
loadingTask.promise loadingTask.promise
.then(function(pdfDocument) { .then(function(pdfDoc) {
pdfDocument.getOutline().then(function(outline) { pdfDoc.getOutline().then(function(outline) {
expect(Array.isArray(outline)).toEqual(true); expect(Array.isArray(outline)).toEqual(true);
expect(outline.length).toEqual(5); expect(outline.length).toEqual(5);
@ -1051,7 +1054,7 @@ describe("api", function() {
}); });
it("gets non-existent permissions", function(done) { it("gets non-existent permissions", function(done) {
doc pdfDocument
.getPermissions() .getPermissions()
.then(function(permissions) { .then(function(permissions) {
expect(permissions).toEqual(null); expect(permissions).toEqual(null);
@ -1066,24 +1069,24 @@ describe("api", function() {
const loadingTask0 = getDocument( const loadingTask0 = getDocument(
buildGetDocumentParams("issue9972-1.pdf") buildGetDocumentParams("issue9972-1.pdf")
); );
const promise0 = loadingTask0.promise.then(function(pdfDocument) { const promise0 = loadingTask0.promise.then(function(pdfDoc) {
return pdfDocument.getPermissions(); return pdfDoc.getPermissions();
}); });
// Printing not allowed. // Printing not allowed.
const loadingTask1 = getDocument( const loadingTask1 = getDocument(
buildGetDocumentParams("issue9972-2.pdf") buildGetDocumentParams("issue9972-2.pdf")
); );
const promise1 = loadingTask1.promise.then(function(pdfDocument) { const promise1 = loadingTask1.promise.then(function(pdfDoc) {
return pdfDocument.getPermissions(); return pdfDoc.getPermissions();
}); });
// Copying not allowed. // Copying not allowed.
const loadingTask2 = getDocument( const loadingTask2 = getDocument(
buildGetDocumentParams("issue9972-3.pdf") buildGetDocumentParams("issue9972-3.pdf")
); );
const promise2 = loadingTask2.promise.then(function(pdfDocument) { const promise2 = loadingTask2.promise.then(function(pdfDoc) {
return pdfDocument.getPermissions(); return pdfDoc.getPermissions();
}); });
const totalPermissionCount = Object.keys(PermissionFlag).length; const totalPermissionCount = Object.keys(PermissionFlag).length;
@ -1113,7 +1116,7 @@ describe("api", function() {
}); });
it("gets metadata", function(done) { it("gets metadata", function(done) {
var promise = doc.getMetadata(); var promise = pdfDocument.getMetadata();
promise promise
.then(function({ info, metadata, contentDispositionFilename }) { .then(function({ info, metadata, contentDispositionFilename }) {
expect(info["Title"]).toEqual("Basic API Test"); expect(info["Title"]).toEqual("Basic API Test");
@ -1138,8 +1141,8 @@ describe("api", function() {
var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf")); var loadingTask = getDocument(buildGetDocumentParams("tracemonkey.pdf"));
loadingTask.promise loadingTask.promise
.then(function(pdfDocument) { .then(function(pdfDoc) {
return pdfDocument.getMetadata(); return pdfDoc.getMetadata();
}) })
.then(function({ info, metadata, contentDispositionFilename }) { .then(function({ info, metadata, contentDispositionFilename }) {
expect(info["Creator"]).toEqual("TeX"); expect(info["Creator"]).toEqual("TeX");
@ -1171,8 +1174,8 @@ describe("api", function() {
const loadingTask = getDocument(buildGetDocumentParams("bug1606566.pdf")); const loadingTask = getDocument(buildGetDocumentParams("bug1606566.pdf"));
loadingTask.promise loadingTask.promise
.then(function(pdfDocument) { .then(function(pdfDoc) {
return pdfDocument.getMetadata(); return pdfDoc.getMetadata();
}) })
.then(function({ info, metadata, contentDispositionFilename }) { .then(function({ info, metadata, contentDispositionFilename }) {
// The following are PDF.js specific, non-standard, properties. // The following are PDF.js specific, non-standard, properties.
@ -1191,7 +1194,7 @@ describe("api", function() {
}); });
it("gets data", function(done) { it("gets data", function(done) {
var promise = doc.getData(); var promise = pdfDocument.getData();
promise promise
.then(function(data) { .then(function(data) {
expect(data instanceof Uint8Array).toEqual(true); expect(data instanceof Uint8Array).toEqual(true);
@ -1201,7 +1204,7 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets download info", function(done) { it("gets download info", function(done) {
var promise = doc.getDownloadInfo(); var promise = pdfDocument.getDownloadInfo();
promise promise
.then(function(data) { .then(function(data) {
expect(data).toEqual({ length: basicApiFileLength }); expect(data).toEqual({ length: basicApiFileLength });
@ -1210,7 +1213,7 @@ describe("api", function() {
.catch(done.fail); .catch(done.fail);
}); });
it("gets document stats", function(done) { it("gets document stats", function(done) {
var promise = doc.getStats(); var promise = pdfDocument.getStats();
promise promise
.then(function(stats) { .then(function(stats) {
expect(stats).toEqual({ streamTypes: {}, fontTypes: {} }); expect(stats).toEqual({ streamTypes: {}, fontTypes: {} });
@ -1220,7 +1223,7 @@ describe("api", function() {
}); });
it("cleans up document resources", function(done) { it("cleans up document resources", function(done) {
const promise = doc.cleanup(); const promise = pdfDocument.cleanup();
promise.then(function() { promise.then(function() {
expect(true).toEqual(true); expect(true).toEqual(true);
done(); done();
@ -1330,12 +1333,11 @@ describe("api", function() {
}); });
}); });
describe("Page", function() { describe("Page", function() {
var loadingTask; let pdfLoadingTask, pdfDocument, page;
var pdfDocument, page;
beforeAll(function(done) { beforeAll(function(done) {
loadingTask = getDocument(basicApiGetDocumentParams); pdfLoadingTask = getDocument(basicApiGetDocumentParams);
loadingTask.promise pdfLoadingTask.promise
.then(function(doc) { .then(function(doc) {
pdfDocument = doc; pdfDocument = doc;
pdfDocument.getPage(1).then(function(data) { pdfDocument.getPage(1).then(function(data) {
@ -1347,7 +1349,7 @@ describe("api", function() {
}); });
afterAll(function(done) { afterAll(function(done) {
loadingTask.destroy().then(done); pdfLoadingTask.destroy().then(done);
}); });
it("gets page number", function() { it("gets page number", function() {

View File

@ -172,17 +172,21 @@ describe("CFFParser", function() {
}); });
it("parses a CharString endchar with 4 args w/seac enabled", function() { it("parses a CharString endchar with 4 args w/seac enabled", function() {
var parser = new CFFParser(fontData, {}, /* seacAnalysisEnabled = */ true); const cffParser = new CFFParser(
parser.parse(); // cff fontData,
{},
/* seacAnalysisEnabled = */ true
);
cffParser.parse(); // cff
// prettier-ignore // prettier-ignore
var bytes = new Uint8Array([0, 1, // count var bytes = new Uint8Array([0, 1, // count
1, // offsetSize 1, // offsetSize
0, // offset[0] 0, // offset[0]
237, 247, 22, 247, 72, 204, 247, 86, 14]); 237, 247, 22, 247, 72, 204, 247, 86, 14]);
parser.bytes = bytes; cffParser.bytes = bytes;
var charStringsIndex = parser.parseIndex(0).obj; var charStringsIndex = cffParser.parseIndex(0).obj;
var result = parser.parseCharStrings({ var result = cffParser.parseCharStrings({
charStrings: charStringsIndex, charStrings: charStringsIndex,
privateDict: privateDictStub, privateDict: privateDictStub,
}); });
@ -197,17 +201,21 @@ describe("CFFParser", function() {
}); });
it("parses a CharString endchar with 4 args w/seac disabled", function() { it("parses a CharString endchar with 4 args w/seac disabled", function() {
var parser = new CFFParser(fontData, {}, /* seacAnalysisEnabled = */ false); const cffParser = new CFFParser(
parser.parse(); // cff fontData,
{},
/* seacAnalysisEnabled = */ false
);
cffParser.parse(); // cff
// prettier-ignore // prettier-ignore
var bytes = new Uint8Array([0, 1, // count var bytes = new Uint8Array([0, 1, // count
1, // offsetSize 1, // offsetSize
0, // offset[0] 0, // offset[0]
237, 247, 22, 247, 72, 204, 247, 86, 14]); 237, 247, 22, 247, 72, 204, 247, 86, 14]);
parser.bytes = bytes; cffParser.bytes = bytes;
var charStringsIndex = parser.parseIndex(0).obj; var charStringsIndex = cffParser.parseIndex(0).obj;
var result = parser.parseCharStrings({ var result = cffParser.parseCharStrings({
charStrings: charStringsIndex, charStrings: charStringsIndex,
privateDict: privateDictStub, privateDict: privateDictStub,
}); });

View File

@ -159,11 +159,11 @@ describe("parser", function() {
const numbers = ["..", "-.", "+.", "-\r\n.", "+\r\n."]; const numbers = ["..", "-.", "+.", "-\r\n.", "+\r\n."];
for (const number of numbers) { for (const number of numbers) {
const input = new StringStream(number); const invalidInput = new StringStream(number);
const lexer = new Lexer(input); const invalidLexer = new Lexer(invalidInput);
expect(function() { expect(function() {
return lexer.getNumber(); return invalidLexer.getNumber();
}).toThrowError(FormatError, /^Invalid number:\s/); }).toThrowError(FormatError, /^Invalid number:\s/);
} }
}); });