Hide state in body reader from callers

3 files changed, 10 insertions, 18 deletions

diff --git a/test/docx/body-reader.tests.js b/test/docx/body-reader.tests.js
index 2528812..ab4995c 100644
--- a/test/docx/body-reader.tests.js
+++ b/test/docx/body-reader.tests.js
@@ -17,7 +17,8 @@ var isHyperlink = documentMatchers.isHyperlink;
 var isRun = documentMatchers.isRun;
 var isText = documentMatchers.isText;
 
-var BodyReader = require("../../lib/docx/body-reader").BodyReader;
+var createBodyReader = require("../../lib/docx/body-reader").createBodyReader;
+var _readNumberingProperties = require("../../lib/docx/body-reader")._readNumberingProperties;
 var documents = require("../../lib/documents");
 var xml = require("../../lib/xml");
 var XmlElement = xml.Element;
@@ -32,7 +33,7 @@ var createFakeDocxFile = testing.createFakeDocxFile;
 function readXmlElement(element, options) {
     options = Object.create(options || {});
     options.styles = options.styles || new Styles({}, {});
-    return new BodyReader(options).readXmlElement(element);
+    return createBodyReader(options).readXmlElement(element);
 }
 
 function readXmlElementValue(element, options) {
@@ -113,10 +114,7 @@ test("numbering properties are converted to numbering at specified level", funct
     
     var numbering = new Numbering({"42": {"1": {isOrdered: true, level: "1"}}});
     
-    var reader = new BodyReader({
-        numbering: numbering
-    });
-    var numberingLevel = reader._readNumberingProperties(numberingPropertiesXml);
+    var numberingLevel = _readNumberingProperties(numberingPropertiesXml, numbering);
     assert.deepEqual(numberingLevel, {level: "1", isOrdered: true});
 });
 
@@ -127,10 +125,7 @@ test("numbering properties are ignored if w:ilvl is missing", function() {
     
     var numbering = new Numbering({"42": {"1": {isOrdered: true, level: "1"}}});
     
-    var reader = new BodyReader({
-        numbering: numbering
-    });
-    var numberingLevel = reader._readNumberingProperties(numberingPropertiesXml);
+    var numberingLevel = _readNumberingProperties(numberingPropertiesXml, numbering);
     assert.equal(numberingLevel, null);
 });
 
@@ -141,10 +136,7 @@ test("numbering properties are ignored if w:numId is missing", function() {
     
     var numbering = new Numbering({"42": {"1": {isOrdered: true, level: "1"}}});
     
-    var reader = new BodyReader({
-        numbering: numbering
-    });
-    var numberingLevel = reader._readNumberingProperties(numberingPropertiesXml);
+    var numberingLevel = _readNumberingProperties(numberingPropertiesXml, numbering);
     assert.equal(numberingLevel, null);
 });
 
diff --git a/test/docx/comments-reader.tests.js b/test/docx/comments-reader.tests.js
index 4bb0e9b..0b3c0ce 100644
--- a/test/docx/comments-reader.tests.js
+++ b/test/docx/comments-reader.tests.js
@@ -1,14 +1,14 @@
 var assert = require("assert");
 
 var createCommentsReader = require("../../lib/docx/comments-reader").createCommentsReader;
-var BodyReader = require("../../lib/docx/body-reader").BodyReader;
+var createBodyReader = require("../../lib/docx/body-reader").createBodyReader;
 var documents = require("../../lib/documents");
 var xml = require("../../lib/xml");
 var test = require("../test")(module);
 
 
 function readComment(element) {
-    var bodyReader = new BodyReader({});
+    var bodyReader = createBodyReader({});
     var commentsReader = createCommentsReader(bodyReader);
     var comments = commentsReader(element);
     assert.equal(comments.value.length, 1);
diff --git a/test/docx/notes-reader.tests.js b/test/docx/notes-reader.tests.js
index 1d4cf9c..71bb794 100644
--- a/test/docx/notes-reader.tests.js
+++ b/test/docx/notes-reader.tests.js
@@ -1,14 +1,14 @@
 var assert = require("assert");
 
 var createFootnotesReader = require("../../lib/docx/notes-reader").createFootnotesReader;
-var BodyReader = require("../../lib/docx/body-reader").BodyReader;
+var createBodyReader = require("../../lib/docx/body-reader").createBodyReader;
 var documents = require("../../lib/documents");
 var XmlElement = require("../../lib/xml").Element;
 var test = require("../test")(module);
 
 
 test('ID and body of footnote are read', function() {
-    var bodyReader = new BodyReader({});
+    var bodyReader = new createBodyReader({});
     var footnoteBody = [new XmlElement("w:p", {}, [])];
     var footnotes = createFootnotesReader(bodyReader)(
         new XmlElement("w:footnotes", {}, [