Skip to content

Commit b591904

Browse files
author
gretacb
committed
add object tests, fix static issue and remove hello function collision
1 parent 8f899ef commit b591904

File tree

5 files changed

+119
-114
lines changed

5 files changed

+119
-114
lines changed

‎src/module.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ static void init(v8::Local<v8::Object> target) {
1717
// expose HelloObject class
1818
object_sync::HelloObject::Init(target);
1919

20-
// expose hello method from HelloObject class
21-
Nan::SetMethod(target, "hello", object_sync::HelloObject::hello);
22-
2320
// add more methods/classes below that youd like to use in node.js-world
2421
// then create a .cpp and .hpp file in /src for each new method
2522
}

‎src/object_sync/hello.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
namespace object_sync {
44

55
// If this function was not defined within a namespace, it would be in the global scope.
6-
NAN_METHOD(HelloObject::New) {
6+
NAN_METHOD(HelloObject::New) {}
77

8-
9-
}
8+
// Add constructor?
109

1110
// If this function was not defined within a namespace, it would be in the global scope.
1211
NAN_METHOD(HelloObject::hello) {

‎src/object_sync/hello.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ namespace object_sync {
1616

1717
// methods required for the constructor
1818
static NAN_METHOD(New);
19-
// static Nan::Persistent<v8::Function> &constructor();
19+
//static Nan::Persistent<v8::Function> &constructor();
2020

2121
// hello, custom sync method tied to module.cpp
2222
// method's logic lives in hello.cpp
23-
NAN_METHOD(hello);
23+
static NAN_METHOD(hello);
2424

2525
};
2626

‎test/hello_object.test.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
var test = require('tape');
2+
var module = require('../lib/index.js');
3+
4+
test('success: prints expected string', function(t) {
5+
var H = new module.HelloObject();
6+
var check = H.hello();
7+
t.equal(check, '...initialized an object...world', 'returned expected string');
8+
t.end();
9+
});

‎test/hello_world.test.js‎

Lines changed: 106 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,120 @@
1-
var test = require('tape');
2-
var module = require('../lib/index.js');
3-
var HW = new module.HelloWorld();
1+
// var test = require('tape');
2+
// var module = require('../lib/index.js');
3+
// var HW = new module.HelloWorld();
44

5-
test('HellowWorld error - throw exception during construction', function(t) {
6-
var never = '';
7-
try {
8-
var HWuhoh = new module.HelloWorld('uhoh');
9-
never = 'neverland';
10-
} catch (err) {
11-
t.ok(err, 'expected error');
12-
}
13-
t.equals(never, '', 'constructor definitely throws');
14-
t.end();
15-
});
5+
// test('HellowWorld error - throw exception during construction', function(t) {
6+
// var never = '';
7+
// try {
8+
// var HWuhoh = new module.HelloWorld('uhoh');
9+
// never = 'neverland';
10+
// } catch (err) {
11+
// t.ok(err, 'expected error');
12+
// }
13+
// t.equals(never, '', 'constructor definitely throws');
14+
// t.end();
15+
// });
1616

17-
test('HellowWorld error - throw type error during construction', function(t) {
18-
var never = '';
19-
try {
20-
var HWuhoh = new module.HelloWorld(24);
21-
never = 'neverland';
22-
} catch (err) {
23-
t.ok(err, 'expected error');
24-
t.equals(err.message, 'arg must be a string')
25-
}
26-
t.equals(never, '', 'constructor definitely throws');
27-
t.end();
28-
});
17+
// test('HellowWorld error - throw type error during construction', function(t) {
18+
// var never = '';
19+
// try {
20+
// var HWuhoh = new module.HelloWorld(24);
21+
// never = 'neverland';
22+
// } catch (err) {
23+
// t.ok(err, 'expected error');
24+
// t.equals(err.message, 'arg must be a string')
25+
// }
26+
// t.equals(never, '', 'constructor definitely throws');
27+
// t.end();
28+
// });
2929

30-
test('HellowWorld error - invalid constructor', function(t) {
31-
var never = '';
32-
try {
33-
var HWuhoh = module.HelloWorld();
34-
never = 'neverland';
35-
} catch (err) {
36-
t.ok(err, 'expected error');
37-
t.equals(err.message, "Cannot call constructor as function, you need to use 'new' keyword");
38-
}
39-
t.equals(never, '', 'constructor definitely throws');
40-
t.end();
41-
});
30+
// test('HellowWorld error - invalid constructor', function(t) {
31+
// var never = '';
32+
// try {
33+
// var HWuhoh = module.HelloWorld();
34+
// never = 'neverland';
35+
// } catch (err) {
36+
// t.ok(err, 'expected error');
37+
// t.equals(err.message, "Cannot call constructor as function, you need to use 'new' keyword");
38+
// }
39+
// t.equals(never, '', 'constructor definitely throws');
40+
// t.end();
41+
// });
4242

43-
test('HellowWorld success - valid constructor', function(t) {
44-
var never = '';
45-
try {
46-
var HWyay = new module.HelloWorld('hello');
47-
never = 'neverland';
48-
} catch (err) {
49-
if (err) throw err;
50-
}
51-
t.equals(never, 'neverland', 'constructor definitely succeeds');
52-
t.end();
53-
});
43+
// test('HellowWorld success - valid constructor', function(t) {
44+
// var never = '';
45+
// try {
46+
// var HWyay = new module.HelloWorld('hello');
47+
// never = 'neverland';
48+
// } catch (err) {
49+
// if (err) throw err;
50+
// }
51+
// t.equals(never, 'neverland', 'constructor definitely succeeds');
52+
// t.end();
53+
// });
5454

5555

56-
test('wave success', function(t) {
57-
var hello = HW.wave();
58-
t.equal(hello, 'howdy world', 'output of HelloWorld.wave');
59-
t.end();
60-
});
56+
// test('wave success', function(t) {
57+
// var hello = HW.wave();
58+
// t.equal(hello, 'howdy world', 'output of HelloWorld.wave');
59+
// t.end();
60+
// });
6161

62-
test('shout success', function(t) {
63-
HW.shout('rawr', {}, function(err, shout) {
64-
if (err) throw err;
65-
t.equal(shout, 'rawr!');
66-
t.end();
67-
});
68-
});
62+
// test('shout success', function(t) {
63+
// HW.shout('rawr', {}, function(err, shout) {
64+
// if (err) throw err;
65+
// t.equal(shout, 'rawr!');
66+
// t.end();
67+
// });
68+
// });
6969

70-
test('shout success - options.louder', function(t) {
71-
HW.shout('rawr', { louder: true }, function(err, shout) {
72-
if (err) throw err;
73-
t.equal(shout, 'rawr!!!!!');
74-
t.end();
75-
});
76-
});
70+
// test('shout success - options.louder', function(t) {
71+
// HW.shout('rawr', { louder: true }, function(err, shout) {
72+
// if (err) throw err;
73+
// t.equal(shout, 'rawr!!!!!');
74+
// t.end();
75+
// });
76+
// });
7777

7878

79-
test('shout error - not enough rawr', function(t) {
80-
HW.shout('tiny moo', { louder: true }, function(err, shout) {
81-
t.ok(err, 'expected error');
82-
t.ok(err.message.indexOf('rawr all the time') > -1, 'rawrs all the time are way nicer');
83-
t.end();
84-
});
85-
});
79+
// test('shout error - not enough rawr', function(t) {
80+
// HW.shout('tiny moo', { louder: true }, function(err, shout) {
81+
// t.ok(err, 'expected error');
82+
// t.ok(err.message.indexOf('rawr all the time') > -1, 'rawrs all the time are way nicer');
83+
// t.end();
84+
// });
85+
// });
8686

87-
test('shout error - non string phrase', function(t) {
88-
HW.shout(4, {}, function(err, shout) {
89-
t.ok(err, 'expected error');
90-
t.ok(err.message.indexOf('phrase') > -1, 'proper error message');
91-
t.end();
92-
});
93-
});
87+
// test('shout error - non string phrase', function(t) {
88+
// HW.shout(4, {}, function(err, shout) {
89+
// t.ok(err, 'expected error');
90+
// t.ok(err.message.indexOf('phrase') > -1, 'proper error message');
91+
// t.end();
92+
// });
93+
// });
9494

95-
test('shout error - no options object', function(t) {
96-
HW.shout('rawr', true, function(err, shout) {
97-
t.ok(err, 'expected error');
98-
t.ok(err.message.indexOf('options') > -1, 'proper error message');
99-
t.end();
100-
});
101-
});
95+
// test('shout error - no options object', function(t) {
96+
// HW.shout('rawr', true, function(err, shout) {
97+
// t.ok(err, 'expected error');
98+
// t.ok(err.message.indexOf('options') > -1, 'proper error message');
99+
// t.end();
100+
// });
101+
// });
102102

103-
test('shout error - options.louder non boolean', function(t) {
104-
HW.shout('rawr', { louder: 3 }, function(err, shout) {
105-
t.ok(err, 'expected error');
106-
t.ok(err.message.indexOf('louder') > -1, 'proper error message');
107-
t.end();
108-
});
109-
});
103+
// test('shout error - options.louder non boolean', function(t) {
104+
// HW.shout('rawr', { louder: 3 }, function(err, shout) {
105+
// t.ok(err, 'expected error');
106+
// t.ok(err.message.indexOf('louder') > -1, 'proper error message');
107+
// t.end();
108+
// });
109+
// });
110110

111-
// we have to try/catch since a missing callback results in a throw
112-
test('shout error - no callback', function(t) {
113-
try {
114-
HW.shout('rawr', {});
115-
} catch (err) {
116-
t.ok(err, 'expected error');
117-
t.ok(err.message.indexOf('callback') > -1, 'proper error message');
118-
t.end();
119-
}
120-
});
111+
// // we have to try/catch since a missing callback results in a throw
112+
// test('shout error - no callback', function(t) {
113+
// try {
114+
// HW.shout('rawr', {});
115+
// } catch (err) {
116+
// t.ok(err, 'expected error');
117+
// t.ok(err.message.indexOf('callback') > -1, 'proper error message');
118+
// t.end();
119+
// }
120+
// });

0 commit comments

Comments
 (0)