diff --git a/src/types/index.coffee b/src/types/index.coffee index d11cdac1..7748e1ec 100644 --- a/src/types/index.coffee +++ b/src/types/index.coffee @@ -14,3 +14,7 @@ register './text-composable' register './text-tp2' register './json' + +exports.helpers = require './helpers' +exports.testHelpers = require '../../test/helpers' + diff --git a/test/types/jabberwocky.txt b/test/helpers/jabberwocky.txt similarity index 100% rename from test/types/jabberwocky.txt rename to test/helpers/jabberwocky.txt diff --git a/test/helpers/misc.coffee b/test/helpers/misc.coffee index 76cd32d8..ffd4592e 100644 --- a/test/helpers/misc.coffee +++ b/test/helpers/misc.coffee @@ -1,6 +1,7 @@ # Some utility functions. p = -> #require('util').debug i = -> #require('util').inspect +fs = require 'fs' # Cross-transform function. Transform server by client and client by server. Returns # [server, client]. @@ -70,3 +71,9 @@ exports.newDocName = do -> index = 1 -> 'testing_doc_' + index++ + +# Return a random word from a corpus each time the method is called +exports.randomWord = do -> + words = fs.readFileSync(__dirname + '/jabberwocky.txt').toString().split(/\W+/) + -> words[exports.randomInt(words.length)] + diff --git a/test/types/json.coffee b/test/types/json.coffee index 436d5ca9..2f0f44a6 100644 --- a/test/types/json.coffee +++ b/test/types/json.coffee @@ -4,8 +4,6 @@ nativetype = require '../../src/types/json' -randomWord = require './randomWord' - util = require 'util' p = util.debug i = util.inspect @@ -15,7 +13,7 @@ i = util.inspect # the changes the op generator will make. clone = (o) -> JSON.parse(JSON.stringify(o)) -{randomInt, randomReal} = require('../helpers') +{randomInt, randomReal, randomWord} = require('../helpers') randomKey = (obj) -> if Array.isArray(obj) diff --git a/test/types/randomWord.coffee b/test/types/randomWord.coffee deleted file mode 100644 index 742bd5fe..00000000 --- a/test/types/randomWord.coffee +++ /dev/null @@ -1,11 +0,0 @@ -fs = require 'fs' - -# Generate a random int 0 <= k < n -{randomInt} = require '../helpers' - -# Return a random word from a corpus each time the method is called -module.exports = do -> - words = fs.readFileSync(__dirname + '/jabberwocky.txt').toString().split(/\W+/) - -> words[randomInt(words.length)] - - diff --git a/test/types/text-api.coffee b/test/types/text-api.coffee index 02fd5413..77e8c5e7 100644 --- a/test/types/text-api.coffee +++ b/test/types/text-api.coffee @@ -1,7 +1,6 @@ # Tests for the text types using the DSL interface assert = require 'assert' -randomWord = require './randomWord' -{randomInt, randomReal} = require('../helpers') +{randomInt, randomReal, randomWord} = require('../helpers') types = require '../../src/types' MicroEvent = require '../../src/client/microevent' diff --git a/test/types/text-composable.coffee b/test/types/text-composable.coffee index d1f3de7e..95206e1a 100644 --- a/test/types/text-composable.coffee +++ b/test/types/text-composable.coffee @@ -3,7 +3,7 @@ fs = require 'fs' util = require 'util' -randomWord = require './randomWord' +{randomWord} = require('../helpers') text = require '../../src/types/text-composable' p = util.debug i = util.inspect diff --git a/test/types/text-tp2.coffee b/test/types/text-tp2.coffee index 3b712bd1..ecff2be0 100644 --- a/test/types/text-tp2.coffee +++ b/test/types/text-tp2.coffee @@ -3,9 +3,8 @@ fs = require 'fs' util = require 'util' -randomWord = require './randomWord' text = require '../../src/types/text-tp2' -{randomInt, randomReal, seed, randomizerTest} = require '../helpers' +{randomInt, randomReal, seed, randomizerTest, randomWord} = require '../helpers' p = util.debug i = util.inspect diff --git a/test/types/text.coffee b/test/types/text.coffee index 9b21fd49..f4c2da11 100644 --- a/test/types/text.coffee +++ b/test/types/text.coffee @@ -1,6 +1,6 @@ # Tests for the non-composable op type. -randomWord = require './randomWord' +{randomWord} = require('../helpers') nativeType = require '../../src/types/text' genTests = (type) -> diff --git a/test/types/text2.coffee b/test/types/text2.coffee index 556a448d..809ec6cc 100644 --- a/test/types/text2.coffee +++ b/test/types/text2.coffee @@ -3,9 +3,8 @@ fs = require 'fs' util = require 'util' -randomWord = require './randomWord' text = require '../../src/types/text2' -{randomInt} = require '../helpers' +{randomInt, randomWord} = require '../helpers' readOp = (file) -> op = for c in JSON.parse file.shift()