Tape tests, complete conversion

test/unit.js

@@ -121,28 +121,19 @@ test("Matrix toBuffer Async", function(assert){
   })
 })
 
-/*
-
-
-    , "detectObject": {
-
-     topic : function(){
-        var cv = require('../lib/opencv')
-          , cb = this.callback
 
+test("detectObject", function(assert){
   cv.readImage("./examples/files/mona.png", function(err, im){
-          im.detectObject(cv.FACE_CASCADE, {}, cb)
-        })
-      }
-
-      , "finds face": function(err, faces){
-          assert.isNull(err);
-          assert.isArray(faces);
+    im.detectObject(cv.FACE_CASCADE, {}, function(err, faces){
+      assert.error(err)
+      assert.ok(faces)
       assert.equal(faces.length, 1)
-      }
-    }
+      assert.end()
+    })
+  })
+})
 
-    , ".absDiff and .countNonZero" : function(cv) {
+test(".absDiff and .countNonZero", function(assert){
   cv.readImage("./examples/files/mona.png", function(err, im) {
     cv.readImage("./examples/files/mona.png", function(err, im2){
       assert.ok(im);
@@ -153,11 +144,13 @@ test("Matrix toBuffer Async", function(assert){
 
       diff.convertGrayscale();
       assert.equal(diff.countNonZero(), 0);
+      assert.end()
     });
   });
-    }
+})
 
-    , ".bitwiseXor" : function(cv) {
+
+test(".bitwiseXor", function(assert){
   var mat1 = new cv.Matrix(1,1);
   mat1.set(0,0, 1);
 
@@ -168,113 +161,69 @@ test("Matrix toBuffer Async", function(assert){
   xored.bitwiseXor(mat1, mat2);
 
   assert.equal(xored.get(0,0), 0);
-    }
 
-  }
+  assert.end()
+})
 
 
-
-  , "Image" : {
-    topic : require('../lib/opencv')
-
-    , ".readImage from file": function(cv){
+test("Image read from file", function(assert){
   cv.readImage("./examples/files/mona.png", function(err, im){
     assert.ok(im);
     assert.equal(im.width(), 500);
     assert.equal(im.height(), 756)
     assert.equal(im.empty(), false)
+    assert.end()
+  })
 })
-    }
 
-    , ".readImage from buffer" : function(cv){
+
+test("read Image from buffer", function(assert){
   cv.readImage(fs.readFileSync('./examples/files/mona.png'), function(err, im){
     assert.ok(im);
     assert.equal(im.width(), 500);
     assert.equal(im.height(), 756)
     assert.equal(im.empty(), false)
+    assert.end()
+  })
 })
 
-    }
-
-  }
-
-
-  , "CascadeClassifier": {
-    topic : require('../lib/opencv')
-
-    , "constructor" : function(cv){
-      assert.ok(new cv.CascadeClassifier("./data/haarcascade_frontalface_alt.xml"))
-    }
-
-    , "face detection": {
-      topic : function(){
-        var cv = require('../lib/opencv')
-          , self = this
+test("Cascade Classifier", function(assert){
+  assert.ok(new cv.CascadeClassifier("./data/haarcascade_frontalface_alt.xml"), 'test constructor')
 
   cv.readImage("./examples/files/mona.png", function(err, im){
     cascade = new cv.CascadeClassifier("./data/haarcascade_frontalface_alt.xml");
-          cascade.detectMultiScale(im, self.callback)//, 1.1, 2, [30, 30]);
+    cascade.detectMultiScale(im, function(err, faces){//, 1.1, 2, [30, 30]);
+      assert.error(err);
+      assert.equal(typeof faces, typeof []);
+      assert.equal(faces.length, 1)
+      assert.end()
+    })
+  })
 })
 
-      }
 
-      , "finds face": function(err, faces){
-          assert.isNull(err);
-          assert.isArray(faces);
-          assert.equal(faces.length, 1)
-
-      }
-    }
-
-  }
-
-
-  , "ImageDataStream" : {
-    topic : require('../lib/opencv')
-
-    , "pipe" : {
-      topic : function(cv){
+test("ImageDataStream", function(assert){
   var s = new cv.ImageDataStream()
-          , self = this
   s.on('load', function(im){ 
     assert.ok(im)
     assert.equal(im.empty(), false);
-          self.callback()
+    assert.end()
   })
+
   fs.createReadStream('./examples/files/mona.png').pipe(s);
-      }
 
-      , "loaded" : function(im){
-        //assert.ok(im)
-        //assert.equal(im.empty(), false);
-      }
-    }
+})
 
-
-  }
-  , "ImageStream" :{
-    topic : require('../lib/opencv')
-    , "write" : {
-      topic: function(cv){
+test("ImageStream", function(assert){
   var s = new cv.ImageStream()
     , im = fs.readFileSync('./examples/files/mona.png')
-          , self = this;
 
-        s.on('data', function(m){
-          self.callback(null, m)
+  s.on('data', function(mat){
+    assert.deepEqual(mat.size(), [756,500])
+    assert.end()
   })
   s.write(im);
-      }
-      , "receives data" : function(mat){
-        assert.deepEqual(mat.size(), [756,500])
-      }
-    }
-
-  }
-  , "ObjectDetectionStream" :{
-    topic : require('../lib/opencv')
-  }
-*/
+})
 
 
 test("CamShift", function(assert){