Skip to content

Commit

Permalink
test: support relative path.
Browse files Browse the repository at this point in the history
  • Loading branch information
@xicilion
xicilion committed May 22, 2017
1 parent 46e30ca commit 58c3680
Show file tree
Hide file tree
Showing 13 changed files with 193 additions and 194 deletions.
2 changes: 1 addition & 1 deletion test/coroutine_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ describe('coroutine', () => {
var worker;

it("new", () => {
worker = new coroutine.Worker('worker_main.js');
worker = new coroutine.Worker(__dirname + '/worker_main.js');
});

describe("message", () => {
Expand Down
32 changes: 16 additions & 16 deletions test/crypto_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ describe('crypto', () => {
describe('Cipher', () => {
function test_cipher(provider, file) {
it(file, () => {
var cases = encoding.json.decode(fs.readTextFile("crypto_case/" + file + ".json"));
var cases = encoding.json.decode(fs.readTextFile(__dirname + "/crypto_case/" + file + ".json"));

cases.forEach((item) => {
var c;
Expand Down Expand Up @@ -410,10 +410,10 @@ describe('crypto', () => {
var cert = new crypto.X509Cert();

it("load", () => {
var fl = fs.readdir('cert_files/');
var fl = fs.readdir(__dirname + '/cert_files/');
fl.forEach((s) => {
if (s.match(/\.crt/))
cert.load(fs.readTextFile('cert_files/' + s));
cert.load(fs.readTextFile(__dirname + '/cert_files/' + s));
});
});

Expand All @@ -439,10 +439,10 @@ describe('crypto', () => {
cert.clear();
assert.deepEqual(cert.dump(), []);

var fl = fs.readdir('cert_files/');
var fl = fs.readdir(__dirname + '/cert_files/');
fl.forEach((s) => {
if (s.match(/\.crt/))
cert.loadFile('cert_files/' + s);
cert.loadFile(__dirname + '/cert_files/' + s);
});

assert.deepEqual(cert.dump(), s);
Expand All @@ -452,14 +452,14 @@ describe('crypto', () => {
cert.clear();
assert.deepEqual(cert.dump(), []);

cert.load(fs.readTextFile('cert_files/certdata.txt'));
cert.load(fs.readTextFile(__dirname + '/cert_files/certdata.txt'));
var s = cert.dump();
assert.notDeepEqual(s, []);

cert.clear();
assert.deepEqual(cert.dump(), []);

cert.load(fs.readTextFile('cert_files/ca-bundle.crt'));
cert.load(fs.readTextFile(__dirname + '/cert_files/ca-bundle.crt'));
var s1 = cert.dump();

assert.deepEqual(s.slice(s.length - s1.length), s1);
Expand All @@ -469,7 +469,7 @@ describe('crypto', () => {
cert.clear();
assert.deepEqual(cert.dump(), []);

cert.load(fs.readTextFile('cert_files/ca-bundle.crt'));
cert.load(fs.readTextFile(__dirname + '/cert_files/ca-bundle.crt'));
var s = cert.dump();

cert.clear();
Expand Down Expand Up @@ -512,7 +512,7 @@ describe('crypto', () => {

it("unknown format", () => {
assert.throws(() => {
cert.load('cert_files/certdata.txt');
cert.load(__dirname + '/cert_files/certdata.txt');
});
});

Expand Down Expand Up @@ -552,10 +552,10 @@ describe('crypto', () => {
var crl = new crypto.X509Crl();

it("load", () => {
var fl = fs.readdir('crl_files/');
var fl = fs.readdir(__dirname + '/crl_files/');
fl.forEach((s) => {
if (s.match(/\.pem/))
crl.load(fs.readTextFile('crl_files/' + s));
crl.load(fs.readTextFile(__dirname + '/crl_files/' + s));
});
});

Expand All @@ -581,10 +581,10 @@ describe('crypto', () => {
var s = crl.dump();
crl.clear();

var fl = fs.readdir('crl_files/');
var fl = fs.readdir(__dirname + '/crl_files/');
fl.forEach((s) => {
if (s.match(/\.pem/))
crl.loadFile('crl_files/' + s);
crl.loadFile(__dirname + '/crl_files/' + s);
});

assert.deepEqual(crl.dump(), s);
Expand All @@ -596,10 +596,10 @@ describe('crypto', () => {
var req = new crypto.X509Req();

it("load", () => {
var fl = fs.readdir('req_files/');
var fl = fs.readdir(__dirname + '/req_files/');
fl.forEach((s) => {
if (s.match(/\.req/))
req.load(fs.readTextFile('req_files/' + s));
req.load(fs.readTextFile(__dirname + '/req_files/' + s));
});
});

Expand Down Expand Up @@ -811,4 +811,4 @@ describe('crypto', () => {

});

// test.run(console.DEBUG);
// test.run(console.DEBUG);
6 changes: 3 additions & 3 deletions test/fibmod_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ var coroutine = require('coroutine');

var vmid = coroutine.vmid;

fs.writeFile("module/check1" + vmid + ".js", '');
fs.writeFile(__dirname + "/module/check1" + vmid + ".js", '');

function t() {
require('module/check1' + vmid);
require('./module/check1' + vmid);
}
coroutine.start(t).join();
fs.unlink('module/check1' + vmid + '.js');
fs.unlink(__dirname + '/module/check1' + vmid + '.js');
67 changes: 33 additions & 34 deletions test/fs_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('fs', () => {
});

it("file open & close", () => {
var f = fs.open('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');
assert.doesNotThrow(() => {
f.read(100);
});
Expand All @@ -43,13 +43,13 @@ describe('fs', () => {
f.read(100);
});

assert.ok(fs.exists('fs_test.js'));
assert.ok(fs.exists(__dirname + '/fs_test.js'));
});

it("file.stat", () => {
var f = fs.open('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');

assert.deepEqual(f.stat().toJSON(), fs.stat('fs_test.js').toJSON());
assert.deepEqual(f.stat().toJSON(), fs.stat(__dirname + '/fs_test.js').toJSON());
});

it("mkdir", () => {
Expand All @@ -74,47 +74,47 @@ describe('fs', () => {
});

it("file.size", () => {
var f = fs.open('fs_test.js');
var st = fs.stat('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');
var st = fs.stat(__dirname + '/fs_test.js');
assert.equal(st.size, f.size());
f.close();
});

if (!win) {
it("fs.chmod", () => {
var st = fs.stat('fs_test.js');
var st = fs.stat(__dirname + '/fs_test.js');
var oldm = st.mode;

fs.chmod('fs_test.js', 511);
var st = fs.stat('fs_test.js');
fs.chmod(__dirname + '/fs_test.js', 511);
var st = fs.stat(__dirname + '/fs_test.js');
assert.equal(st.mode & 511, 511);

fs.chmod('fs_test.js', oldm);
var st = fs.stat('fs_test.js');
fs.chmod(__dirname + '/fs_test.js', oldm);
var st = fs.stat(__dirname + '/fs_test.js');
assert.equal(st.mode & 511, oldm & 511);
});

it("file.chmod", () => {
var f = fs.open('fs_test.js');
var st = fs.stat('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');
var st = fs.stat(__dirname + '/fs_test.js');
var oldm = st.mode;

f.chmod(511);
var st = fs.stat('fs_test.js');
var st = fs.stat(__dirname + '/fs_test.js');
assert.equal(st.mode & 511, 511);

f.chmod(oldm);
var st = fs.stat('fs_test.js');
var st = fs.stat(__dirname + '/fs_test.js');
assert.equal(st.mode & 511, oldm & 511);

f.close();
});
}

it("file read & write", () => {
var f = fs.open('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');

var f1 = fs.open('fs_test.js.bak' + vmid, 'w+');
var f1 = fs.open(__dirname + '/fs_test.js.bak' + vmid, 'w+');
f1.write(f.read(f.size()));

f1.rewind();
Expand All @@ -124,42 +124,41 @@ describe('fs', () => {

f.close();
f1.close();
fs.unlink('fs_test.js.bak' + vmid);
fs.unlink(__dirname + '/fs_test.js.bak' + vmid);
});

it("readFile", () => {
var f = fs.open('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');

var s = fs.readFile("fs_test.js");
var s = fs.readFile(__dirname + "/fs_test.js");
assert.deepEqual(s, f.read(f.size()));

f.close();
});

it("readTextFile", () => {
var f = fs.open('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');

var s = fs.readTextFile("fs_test.js");
var s = fs.readTextFile(__dirname + "/fs_test.js");
assert.equal(s, f.read(f.size()).toString());

f.close();
});

it("openTextStream", () => {
var f = fs.openTextStream('fs_test.js');
var f = fs.openTextStream(__dirname + '/fs_test.js');
f.EOL = '\n';

var a = fs.readTextFile("fs_test.js").replace(/\r/g, "").split("\n");
var a = fs.readTextFile(__dirname + "/fs_test.js").replace(/\r/g, "").split("\n");
var b = f.readLines();
b.push("");
assert.deepEqual(a, b);

f.close();
});

it("tell", () => {
var f = fs.open('fs_test.js');
var st = fs.stat('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');
var st = fs.stat(__dirname + '/fs_test.js');

f.read(f.size());

Expand All @@ -171,7 +170,7 @@ describe('fs', () => {
});

it("seek", () => {
var f = fs.open('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');
f.seek(f.size() + 10, fs.SEEK_SET);
assert.equal(f.tell(), f.size() + 10);
f.seek(10, fs.SEEK_SET);
Expand All @@ -181,15 +180,15 @@ describe('fs', () => {
});

it("seek 64 bits", () => {
var f = fs.open('fs_test.js');
var f = fs.open(__dirname + '/fs_test.js');
f.seek(f.size() + 8589934592, fs.SEEK_SET);
assert.equal(f.tell(), f.size() + 8589934592);
f.close();
});

it("copyTo", () => {
var f = fs.open('fs_test.js');
var f1 = fs.open('fs_test.js.bak' + vmid, 'w');
var f = fs.open(__dirname + '/fs_test.js');
var f1 = fs.open(__dirname + '/fs_test.js.bak' + vmid, 'w');

var s = f.copyTo(f1, 100);
assert.equal(s, 100);
Expand All @@ -200,11 +199,11 @@ describe('fs', () => {
f.close();
f1.close();

fs.unlink('fs_test.js.bak' + vmid);
fs.unlink(__dirname + '/fs_test.js.bak' + vmid);
});

it("readdir", () => {
var fl = fs.readdir('vm_test').toJSON();
var fl = fs.readdir(__dirname + '/vm_test').toJSON();
fl.sort((a, b) => {
if (a > b)
return 1;
Expand All @@ -219,4 +218,4 @@ describe('fs', () => {
});
});

// test.run(console.DEBUG);
// test.run(console.DEBUG);
Loading

0 comments on commit 58c3680

Please sign in to comment.