extract test/utils into seperate functions, change test-runner to tape

Author: mixmix

memory.js

@@ -1,10 +1,11 @@
 var pull = require('pull-stream')
 var Filter = require('./filter')
 
-module.exports =  function createMemoryIndex (log, name) {
+module.exports = function createMemoryIndex (log, name) {
   function fullScan (log, opts) {
     return log.stream({
-      values: true, seqs: false,
+      values: true,
+      seqs: false,
       //TODO test coverage for live/old - the tests arn't right for live when the log starts as empty
       old: (opts.old !== false),
       live: (opts.live === true || opts.old === false),
@@ -13,7 +14,7 @@ module.exports =  function createMemoryIndex (log, name) {
   }
 
   console.error('flumeview-query:', name, 'in memory log or no indexes defined, will always use full scan, queries will likely be slow')
- return {
+  return {
     since: log.since,
     get: log.get,
     methods: { get: 'async', read: 'source' },

package-lock.json

@@ -8,7 +8,7 @@
     "url": "git://github.com/flumedb/flumeview-query.git"
   },
   "scripts": {
-    "test": "for t in test/*.js; do node $t; done",
+    "test": "tape test/*.js",
     "test:pretty": "npm test | tap-spec",
     "test:classic": "set -e; for t in test/*.js; do node $t; done"
   },

package.json

@@ -1,97 +1,4 @@
+const test = require('./util/exact')
+require('./util/setup')('test-flumeview-query_exact', test)
 
-var tape = require('tape')
-var pull = require('pull-stream')
-var timestamp = require('monotonic-timestamp')
-var Query = require('../')
-
-function all (stream, cb) {
-  pull(stream, pull.collect(cb))
-}
-
-var indexes = [
-  { key: 'S', value: ['okay', 'timestamp'] },
-]
-
-var raw = []
-
-
-module.exports = function (append, read, ready) { 
-
-  tape('simple', function (t) {
-//    var seekPath = path.join(osenv.tmpdir(), 'test_stream-view_seek')
-//    rimraf.sync(seekPath)
-
-//    var db = Flume(FlumeLog(path.join(seekPath, 'log.offset'), 1024, codec.json))
-//              .use('query', Query(1, {indexes:indexes}))
-//
-//    var query = db.query
-//
-    t.test('init', function (t) {
-      ready(t.end)
-//      query.since.once(function (v) {
-//        t.equal(v, -1)
-//        t.end()
-//
-//      })
-    })
-
-    var live = []
-
-    pull(
-      read({query: [{
-        $filter: {count: {$gt: 20}}
-      }], limit: 10}),
-      pull.drain(function (e) {
-        live.push(e)
-      })
-    )
-    var data = []
-    for(var i = 0;i < 100;i ++)
-      data.push({
-        count: i, random: Math.random(), timestamp: timestamp(), okay: true
-      })
-
-    t.test('load', function (t) {
-      append(data, function (err) {
-        if(err) throw err
-        t.end()
-      })
-    })
-
-    function seek(limit, gte) {
-      return read({query: [{
-        $filter: { count: {$gte: gte}, okay:true}
-      }], limit: limit})
-    }
-
-    t.test('query, seek', function (t) {
-      all(seek(10, 10), function (err, ary) {
-        if(err) throw err
-        console.log(ary)
-        t.equal(ary.length, 10, 'LIMIT')
-        ary.forEach(function (e, i) {
-          t.equal(e.count, i+ 10)
-        })
-
-        all(seek(10, 20), function (err, ary) {
-          if(err) throw err
-          console.log(ary)
-          t.equal(ary.length, 10, 'LIMIT')
-          ary.forEach(function (e, i) {
-            t.equal(e.count, i+ 20)
-          })
-          t.end()
-        })
-      })
-    })
-
-  })
-}
-
-module.exports.indexes = indexes
-
-if(!module.parent) {
-  require('./setup')('test-flumeview-query_exact', module.exports)
-}
-
-//require('./setup')('test-kappaview-query_exact', require('flumeview-query/test/exact'))
+// require('./util/setup')('test-kappaview-query_exact', require('flumeview-query/test/exact'))

test/exact.js

@@ -1 +1 @@
-require('./setup')('memory', require('./scan'), true)
+require('./util/setup')('memory', require('./util/scan'), true)

test/memory.js

@@ -1,102 +1,2 @@
-
-var pull = require('pull-stream')
-var tape = require('tape')
-
-//var osenv = require('osenv')
-//var path = require('path')
-//var Flume = require('flumedb')
-//var FlumeLog = require('flumelog-offset')
-//var Query = require('../')
-//var rimraf = require('rimraf')
-
-//var codec = require('level-codec/lib/encodings')
-
-function all (stream, cb) {
-  pull(stream, pull.collect(cb))
-}
-
-var indexes = [
-  { key: 'on', value: [['value', 'nest', 'okay'], ['value', 'nest', 'number']] },
-  { key: 'no', value: [['value', 'nest', 'number'], ['value', 'nest', 'okay']] }
-]
-
-var data = [
-  {key: 'foo', value: {nest: {okay: true, number: 1}}},
-  {key: 'bar', value: {nest: {okay: false, number: 2}}}
-]
-
-module.exports = function (append, read, ready) {
-
-  tape('nested-links', function (t) {
-//    var linksPath = path.join(osenv.tmpdir(), 'test_stream-view_links')
-//    rimraf.sync(linksPath)
-//
-//    var db = Flume(FlumeLog(path.join(linksPath, 'log.offset'), 1024, codec.json))
-//              .use('links', Query(1, {indexes:indexes}))
-//
-//    var links = db.links
-    var live = []
-    pull(read({
-      query: [{$filter: {value: {nest: {number: {$gt: 0}}} }}], live: true, sync: false
-    }), pull.drain(live.push.bind(live)))
-
-    t.test('init', function (t) {
-      ready(t.end)
-//      links.since.once(function (v) {
-//        t.equal(v, -1)
-//        t.end()
-//
-//      })
-    })
-
-    t.test('load', function (t) {
-      append(data, function (err) {
-        if(err) throw err
-        t.end()
-      })
-    })
-
-    t.test('dump', function (t) {
-      all(read(), function (err, ary) {
-        console.log('DUMP', ary)
-        t.deepEqual(ary, data)
-        t.end()
-      })
-    })
-
-    t.test('query', function (t) {
-      all(read({query: [{$filter:
-        {value: {nest: {number: {$gte: 0, $lte:3}}}}
-      }, {$map: 'value'}]}), function (err, ary) {
-        if(err) throw err
-        console.log(ary)
-        t.deepEqual(ary, data.map(function (e) { return e.value }))
-        t.end()
-      })
-    })
-
-
-    t.test('exact', function (t) {
-      all(read({query: [{$filter:
-        {value: {nest: {number: 1}}}
-      }]}), function (err, ary) {
-        if(err) throw err
-        console.log(ary)
-        t.deepEqual(ary, [data[0]])
-        t.end()
-      })
-    })
-
-    t.test('live', function (t) {
-      t.deepEqual(live, data)
-      t.end()
-    })
-
-  })
-}
-
-module.exports.indexes = indexes
-
-if(!module.parent) {
-  require('./setup')('test-flumeview-query_nested', module.exports)
-}
+const test = require('./util/nested-links')
+require('./util/setup')('test-flumeview-query_nested', test)

test/nested-links.js

@@ -1,7 +1,7 @@
 var tape = require('tape')
+var Q = require('map-filter-reduce/util')
 var select = require('../select')
 var query = require('../query')
-var Q = require('map-filter-reduce/util')
 
 var indexes = [
   {key: 'SDR', value: ['source', 'dest', 'rel']},

test/query.js

@@ -4,13 +4,13 @@ var path = require('path')
 var pull = require('pull-stream')
 var Flume = require('flumedb')
 var FlumeLog = require('flumelog-offset')
-var Query = require('../')
 var rimraf = require('rimraf')
 var timestamp = require('monotonic-timestamp')
 var MFR = require('map-filter-reduce')
-
 var codec = require('level-codec/lib/encodings')
 
+var Query = require('../')
+
 var indexes = [
   { key: 'i', value: ['index'] },
   { key: 'r', value: ['random'] },
@@ -23,20 +23,22 @@ var indexes = [
   { key: 'it', value: [['index'], ['timestamp']] },
 ]
 
-
 var dbPath = path.join(osenv.tmpdir(), 'test_stream-view_random')
 rimraf.sync(dbPath)
 
-var db = Flume(FlumeLog(path.join(dbPath, 'log.offset'), 1024, codec.json))
-          .use('queryRandom', Query(1, {indexes: indexes}))
+var log = FlumeLog(
+  path.join(dbPath, 'log.offset'),
+  { blockSize: 1024, codec: codec.json }
+)
+var db = Flume(log)
+  .use('query', Query(1, {indexes: indexes}))
 
-var query = db.queryRandom
+var query = db.query
 
 test('preinit', function (t) {
   query.since.once(function (v) {
     t.equal(v, -1)
     t.end()
-
   })
 })