Read note bodies immediately using relationships

2 files changed, 10 insertions, 41 deletions

diff --git a/tests/docx/document-xml-reader.tests.js b/tests/docx/document-xml-reader.tests.js
deleted file mode 100644
index 81283d1..0000000
--- a/tests/docx/document-xml-reader.tests.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var assert = require("assert");
-
-var BodyReader = require("../../lib/docx/body-reader").BodyReader;
-var DocumentXmlReader = require("../../lib/docx/document-xml-reader").DocumentXmlReader;
-var XmlElement = require("../../lib/xmlreader").Element;
-
-var testing = require("../testing");
-var test = testing.test;
-
-function convertXmlToDocumentValue(element, options) {
-    var reader = new DocumentXmlReader(options);
-    var result = reader.convertXmlToDocument(element);
-    assert.deepEqual(result.messages, []);
-    return result.value;
-}
-
-describe("convertXmlToDocument: ", function() {
-    
-    test("notes of document are read", function() {
-        var paragraphXml = new XmlElement("w:p", {}, []);
-        var footnotes = [{noteType: "footnote", id: "4", body: [paragraphXml]}];
-        
-        var bodyXml = new XmlElement("w:body", {}, []);
-        var documentXml = new XmlElement("w:document", {}, [bodyXml]);
-        
-        var document = convertXmlToDocumentValue({root: documentXml}, {
-            footnotes: footnotes,
-            bodyReader: new BodyReader({})
-        });
-        var footnote = document.notes.resolve({noteType: "footnote", noteId: "4"});
-        assert.deepEqual(footnote.noteId, "4");
-        assert.deepEqual(footnote.body[0].type, "paragraph");
-    });
-});
diff --git a/tests/docx/notes-reader.tests.js b/tests/docx/notes-reader.tests.js
index d3226f8..0cfb626 100644
--- a/tests/docx/notes-reader.tests.js
+++ b/tests/docx/notes-reader.tests.js
@@ -1,21 +1,24 @@
 var assert = require("assert");
 
-var readFootnotesXml = require("../../lib/docx/notes-reader").readFootnotesXml;
+var createFootnotesReader = require("../../lib/docx/notes-reader").createFootnotesReader;
+var BodyReader = require("../../lib/docx/body-reader").BodyReader;
+var documents = require("../../lib/documents");
 var XmlElement = require("../../lib/xmlreader").Element;
 var test = require("../testing").test;
 
 
 describe('readFootnotesXml', function() {
     test('ID and body of footnote are read', function() {
+        var bodyReader = new BodyReader({});
         var footnoteBody = [new XmlElement("w:p", {}, [])];
-        var footnotes = readFootnotesXml({
+        var footnotes = createFootnotesReader(bodyReader)({
             root: new XmlElement("w:footnotes", {}, [
                 new XmlElement("w:footnote", {"w:id": "1"}, footnoteBody)
             ])
         });
-        assert.equal(footnotes.length, 1);
-        assert.strictEqual(footnotes[0].body, footnoteBody);
-        assert.deepEqual(footnotes[0].id, "1");
+        assert.equal(footnotes.value.length, 1);
+        assert.deepEqual(footnotes.value[0].body, [new documents.Paragraph([])]);
+        assert.deepEqual(footnotes.value[0].noteId, "1");
     });
 });
 
@@ -25,12 +28,12 @@ footnoteTypeIsIgnored('separator');
 function footnoteTypeIsIgnored(type) {
     describe('footnotes of type ' + type + ' are ignored', function() {
         test('ID and body of footnote are read', function() {
-            var footnotes = readFootnotesXml({
+            var footnotes = createFootnotesReader()({
                 root: new XmlElement("w:footnotes", {}, [
                     new XmlElement("w:footnote", {"w:id": "1", "w:type": type}, [])
                 ])
             });
-            assert.equal(footnotes.length, 0);
+            assert.equal(footnotes.value.length, 0);
         });
     });
 }