From 4bf247ad09d4ba63e3ccbc29444b64f9d1454672 Mon Sep 17 00:00:00 2001 From: spencermountain Date: Fri, 3 Feb 2017 13:41:25 -0500 Subject: [PATCH] move tests around --- .esformatter | 3 +- scratch_file.js | 9 ++- scripts/test.js | 2 +- src/result/index.js | 5 +- src/result/methods/loops.js | 3 + src/result/methods/out/index.js | 77 ++++++++++--------- src/result/subset/people/index.js | 3 + src/result/subset/people/person.js | 11 +++ src/terms/methods/out.js | 9 ++- test/leak/index.html | 32 -------- test/unit/lexicon/tricky.test.js | 6 -- test/unit/{result => match}/if.test.js | 0 test/unit/{result => match}/pluck.ignore.js | 2 +- test/unit/{result => }/misc.test.js | 2 +- test/unit/noun/pronoun.ignore.js | 27 ------- test/unit/{result => out}/edgegram.test.js | 0 test/unit/{result => out}/sort.test.js | 0 .../{ => subset}/adjective/adjective.test.js | 4 +- test/unit/{ => subset}/adverb/adverb.test.js | 2 +- .../unit/{result => subset}/allSubset.test.js | 0 .../{ => subset}/contractions/basic.test.js | 2 +- .../contractions/contractions.test.js | 4 +- .../{ => subset}/date/basic_date.ignore.js | 4 +- test/unit/{ => subset}/date/date_tag.test.js | 2 +- .../date/misc_date.test.js} | 2 +- test/unit/{ => subset}/noun/article.test.js | 4 +- test/unit/{ => subset}/noun/inflect.test.js | 4 +- test/unit/subset/noun/pronoun.test.js | 27 +++++++ test/unit/{ => subset}/person/person.test.js | 2 +- .../sentence/conditions.ignore.js | 4 +- .../{ => subset}/sentence/inflect.ignore.js | 4 +- .../{ => subset}/sentence/question.ignore.js | 4 +- .../{ => subset}/sentence/quotation.ignore.js | 4 +- .../{ => subset}/sentence/tense.ignore.js | 4 +- .../{ => subset}/sentence/toNegative.test.js | 4 +- .../{ => subset}/sentence/tokenize.test.js | 4 +- .../{ => subset}/sentence/whitespace.test.js | 4 +- test/unit/{result => subset}/subset.test.js | 0 .../{result => subset/topics}/things.test.js | 2 +- .../topics}/topics.ignore.js | 6 +- test/unit/{ => subset}/value/money.test.js | 2 +- test/unit/{ => subset}/value/toNumber.test.js | 2 +- test/unit/{ => subset}/value/toText.test.js | 4 +- test/unit/{ => subset}/value/value.test.js | 4 +- test/unit/{ => subset}/verb/conjugate.test.js | 2 +- test/unit/{ => subset}/verb/parts.test.js | 2 +- test/unit/{ => subset}/verb/phrasal.test.js | 2 +- .../{ => subset}/verb/toNegative.ignore.js | 2 +- .../{ => subset}/verb/to_adjective.test.js | 2 +- test/unit/tagger/single-word.ignore.js | 2 +- test/unit/tagger/tag_perfect.ignore.js | 4 +- test/unit/term/term_negate.ignore.js | 4 +- test/unit/{result => transform}/case.test.js | 0 .../{result => transform}/normalize.test.js | 0 .../{result => transform}/result_fns.test.js | 0 test/unit/{result => transform}/split.test.js | 6 +- .../{result => transform}/whitespace.test.js | 0 .../{result => transform}/wordcount.ignore.js | 6 +- 58 files changed, 159 insertions(+), 173 deletions(-) delete mode 100644 test/leak/index.html rename test/unit/{result => match}/if.test.js (100%) rename test/unit/{result => match}/pluck.ignore.js (99%) rename test/unit/{result => }/misc.test.js (96%) delete mode 100644 test/unit/noun/pronoun.ignore.js rename test/unit/{result => out}/edgegram.test.js (100%) rename test/unit/{result => out}/sort.test.js (100%) rename test/unit/{ => subset}/adjective/adjective.test.js (96%) rename test/unit/{ => subset}/adverb/adverb.test.js (98%) rename test/unit/{result => subset}/allSubset.test.js (100%) rename test/unit/{ => subset}/contractions/basic.test.js (98%) rename test/unit/{ => subset}/contractions/contractions.test.js (98%) rename test/unit/{ => subset}/date/basic_date.ignore.js (96%) rename test/unit/{ => subset}/date/date_tag.test.js (99%) rename test/unit/{date/misc.test.js => subset/date/misc_date.test.js} (97%) rename test/unit/{ => subset}/noun/article.test.js (83%) rename test/unit/{ => subset}/noun/inflect.test.js (98%) create mode 100644 test/unit/subset/noun/pronoun.test.js rename test/unit/{ => subset}/person/person.test.js (99%) rename test/unit/{ => subset}/sentence/conditions.ignore.js (81%) rename test/unit/{ => subset}/sentence/inflect.ignore.js (93%) rename test/unit/{ => subset}/sentence/question.ignore.js (86%) rename test/unit/{ => subset}/sentence/quotation.ignore.js (85%) rename test/unit/{ => subset}/sentence/tense.ignore.js (95%) rename test/unit/{ => subset}/sentence/toNegative.test.js (97%) rename test/unit/{ => subset}/sentence/tokenize.test.js (94%) rename test/unit/{ => subset}/sentence/whitespace.test.js (96%) rename test/unit/{result => subset}/subset.test.js (100%) rename test/unit/{result => subset/topics}/things.test.js (91%) rename test/unit/{result => subset/topics}/topics.ignore.js (80%) rename test/unit/{ => subset}/value/money.test.js (97%) rename test/unit/{ => subset}/value/toNumber.test.js (98%) rename test/unit/{ => subset}/value/toText.test.js (92%) rename test/unit/{ => subset}/value/value.test.js (96%) rename test/unit/{ => subset}/verb/conjugate.test.js (99%) rename test/unit/{ => subset}/verb/parts.test.js (99%) rename test/unit/{ => subset}/verb/phrasal.test.js (94%) rename test/unit/{ => subset}/verb/toNegative.ignore.js (97%) rename test/unit/{ => subset}/verb/to_adjective.test.js (90%) rename test/unit/{result => transform}/case.test.js (100%) rename test/unit/{result => transform}/normalize.test.js (100%) rename test/unit/{result => transform}/result_fns.test.js (100%) rename test/unit/{result => transform}/split.test.js (93%) rename test/unit/{result => transform}/whitespace.test.js (100%) rename test/unit/{result => transform}/wordcount.ignore.js (79%) diff --git a/.esformatter b/.esformatter index 01fb46b51..a53a9ecb8 100644 --- a/.esformatter +++ b/.esformatter @@ -1,7 +1,6 @@ { "plugins": [ "esformatter-quotes", - "esformatter-parseint", "esformatter-braces", "esformatter-semicolons" ], @@ -31,4 +30,4 @@ "EndOfFile": 1 } } -} \ No newline at end of file +} diff --git a/scratch_file.js b/scratch_file.js index b30d60ae2..46c85eb32 100644 --- a/scratch_file.js +++ b/scratch_file.js @@ -10,8 +10,9 @@ const nlp = require('./src/index'); //bug 2. - gerund as nouns // nlp('i like running').sentences().toNegative().check(); - -console.log('------'); var m = nlp('he ate the alligator'); -// m.insertAt(2, 'fun'); -console.log(m.verbs().toPastTense().data()); +var neg = m.clone().sentences().toNegative(); +var past = m.clone().sentences().toPastTense(); +var pres = m.clone().sentences().toPresentTense(); +var adv = m.clone().verbs().insertBefore('really'); +console.log(m.out()); diff --git a/scripts/test.js b/scripts/test.js index 108410a79..51eed2679 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -3,7 +3,7 @@ var tape = './node_modules/tape/bin/tape'; var tapSpec = './node_modules/tap-spec/bin/cmd.js --color'; //run tests server-side -exec(tape + ' ./test/unit/**/*.test.js | ' + tapSpec); +exec(tape + ' \'./test/unit/**/*.test.js\' | ' + tapSpec); //do code-coverage too // var nyc = './node_modules/nyc/bin/nyc.js'; diff --git a/src/result/index.js b/src/result/index.js index 5a2a51eee..af6289152 100644 --- a/src/result/index.js +++ b/src/result/index.js @@ -1,5 +1,4 @@ 'use strict'; -const out = require('./methods/out'); //a Text is an array of termLists class Text { constructor(arr, lexicon, reference) { @@ -42,9 +41,6 @@ class Text { check(opts) { return out(this, 'check', opts); } - out(msg, opts) { - return out(this, msg, opts); - } get whitespace() { return { before: (str) => { @@ -66,6 +62,7 @@ class Text { module.exports = Text; Text = require('./methods/loops')(Text); Text = require('./methods/array')(Text); +Text = require('./methods/out')(Text); Text = require('./methods/termFns')(Text); Text = require('./methods/tag')(Text); Text = require('./methods/sort')(Text); diff --git a/src/result/methods/loops.js b/src/result/methods/loops.js index 06741044b..b165ebf94 100644 --- a/src/result/methods/loops.js +++ b/src/result/methods/loops.js @@ -17,6 +17,9 @@ let foreach = [ 'replaceWith', 'delete', + +// 'tag', +// 'unTag', ]; const addMethods = (Text) => { diff --git a/src/result/methods/out/index.js b/src/result/methods/out/index.js index fdd9196e8..3116fce7b 100644 --- a/src/result/methods/out/index.js +++ b/src/result/methods/out/index.js @@ -3,7 +3,7 @@ const ngram = require('./ngram'); const edgegram = require('./edgegram'); const topk = require('./topk'); -const render = { +const methods = { text: (r) => { return r.list.reduce((str, ts) => { str += ts.out('text'); @@ -45,7 +45,7 @@ const render = { html: (r) => { let html = r.list.reduce((str, ts) => { let sentence = ts.terms.reduce((sen, t) => { - sen += '\n ' + t.render.html(); + sen += '\n ' + t.methods.html(); return sen; }, ''); return str += '\n ' + sentence + '\n '; @@ -77,38 +77,45 @@ const render = { return topk(r); } }; -render.plaintext = render.text; -render.normalized = render.normal; -render.debug = render.check; -render.freq = render.topk; -render.frequency = render.topk; +methods.plaintext = methods.text; +methods.normalized = methods.normal; +methods.debug = methods.check; +methods.freq = methods.topk; +methods.frequency = methods.topk; -//render/output fns -const out = (r, fn, opts) => { - if (render[fn]) { - return render[fn](r); - } - if (fn === 'bigram') { - opts = opts || { - size: [2] - }; - return ngram(r, opts); - } - if (fn === 'trigram') { - opts = opts || { - size: [3] - }; - return ngram(r, opts); - } - if (fn === 'edgegram') { - return edgegram.both(r, opts); - } - if (fn === 'startgram') { - return edgegram.start(r, opts); - } - if (fn === 'endgram') { - return edgegram.end(r, opts); - } - return render.text(r); +const addMethods = (Text) => { + Text.prototype.check = function() { + return methods.check(this); + }; + Text.prototype.out = function(fn, opts) { + if (methods[fn]) { + return methods[fn](this); + } + if (fn === 'bigram') { + opts = opts || { + size: [2] + }; + return ngram(this, opts); + } + if (fn === 'trigram') { + opts = opts || { + size: [3] + }; + return ngram(this, opts); + } + if (fn === 'edgegram') { + return edgegram.both(this, opts); + } + if (fn === 'startgram') { + return edgegram.start(this, opts); + } + if (fn === 'endgram') { + return edgegram.end(this, opts); + } + return methods.text(this); + }; + return Text; }; -module.exports = out; + + +module.exports = addMethods; diff --git a/src/result/subset/people/index.js b/src/result/subset/people/index.js index 738cb7781..b3017a1f3 100644 --- a/src/result/subset/people/index.js +++ b/src/result/subset/people/index.js @@ -7,6 +7,9 @@ class People extends Text { data() { return this.list.map((ts) => ts.data()); } + pronoun() { + return this.list.map((ts) => ts.pronoun()); + } static find(r, n) { let people = r.clauses(); people = people.match('#Person+'); diff --git a/src/result/subset/people/person.js b/src/result/subset/people/person.js index 6ec0394f3..35709ebda 100644 --- a/src/result/subset/people/person.js +++ b/src/result/subset/people/person.js @@ -12,6 +12,7 @@ class Person extends Terms { middleName: this.middleName.out('normal'), lastName: this.lastName.out('normal'), genderGuess: this.guessGender(), + pronoun: this.pronoun(), honorifics: this.honorifics.out('array') }; } @@ -53,6 +54,16 @@ class Person extends Terms { //look-for regex clues return guessGender(this.firstName.out('normal')); } + pronoun() { + let g = this.guessGender(); + if (g === 'Male') { + return 'he'; + } + if (g === 'Female') { + return 'she'; + } + return 'they'; + } root() { let first = this.firstName.out('root'); let last = this.lastName.out('root'); diff --git a/src/terms/methods/out.js b/src/terms/methods/out.js index 2144f48b9..e0ca5b9a5 100644 --- a/src/terms/methods/out.js +++ b/src/terms/methods/out.js @@ -25,6 +25,11 @@ const methods = { html: function (ts) { return ts.terms.map((t) => t.render.html()).join(' '); + }, + check: function(ts) { + ts.terms.forEach((t) => { + t.out('check'); + }); } }; methods.plaintext = methods.text; @@ -42,9 +47,7 @@ const renderMethods = (Terms) => { }; //check method Terms.prototype.check = function () { - this.terms.forEach((t) => { - t.render.check(); - }); + return methods.check(this); }; return Terms; }; diff --git a/test/leak/index.html b/test/leak/index.html deleted file mode 100644 index c0cb50403..000000000 --- a/test/leak/index.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - 
-    mem-leak test of compromise
-
- - - - diff --git a/test/unit/lexicon/tricky.test.js b/test/unit/lexicon/tricky.test.js index 740eb077a..b8db01a49 100644 --- a/test/unit/lexicon/tricky.test.js +++ b/test/unit/lexicon/tricky.test.js @@ -1,17 +1,11 @@ var test = require('tape'); var nlp = require('../lib/nlp'); - - var lexicon = { 'Jardas al Abid': 'Place', 'Umm Ar Rizam': 'Place', 'Tobruk': 'Place' }; -// var sentence = 'A suicide attack hit the centre of Tobruk killing one person (and the attacker) and injuring more than twenty.'; -// var found = nlp(sentence).places().data()[0]; -// console.log('Problem#1. Test to find locality in English without lexicon.'); -// t.equal('Tobruk', found); test('find locality which has hyphenation:', function (t) { sentence = 'A suicide attack hit the centre of Jardas-al-Abid killing one person (and the attacker) and injuring more than twenty.'; diff --git a/test/unit/result/if.test.js b/test/unit/match/if.test.js similarity index 100% rename from test/unit/result/if.test.js rename to test/unit/match/if.test.js diff --git a/test/unit/result/pluck.ignore.js b/test/unit/match/pluck.ignore.js similarity index 99% rename from test/unit/result/pluck.ignore.js rename to test/unit/match/pluck.ignore.js index 5b9aa5485..bae71715f 100644 --- a/test/unit/result/pluck.ignore.js +++ b/test/unit/match/pluck.ignore.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); var terms_test = (r, arr, t) => { var have = r.out('array').join(' - '); arr = arr.join(' - '); diff --git a/test/unit/result/misc.test.js b/test/unit/misc.test.js similarity index 96% rename from test/unit/result/misc.test.js rename to test/unit/misc.test.js index 53907a585..2b88a69f6 100644 --- a/test/unit/result/misc.test.js +++ b/test/unit/misc.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('./lib/nlp'); var garbage = [ '', diff --git a/test/unit/noun/pronoun.ignore.js b/test/unit/noun/pronoun.ignore.js deleted file mode 100644 index a333c5c77..000000000 --- a/test/unit/noun/pronoun.ignore.js +++ /dev/null @@ -1,27 +0,0 @@ -var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; - -test('pronoun:', function(t) { - [ - ['John', 'he'], - ['John Smith', 'he'], - ['Jane', 'she'], - ['turtle', 'it'], - ['turtles', 'they'], - ['Toronto', 'it'], - ['studying', 'it'], - ['horses', 'they'], - ['road bikes', 'they'], - ['NHL goaltenders', 'they'], - ['Tony Danza', 'he'], - ['Tanya Danza', 'she'], - ['Mrs. Tanya Danza', 'she'], - ['John G. Fishermore Institute', 'it'], - ['John Fisher & sons', 'it'], - ].forEach(function (a) { - var str = nlp(a[0]).people().data()[0].pronoun; - str_test(str, a[0], a[1], t); - }); - t.end(); -}); diff --git a/test/unit/result/edgegram.test.js b/test/unit/out/edgegram.test.js similarity index 100% rename from test/unit/result/edgegram.test.js rename to test/unit/out/edgegram.test.js diff --git a/test/unit/result/sort.test.js b/test/unit/out/sort.test.js similarity index 100% rename from test/unit/result/sort.test.js rename to test/unit/out/sort.test.js diff --git a/test/unit/adjective/adjective.test.js b/test/unit/subset/adjective/adjective.test.js similarity index 96% rename from test/unit/adjective/adjective.test.js rename to test/unit/subset/adjective/adjective.test.js index faffdf26a..a18192676 100644 --- a/test/unit/adjective/adjective.test.js +++ b/test/unit/subset/adjective/adjective.test.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('==Adjective==', function (T) { diff --git a/test/unit/adverb/adverb.test.js b/test/unit/subset/adverb/adverb.test.js similarity index 98% rename from test/unit/adverb/adverb.test.js rename to test/unit/subset/adverb/adverb.test.js index 87349f5f2..133bc6774 100644 --- a/test/unit/adverb/adverb.test.js +++ b/test/unit/subset/adverb/adverb.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('==Adverb==', function (T) { diff --git a/test/unit/result/allSubset.test.js b/test/unit/subset/allSubset.test.js similarity index 100% rename from test/unit/result/allSubset.test.js rename to test/unit/subset/allSubset.test.js diff --git a/test/unit/contractions/basic.test.js b/test/unit/subset/contractions/basic.test.js similarity index 98% rename from test/unit/contractions/basic.test.js rename to test/unit/subset/contractions/basic.test.js index e507b216d..6e3b6e4c0 100644 --- a/test/unit/contractions/basic.test.js +++ b/test/unit/subset/contractions/basic.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('basic is contractions', function(t) { var r = nlp(`he is cool.`); diff --git a/test/unit/contractions/contractions.test.js b/test/unit/subset/contractions/contractions.test.js similarity index 98% rename from test/unit/contractions/contractions.test.js rename to test/unit/subset/contractions/contractions.test.js index fcdcc0931..5685e6a47 100644 --- a/test/unit/contractions/contractions.test.js +++ b/test/unit/subset/contractions/contractions.test.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('==contractions==', function(T) { diff --git a/test/unit/date/basic_date.ignore.js b/test/unit/subset/date/basic_date.ignore.js similarity index 96% rename from test/unit/date/basic_date.ignore.js rename to test/unit/subset/date/basic_date.ignore.js index ed660331b..2527df037 100644 --- a/test/unit/date/basic_date.ignore.js +++ b/test/unit/subset/date/basic_date.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('./lib/nlp'); -var str_test = require('./lib/fns').str_test; +var nlp = require('../..b/nlp'); +var str_test = require('../..b/fns').str_test; test('date-parse :', function(t) { diff --git a/test/unit/date/date_tag.test.js b/test/unit/subset/date/date_tag.test.js similarity index 99% rename from test/unit/date/date_tag.test.js rename to test/unit/subset/date/date_tag.test.js index 45547184a..c3294d71c 100644 --- a/test/unit/date/date_tag.test.js +++ b/test/unit/subset/date/date_tag.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); let file = ''; if (typeof __filename !== 'undefined') { diff --git a/test/unit/date/misc.test.js b/test/unit/subset/date/misc_date.test.js similarity index 97% rename from test/unit/date/misc.test.js rename to test/unit/subset/date/misc_date.test.js index e1d52a87c..ba3be75c9 100644 --- a/test/unit/date/misc.test.js +++ b/test/unit/subset/date/misc_date.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('one big dates', function (t) { diff --git a/test/unit/noun/article.test.js b/test/unit/subset/noun/article.test.js similarity index 83% rename from test/unit/noun/article.test.js rename to test/unit/subset/noun/article.test.js index 0c4829be4..63a88eff8 100644 --- a/test/unit/noun/article.test.js +++ b/test/unit/subset/noun/article.test.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('.article():', function(t) { [ diff --git a/test/unit/noun/inflect.test.js b/test/unit/subset/noun/inflect.test.js similarity index 98% rename from test/unit/noun/inflect.test.js rename to test/unit/subset/noun/inflect.test.js index 8800934b2..03b3a639c 100644 --- a/test/unit/noun/inflect.test.js +++ b/test/unit/subset/noun/inflect.test.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('==Plurals==', function(T) { diff --git a/test/unit/subset/noun/pronoun.test.js b/test/unit/subset/noun/pronoun.test.js new file mode 100644 index 000000000..a5260775a --- /dev/null +++ b/test/unit/subset/noun/pronoun.test.js @@ -0,0 +1,27 @@ +var test = require('tape'); +var nlp = require('../../lib/nlp'); + +test('pronoun:', function(t) { + [ + ['John', 'he'], + ['John Smith', 'he'], + ['Jane', 'she'], + // ['turtle', 'it'], + // ['turtles', 'they'], + // ['Toronto', 'it'], + // ['studying', 'it'], + // ['horses', 'they'], + // ['road bikes', 'they'], + // ['NHL goaltenders', 'they'], + ['Tony Danza', 'he'], + ['Tanya Danza', 'she'], + ['Mrs. Tanya Danza', 'she'], + // ['John G. Fishermore Institute', 'it'], + // ['John Fisher & sons', 'it'], + ].forEach(function (a) { + var str = nlp(a[0]).people().pronoun()[0]; + var msg = a[0] + ' -> ' + str; + t.equal(str, a[1], msg); + }); + t.end(); +}); diff --git a/test/unit/person/person.test.js b/test/unit/subset/person/person.test.js similarity index 99% rename from test/unit/person/person.test.js rename to test/unit/subset/person/person.test.js index d0391cb62..34da4576a 100644 --- a/test/unit/person/person.test.js +++ b/test/unit/subset/person/person.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); //list of famous names taken from https://gate.ac.uk/gate/plugins/ANNIE/resources/gazetteer/ var tests = { 'john stewart': 'Male', diff --git a/test/unit/sentence/conditions.ignore.js b/test/unit/subset/sentence/conditions.ignore.js similarity index 81% rename from test/unit/sentence/conditions.ignore.js rename to test/unit/subset/sentence/conditions.ignore.js index 7c5493cd5..399bc0c49 100644 --- a/test/unit/sentence/conditions.ignore.js +++ b/test/unit/subset/sentence/conditions.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('conditions:', function (t) { diff --git a/test/unit/sentence/inflect.ignore.js b/test/unit/subset/sentence/inflect.ignore.js similarity index 93% rename from test/unit/sentence/inflect.ignore.js rename to test/unit/subset/sentence/inflect.ignore.js index e5f8f7deb..f4dea0368 100644 --- a/test/unit/sentence/inflect.ignore.js +++ b/test/unit/subset/sentence/inflect.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('toPlural():', function(t) { [ diff --git a/test/unit/sentence/question.ignore.js b/test/unit/subset/sentence/question.ignore.js similarity index 86% rename from test/unit/sentence/question.ignore.js rename to test/unit/subset/sentence/question.ignore.js index f9d88caad..ede4ad036 100644 --- a/test/unit/sentence/question.ignore.js +++ b/test/unit/subset/sentence/question.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('question-test :', function(t) { [ diff --git a/test/unit/sentence/quotation.ignore.js b/test/unit/subset/sentence/quotation.ignore.js similarity index 85% rename from test/unit/sentence/quotation.ignore.js rename to test/unit/subset/sentence/quotation.ignore.js index 42cd1cbb8..71f5e179d 100644 --- a/test/unit/sentence/quotation.ignore.js +++ b/test/unit/subset/sentence/quotation.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('quotation test:', function(t) { [ diff --git a/test/unit/sentence/tense.ignore.js b/test/unit/subset/sentence/tense.ignore.js similarity index 95% rename from test/unit/sentence/tense.ignore.js rename to test/unit/subset/sentence/tense.ignore.js index 3805ed3aa..ee7cd6f39 100644 --- a/test/unit/sentence/tense.ignore.js +++ b/test/unit/subset/sentence/tense.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('./lib/nlp'); -var str_test = require('./lib/fns').str_test; +var nlp = require('../..b/nlp'); +var str_test = require('../..b/fns').str_test; test('sentence-change-tense:', function(t) { [ diff --git a/test/unit/sentence/toNegative.test.js b/test/unit/subset/sentence/toNegative.test.js similarity index 97% rename from test/unit/sentence/toNegative.test.js rename to test/unit/subset/sentence/toNegative.test.js index 75dbf8b64..eeb3ad78e 100644 --- a/test/unit/sentence/toNegative.test.js +++ b/test/unit/subset/sentence/toNegative.test.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; // console.log(nlp('has played').sentences().toNegative().all().out()); // console.log(nlp('he has played').sentences().toNegative().out()); // console.log(nlp('is playing').sentences().toNegative().out()); diff --git a/test/unit/sentence/tokenize.test.js b/test/unit/subset/sentence/tokenize.test.js similarity index 94% rename from test/unit/sentence/tokenize.test.js rename to test/unit/subset/sentence/tokenize.test.js index 94da94993..d32fbbcba 100644 --- a/test/unit/sentence/tokenize.test.js +++ b/test/unit/subset/sentence/tokenize.test.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('sentence tokenize:', function(t) { [ diff --git a/test/unit/sentence/whitespace.test.js b/test/unit/subset/sentence/whitespace.test.js similarity index 96% rename from test/unit/sentence/whitespace.test.js rename to test/unit/subset/sentence/whitespace.test.js index 17769ffa8..d1718bd2f 100644 --- a/test/unit/sentence/whitespace.test.js +++ b/test/unit/subset/sentence/whitespace.test.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('=Whitespace=', function(T) { diff --git a/test/unit/result/subset.test.js b/test/unit/subset/subset.test.js similarity index 100% rename from test/unit/result/subset.test.js rename to test/unit/subset/subset.test.js diff --git a/test/unit/result/things.test.js b/test/unit/subset/topics/things.test.js similarity index 91% rename from test/unit/result/things.test.js rename to test/unit/subset/topics/things.test.js index 97a671a6a..0b6b23122 100644 --- a/test/unit/result/things.test.js +++ b/test/unit/subset/topics/things.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('topics concat:', function (t) { var things = nlp('spencer and danny are in Paris France, and germany for Google Inc and IBM').topics().out('array'); diff --git a/test/unit/result/topics.ignore.js b/test/unit/subset/topics/topics.ignore.js similarity index 80% rename from test/unit/result/topics.ignore.js rename to test/unit/subset/topics/topics.ignore.js index 008d4a700..676774816 100644 --- a/test/unit/result/topics.ignore.js +++ b/test/unit/subset/topics/topics.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('./lib/nlp'); -var str_test = require('./lib/fns').str_test; +var nlp = require('../lib/nlp'); +var str_test = require('../lib/fns').str_test; test('topics:', function(t) { [ @@ -10,7 +10,7 @@ test('topics:', function(t) { ['The Elkjsdflkjsdf sells hamburgers. I think the Elkjsdflkjsdf eats turky.', 'elkjsdflkjsdf'], ['Toronto\'s citizens love toronto!', 'toronto'], ].forEach(function (a) { - var str = nlp.text(a[0]).topics()[0].text; + var str = nlp(a[0]).topics().out('normal'); str_test(str, a[0], a[1], t); }); t.end(); diff --git a/test/unit/value/money.test.js b/test/unit/subset/value/money.test.js similarity index 97% rename from test/unit/value/money.test.js rename to test/unit/subset/value/money.test.js index b9ec42422..e92ccdb9c 100644 --- a/test/unit/value/money.test.js +++ b/test/unit/subset/value/money.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('money-basic:', function (t) { var r = nlp('it is $70.23'); diff --git a/test/unit/value/toNumber.test.js b/test/unit/subset/value/toNumber.test.js similarity index 98% rename from test/unit/value/toNumber.test.js rename to test/unit/subset/value/toNumber.test.js index 050467f0d..61ae0b4de 100644 --- a/test/unit/value/toNumber.test.js +++ b/test/unit/subset/value/toNumber.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('to_number:', function (t) { [ diff --git a/test/unit/value/toText.test.js b/test/unit/subset/value/toText.test.js similarity index 92% rename from test/unit/value/toText.test.js rename to test/unit/subset/value/toText.test.js index 6f183b7a4..a423e37ba 100644 --- a/test/unit/value/toText.test.js +++ b/test/unit/subset/value/toText.test.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('to_text:', function (t) { [ diff --git a/test/unit/value/value.test.js b/test/unit/subset/value/value.test.js similarity index 96% rename from test/unit/value/value.test.js rename to test/unit/subset/value/value.test.js index e1d8cf1b1..3bb1e9d3a 100644 --- a/test/unit/value/value.test.js +++ b/test/unit/subset/value/value.test.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); -var str_test = require('../lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('==Value==', function (T) { diff --git a/test/unit/verb/conjugate.test.js b/test/unit/subset/verb/conjugate.test.js similarity index 99% rename from test/unit/verb/conjugate.test.js rename to test/unit/subset/verb/conjugate.test.js index b34d87913..812499d50 100644 --- a/test/unit/verb/conjugate.test.js +++ b/test/unit/subset/verb/conjugate.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); var arr = [ { diff --git a/test/unit/verb/parts.test.js b/test/unit/subset/verb/parts.test.js similarity index 99% rename from test/unit/verb/parts.test.js rename to test/unit/subset/verb/parts.test.js index 8aab48e14..b823c3b90 100644 --- a/test/unit/verb/parts.test.js +++ b/test/unit/subset/verb/parts.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('verb-parts:', function(t) { var tests = [ diff --git a/test/unit/verb/phrasal.test.js b/test/unit/subset/verb/phrasal.test.js similarity index 94% rename from test/unit/verb/phrasal.test.js rename to test/unit/subset/verb/phrasal.test.js index e973b3567..5bcebb3b1 100644 --- a/test/unit/verb/phrasal.test.js +++ b/test/unit/subset/verb/phrasal.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('phrasal-verbs:', function(t) { [ diff --git a/test/unit/verb/toNegative.ignore.js b/test/unit/subset/verb/toNegative.ignore.js similarity index 97% rename from test/unit/verb/toNegative.ignore.js rename to test/unit/subset/verb/toNegative.ignore.js index b495c7a1f..aa19ef83f 100644 --- a/test/unit/verb/toNegative.ignore.js +++ b/test/unit/subset/verb/toNegative.ignore.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('verb-to-negative:', function(t) { [ diff --git a/test/unit/verb/to_adjective.test.js b/test/unit/subset/verb/to_adjective.test.js similarity index 90% rename from test/unit/verb/to_adjective.test.js rename to test/unit/subset/verb/to_adjective.test.js index 3c48fe875..40a5c2c0f 100644 --- a/test/unit/verb/to_adjective.test.js +++ b/test/unit/subset/verb/to_adjective.test.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('../lib/nlp'); +var nlp = require('../../lib/nlp'); test('verb-to-adjective:', function(t) { [ diff --git a/test/unit/tagger/single-word.ignore.js b/test/unit/tagger/single-word.ignore.js index 0bc22eaf4..a9dfadb80 100644 --- a/test/unit/tagger/single-word.ignore.js +++ b/test/unit/tagger/single-word.ignore.js @@ -1,5 +1,5 @@ var test = require('tape'); -var nlp = require('./lib/nlp'); +var nlp = require('../..b/nlp'); diff --git a/test/unit/tagger/tag_perfect.ignore.js b/test/unit/tagger/tag_perfect.ignore.js index d722d9565..e4b189f22 100644 --- a/test/unit/tagger/tag_perfect.ignore.js +++ b/test/unit/tagger/tag_perfect.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('./lib/nlp'); -var pos_test = require('./lib/fns').pos_test; +var nlp = require('../..b/nlp'); +var pos_test = require('../..b/fns').pos_test; test('=Tagger=', function(T) { diff --git a/test/unit/term/term_negate.ignore.js b/test/unit/term/term_negate.ignore.js index aa4820f6b..a2a03894c 100644 --- a/test/unit/term/term_negate.ignore.js +++ b/test/unit/term/term_negate.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('./lib/nlp'); -var str_test = require('./lib/fns').str_test; +var nlp = require('../..b/nlp'); +var str_test = require('../..b/fns').str_test; test('term negate:', function(t) { diff --git a/test/unit/result/case.test.js b/test/unit/transform/case.test.js similarity index 100% rename from test/unit/result/case.test.js rename to test/unit/transform/case.test.js diff --git a/test/unit/result/normalize.test.js b/test/unit/transform/normalize.test.js similarity index 100% rename from test/unit/result/normalize.test.js rename to test/unit/transform/normalize.test.js diff --git a/test/unit/result/result_fns.test.js b/test/unit/transform/result_fns.test.js similarity index 100% rename from test/unit/result/result_fns.test.js rename to test/unit/transform/result_fns.test.js diff --git a/test/unit/result/split.test.js b/test/unit/transform/split.test.js similarity index 93% rename from test/unit/result/split.test.js rename to test/unit/transform/split.test.js index d77da3dbc..8a5e90b6c 100644 --- a/test/unit/result/split.test.js +++ b/test/unit/transform/split.test.js @@ -21,7 +21,7 @@ test('splitAfter', function (t) { ['doug is really nice', 'is', ['doug is', 'really nice']], ].forEach(function (a) { var want = a[2]; - var got = nlp(a[0]).splitAfter(a[1]).out('array') + var got = nlp(a[0]).splitAfter(a[1]).out('array'); arr_test(got, a[0], want, t); }); t.end(); @@ -42,7 +42,7 @@ test('splitBefore', function (t) { ['a x b x', 'x', ['a', 'x b', 'x']], ].forEach(function (a) { var want = a[2]; - var got = nlp(a[0]).splitBefore(a[1]).out('array') + var got = nlp(a[0]).splitBefore(a[1]).out('array'); arr_test(got, a[0], want, t); }); t.end(); @@ -63,7 +63,7 @@ test('splitOn', function (t) { ['a x b x', 'x', ['a', 'b']], ].forEach(function (a) { var want = a[2]; - var got = nlp(a[0]).splitOn(a[1]).out('array') + var got = nlp(a[0]).splitOn(a[1]).out('array'); arr_test(got, a[0], want, t); }); t.end(); diff --git a/test/unit/result/whitespace.test.js b/test/unit/transform/whitespace.test.js similarity index 100% rename from test/unit/result/whitespace.test.js rename to test/unit/transform/whitespace.test.js diff --git a/test/unit/result/wordcount.ignore.js b/test/unit/transform/wordcount.ignore.js similarity index 79% rename from test/unit/result/wordcount.ignore.js rename to test/unit/transform/wordcount.ignore.js index 7844973c8..8c33763b0 100644 --- a/test/unit/result/wordcount.ignore.js +++ b/test/unit/transform/wordcount.ignore.js @@ -1,6 +1,6 @@ var test = require('tape'); -var nlp = require('./lib/nlp'); -var str_test = require('./lib/fns').str_test; +var nlp = require('../../lib/nlp'); +var str_test = require('../../lib/fns').str_test; test('==WordCount==', function(t) { [ @@ -14,7 +14,7 @@ test('==WordCount==', function(t) { ['Bill Clinton went walking', 3], ['Bill Clinton will go walking', 3], ].forEach(function (a) { - var num = nlp(a[0]).wordCount(); + var num = nlp(a[0]).terms().length; str_test(num, a[0], a[1], t); }); t.end();