Skip to content

Commit adc7e10

Browse files
lizhizhoulizhizhou
committed
Add test
1 parent 2a6f615 commit adc7e10

11 files changed

Lines changed: 51 additions & 37 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ all:
1616
cd page; bower --allow-root install;
1717
npm install --target_arch=arm
1818
test:
19-
node_modules/mocha/bin/mocha ut/mocha.js
20-
19+
npm test
2120
clean:
2221
rm -rf build
2322
rm -rf node_modules

‎apps/api.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ module.exports = function(app) {
2525

2626
app.use('/api', router);
2727

28-
}
28+
}

‎apps/error.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ module.exports = function(app, argv, logger) {
33
logger.debug("Skip error module for debug");
44
return;
55
}
6-
app.use(
7-
function errorHandler(err, req, res, next) {
8-
if (res.headersSent) {
9-
return next(err);
10-
}
11-
logger.error('error');
12-
res.status(500);
6+
app.use(
7+
function errorHandler(err, req, res, next) {
8+
if (res.headersSent) {
9+
return next(err);
10+
}
11+
logger.error('error');
12+
res.status(500);
1313

14-
res.json('error', {
15-
error: err
14+
res.json('error', {
15+
error: err
16+
});
1617
});
17-
});
18-
}
18+
}

‎apps/fpga.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,4 @@ module.exports = function(app, logger, io, db, argv) {
141141

142142
app.use('/fpga', router);
143143

144-
}
144+
}

‎apps/ide.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = function(app, router, logger) {
22
logger.info('module cide');
33
var fork = require('child_process').fork;
4-
var c,fpga;
4+
var c, fpga;
55

66
router.get('/', function(req, res) {
77
res.json({
@@ -11,7 +11,7 @@ module.exports = function(app, router, logger) {
1111
});
1212

1313
router.get('/c/start', function(req, res) {
14-
c = fork('../ArduinoIDE/server.js',['']);
14+
c = fork('../ArduinoIDE/server.js', ['']);
1515
res.json({
1616
message: 'start the c ide!'
1717
});
@@ -25,7 +25,7 @@ module.exports = function(app, router, logger) {
2525
});
2626

2727
router.get('/fpga/start', function(req, res) {
28-
fpga = fork('../FPGAdesigner/server.js',['']);
28+
fpga = fork('../FPGAdesigner/server.js', ['']);
2929
res.json({
3030
message: 'start the fpga ide!'
3131
});
@@ -40,4 +40,4 @@ module.exports = function(app, router, logger) {
4040

4141
app.use('/ide', router);
4242

43-
}
43+
}

‎apps/jside.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ module.exports = function(app, router) {
2323

2424
app.use('/jside', router);
2525

26-
}
26+
}

‎apps/main.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ module.exports = function(app, logger, event) {
3535
});
3636

3737
app.post('/log', function(req, res) {
38-
var length = parseInt(req.body.length);
39-
var position = parseInt(req.body.position);
38+
var length = parseInt(req.body.length);
39+
var position = parseInt(req.body.position);
4040
var fd = fs.openSync("server.log", 'r');
41-
var buffer=new Buffer(length);
42-
length = fs.readSync(fd, buffer, 0, length, position);
41+
var buffer = new Buffer(length);
42+
length = fs.readSync(fd, buffer, 0, length, position);
4343
res.json({
4444
log: buffer.toString(),
45-
length:length
45+
length: length
4646
});
4747
});
4848

@@ -68,4 +68,4 @@ module.exports = function(app, logger, event) {
6868
var code = fs.unlinkSync(__dirname + "/" + filename);
6969
res.send(code);
7070
});
71-
}
71+
}

‎apps/script.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ module.exports = function(app, logger, router) {
1616

1717
app.use('/script', router);
1818

19-
}
19+
}

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Restapi server for opneFPGAduino",
55
"main": "server.js",
66
"scripts": {
7-
"test": "echo \"Error: no test specified\" && exit 1"
7+
"test": "node_modules/mocha/bin/mocha ut/mocha.js"
88
},
99
"repository": {
1010
"type": "git",
@@ -32,6 +32,7 @@
3232
"mosca": "1.1.0",
3333
"chai": "*",
3434
"request": "*",
35+
"tcp-port-used": "*",
3536
"tingyun": "*"
3637
},
3738
"author": "Zhizhou Li",

‎server.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ function loadmodule(filename) {
104104
event.addListener('load', loadmodule);
105105

106106
server.listen(port);
107-
logger.info("Restful API server run on port", port)
107+
logger.info("Restful API server run on port", port)

0 commit comments

Comments
 (0)