Simplify the `FileAttachmentAnnotation` unit-test to avoid having to use the entire API in the test

Every other unit-test in `annotation_spec.js` is already only testing the annotation code. Hence it seems unnecessarily convoluted to make use of the API here, when we can (fairly) simply provide the necessary data explicitly as in all the other annotation unit-test.

test/unit/annotation_spec.js

@@ -18,21 +18,19 @@
   if (typeof define === 'function' && define.amd) {
     define('pdfjs-test/unit/annotation_spec', ['exports',
       'pdfjs/core/primitives', 'pdfjs/core/annotation', 'pdfjs/core/stream',
-      'pdfjs/core/parser', 'pdfjs/shared/util', 'pdfjs/display/global'],
+      'pdfjs/core/parser', 'pdfjs/shared/util'], factory);
-      factory);
   } else if (typeof exports !== 'undefined') {
     factory(exports, require('../../src/core/primitives.js'),
       require('../../src/core/annotation.js'),
       require('../../src/core/stream.js'), require('../../src/core/parser.js'),
-      require('../../src/shared/util.js'),
+      require('../../src/shared/util.js'));
-      require('../../src/display/global.js'));
   } else {
     factory((root.pdfjsTestUnitAnnotationSpec = {}),
       root.pdfjsCorePrimitives, root.pdfjsCoreAnnotation, root.pdfjsCoreStream,
-      root.pdfjsCoreParser, root.pdfjsSharedUtil, root.pdfjsDisplayGlobal);
+      root.pdfjsCoreParser, root.pdfjsSharedUtil);
   }
 }(this, function (exports, corePrimitives, coreAnnotation, coreStream,
-                  coreParser, sharedUtil, displayGlobal) {
+                  coreParser, sharedUtil) {
 
 var Annotation = coreAnnotation.Annotation;
 var AnnotationBorderStyle = coreAnnotation.AnnotationBorderStyle;
@@ -44,7 +42,6 @@ var Dict = corePrimitives.Dict;
 var Name = corePrimitives.Name;
 var Ref = corePrimitives.Ref;
 var StringStream = coreStream.StringStream;
-var PDFJS = displayGlobal.PDFJS;
 var AnnotationType = sharedUtil.AnnotationType;
 var AnnotationFlag = sharedUtil.AnnotationFlag;
 var AnnotationBorderStyleType = sharedUtil.AnnotationBorderStyleType;
@@ -1211,33 +1208,56 @@ describe('annotation', function() {
   });
 
   describe('FileAttachmentAnnotation', function() {
-    var loadingTask;
+    it('should correctly parse a file attachment', function() {
-    var annotations;
+      var fileStream = new StringStream(
-
+        '<<\n' +
-    beforeEach(function(done) {
+        '/Type /EmbeddedFile\n' +
-      var pdfUrl = new URL('../pdfs/annotation-fileattachment.pdf',
+        '/Subtype /text#2Fplain\n' +
-                           window.location).href;
+        '>>\n' +
-      loadingTask = PDFJS.getDocument(pdfUrl);
+        'stream\n' +
-      loadingTask.promise.then(function(pdfDocument) {
+        'Test attachment' +
-        return pdfDocument.getPage(1).then(function(pdfPage) {
+        'endstream\n'
-          return pdfPage.getAnnotations().then(function (pdfAnnotations) {
+      );
-            annotations = pdfAnnotations;
+      var lexer = new Lexer(fileStream);
-            done();
+      var parser = new Parser(lexer, /* allowStreams = */ true);
-          });
-        });
-      }).catch(function (reason) {
-        done.fail(reason);
-      });
-    });
 
-    afterEach(function() {
+      var fileStreamRef = new Ref(18, 0);
-      loadingTask.destroy();
+      var fileStreamDict = parser.getObj();
-    });
 
-    it('should correctly parse a file attachment', function() {
+      var embeddedFileDict = new Dict();
-      var annotation = annotations[0];
+      embeddedFileDict.set('F', fileStreamRef);
-      expect(annotation.file.filename).toEqual('Test.txt');
+
-      expect(annotation.file.content).toEqual(stringToBytes('Test attachment'));
+      var fileSpecRef = new Ref(19, 0);
+      var fileSpecDict = new Dict();
+      fileSpecDict.set('Type', Name.get('Filespec'));
+      fileSpecDict.set('Desc', '');
+      fileSpecDict.set('EF', embeddedFileDict);
+      fileSpecDict.set('UF', 'Test.txt');
+
+      var fileAttachmentRef = new Ref(20, 0);
+      var fileAttachmentDict = new Dict();
+      fileAttachmentDict.set('Type', Name.get('Annot'));
+      fileAttachmentDict.set('Subtype', Name.get('FileAttachment'));
+      fileAttachmentDict.set('FS', fileSpecRef);
+      fileAttachmentDict.set('T', 'Topic');
+      fileAttachmentDict.set('Contents', 'Test.txt');
+
+      var xref = new XRefMock([
+        { ref: fileStreamRef, data: fileStreamDict, },
+        { ref: fileSpecRef, data: fileSpecDict, },
+        { ref: fileAttachmentRef, data: fileAttachmentDict, }
+      ]);
+      embeddedFileDict.assignXref(xref);
+      fileSpecDict.assignXref(xref);
+      fileAttachmentDict.assignXref(xref);
+
+      var annotation = annotationFactory.create(xref, fileAttachmentRef,
+                                                pdfManagerMock, idFactoryMock);
+      var data = annotation.data;
+      expect(data.annotationType).toEqual(AnnotationType.FILEATTACHMENT);
+
+      expect(data.file.filename).toEqual('Test.txt');
+      expect(data.file.content).toEqual(stringToBytes('Test attachment'));
     });
   });
 

test/unit/clitests.json

@@ -1,6 +1,7 @@
 {
   "spec_dir": "test/unit",
   "spec_files": [
+    "annotation_spec.js",
     "bidi_spec.js",
     "cff_parser_spec.js",
     "crypto_spec.js",