Merge pull request mozilla#8900 from Snuffleupagus/ref-test-SimpleLinkService

timvandermeij · web-flow · commit 31a34335a04b · 2017-09-13T22:25:38.000+02:00
Use the `SimpleLinkService` when running "annotations" reference tests
diff --git a/gulpfile.js b/gulpfile.js
@@ -1085,34 +1085,34 @@ gulp.task('publish', ['generic'], function (done) {
     });
 });
 
-gulp.task('test', ['generic'], function () {
+gulp.task('test', ['generic', 'components'], function () {
   return streamqueue({ objectMode: true, },
     createTestSource('unit'), createTestSource('browser'));
 });
 
-gulp.task('bottest', ['generic'], function () {
+gulp.task('bottest', ['generic', 'components'], function () {
   return streamqueue({ objectMode: true, },
     createTestSource('unit'), createTestSource('font'),
     createTestSource('browser (no reftest)'));
 });
 
-gulp.task('browsertest', ['generic'], function () {
+gulp.task('browsertest', ['generic', 'components'], function () {
   return createTestSource('browser');
 });
 
-gulp.task('unittest', ['generic'], function () {
+gulp.task('unittest', ['generic', 'components'], function () {
   return createTestSource('unit');
 });
 
 gulp.task('fonttest', function () {
   return createTestSource('font');
 });
 
-gulp.task('makeref', ['generic'], function (done) {
+gulp.task('makeref', ['generic', 'components'], function (done) {
   makeRef(done);
 });
 
-gulp.task('botmakeref', ['generic'], function (done) {
+gulp.task('botmakeref', ['generic', 'components'], function (done) {
   makeRef(done, true);
 });
 
diff --git a/test/driver.js b/test/driver.js
@@ -21,41 +21,6 @@ var PDF_TO_CSS_UNITS = 96.0 / 72.0;
 
 var StatTimer = pdfjsDistBuildPdf.StatTimer;
 
-/**
- * @class
- */
-var LinkServiceMock = (function LinkServiceMockClosure() {
-  function LinkServiceMock() {}
-
-  LinkServiceMock.prototype = {
-    get page() {
-      return 0;
-    },
-
-    set page(value) {},
-
-    navigateTo(dest) {},
-
-    getDestinationHash(dest) {
-      return '#';
-    },
-
-    getAnchorUrl(hash) {
-      return '#';
-    },
-
-    setHash(hash) {},
-
-    executeNamedAction(action) {},
-
-    onFileAttachmentAnnotation(params) {},
-
-    cachePageRef(pageNum, pageRef) {},
-  };
-
-  return LinkServiceMock;
-})();
-
 /**
  * @class
  */
@@ -230,7 +195,7 @@ var rasterizeAnnotationLayer = (function rasterizeAnnotationLayerClosure() {
           div,
           annotations,
           page,
-          linkService: new LinkServiceMock(),
+          linkService: new PDFJS.SimpleLinkService(),
           renderInteractiveForms,
         };
         PDFJS.AnnotationLayer.render(parameters);
diff --git a/test/test_slave.html b/test/test_slave.html
@@ -19,6 +19,7 @@
     <title>PDF.js test slave</title>
     <meta charset="utf-8">
     <script src="../build/generic/build/pdf.js"></script>
+    <script src="../build/components/pdf_viewer.js"></script>
     <script src="driver.js"></script>
   </head>
   <body>
diff --git a/web/pdf_viewer.component.js b/web/pdf_viewer.component.js
@@ -32,6 +32,7 @@ var PDFJS = pdfjsLib.PDFJS;
 PDFJS.PDFViewer = pdfjsWebPDFViewer.PDFViewer;
 PDFJS.PDFPageView = pdfjsWebPDFPageView.PDFPageView;
 PDFJS.PDFLinkService = pdfjsWebPDFLinkService.PDFLinkService;
+PDFJS.SimpleLinkService = pdfjsWebPDFLinkService.SimpleLinkService;
 PDFJS.TextLayerBuilder = pdfjsWebTextLayerBuilder.TextLayerBuilder;
 PDFJS.DefaultTextLayerFactory =
   pdfjsWebTextLayerBuilder.DefaultTextLayerFactory;
