Skip to content
This repository was archived by the owner on Apr 3, 2024. It is now read-only.

Commit b5c2910

Browse files
kjinkjin
authored
Move some tests out of test/standalone (#214)
PR-URL: #214
1 parent a28d719 commit b5c2910

13 files changed

+681
-663
lines changed

‎test/standalone/test-debuglet.js‎

Lines changed: 0 additions & 549 deletions
This file was deleted.

‎test/standalone/test-duplicate-expressions.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ var breakpointInFoo = {
2727
};
2828

2929
var assert = require('assert');
30+
var extend = require('extend');
3031
var v8debugapi = require('../../src/agent/v8debugapi.js');
3132
var logModule = require('@google/cloud-diagnostics-common').logger;
32-
var config = require('../../src/agent/config.js');
33+
var defaultConfig = require('../../src/agent/config.js');
3334
var SourceMapper = require('../../src/agent/sourcemapper.js');
3435
var scanner = require('../../src/agent/scanner.js');
3536
var path = require('path');
@@ -43,7 +44,9 @@ function stateIsClean(api) {
4344
}
4445

4546
describe('v8debugapi', function() {
46-
config.workingDirectory = path.join(process.cwd(), 'test', 'standalone');
47+
var config = extend({}, defaultConfig, {
48+
workingDirectory: path.join(process.cwd(), 'test', 'standalone')
49+
});
4750
var logger = logModule.create(config.logLevel);
4851
var api = null;
4952

‎test/standalone/test-duplicate-nested-expressions.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
*/
2626

2727
var assert = require('assert');
28+
var extend = require('extend');
2829
var v8debugapi = require('../../src/agent/v8debugapi.js');
2930
var logModule = require('@google/cloud-diagnostics-common').logger;
30-
var config = require('../../src/agent/config.js');
31+
var defaultConfig = require('../../src/agent/config.js');
3132
var SourceMapper = require('../../src/agent/sourcemapper.js');
3233
var scanner = require('../../src/agent/scanner.js');
3334
var path = require('path');
@@ -42,7 +43,9 @@ function stateIsClean(api) {
4243
}
4344

4445
describe('v8debugapi', function() {
45-
config.workingDirectory = path.join(process.cwd(), 'test', 'standalone');
46+
var config = extend({}, defaultConfig, {
47+
workingDirectory: path.join(process.cwd(), 'test', 'standalone')
48+
});
4649
var logger = logModule.create(config.logLevel);
4750
var api = null;
4851

‎test/standalone/test-env-log-level.js‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎test/standalone/test-fat-arrow.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
*/
1717

1818
var assert = require('assert');
19+
var extend = require('extend');
1920
var v8debugapi = require('../../src/agent/v8debugapi.js');
2021
var logModule = require('@google/cloud-diagnostics-common').logger;
21-
var config = require('../../src/agent/config.js');
22+
var defaultConfig = require('../../src/agent/config.js');
2223
var SourceMapper = require('../../src/agent/sourcemapper.js');
2324
var scanner = require('../../src/agent/scanner.js');
2425
var path = require('path');
@@ -35,7 +36,9 @@ function stateIsClean(api) {
3536
}
3637

3738
describe('v8debugapi', function() {
38-
config.workingDirectory = path.join(process.cwd(), 'test');
39+
var config = extend({}, defaultConfig, {
40+
workingDirectory: path.join(process.cwd(), 'test')
41+
});
3942
var logger = logModule.create(config.logLevel);
4043
var api = null;
4144
var foo;

‎test/standalone/test-max-data-size.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
process.env.GCLOUD_DIAGNOSTICS_CONFIG = 'test/fixtures/test-config.js';
2323

2424
var assert = require('assert');
25+
var extend = require('extend');
2526
var logModule = require('@google/cloud-diagnostics-common').logger;
2627
var v8debugapi = require('../../src/agent/v8debugapi.js');
2728
var SourceMapper = require('../../src/agent/sourcemapper.js');
2829
var scanner = require('../../src/agent/scanner.js');
29-
var config = require('../../src/agent/config.js');
30+
var defaultConfig = require('../../src/agent/config.js');
3031
var api;
3132

3233
var breakpointInFoo = {
@@ -35,6 +36,8 @@ var breakpointInFoo = {
3536
};
3637

3738
describe('maxDataSize', function() {
39+
var config = extend({}, defaultConfig);
40+
3841
before(function(done) {
3942
if (!api) {
4043
var logger = logModule.create(config.logLevel);

‎test/standalone/test-this-context.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
*/
2626

2727
var assert = require('assert');
28+
var extend = require('extend');
2829
var v8debugapi = require('../../src/agent/v8debugapi.js');
2930
var logModule = require('@google/cloud-diagnostics-common').logger;
30-
var config = require('../../src/agent/config.js');
31+
var defaultConfig = require('../../src/agent/config.js');
3132
var SourceMapper = require('../../src/agent/sourcemapper.js');
3233
var scanner = require('../../src/agent/scanner.js');
3334
var path = require('path');
@@ -42,7 +43,9 @@ function stateIsClean(api) {
4243
}
4344

4445
describe('v8debugapi', function() {
45-
config.workingDirectory = path.join(process.cwd(), 'test', 'standalone');
46+
var config = extend({}, defaultConfig, {
47+
workingDirectory: path.join(process.cwd(), 'test', 'standalone')
48+
});
4649
var logger = logModule.create(config.logLevel);
4750
var api = null;
4851

‎test/standalone/test-try-catch.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
*/
2626

2727
var assert = require('assert');
28+
var extend = require('extend');
2829
var v8debugapi = require('../../src/agent/v8debugapi.js');
2930
var logModule = require('@google/cloud-diagnostics-common').logger;
30-
var config = require('../../src/agent/config.js');
31+
var defaultConfig = require('../../src/agent/config.js');
3132
var SourceMapper = require('../../src/agent/sourcemapper.js');
3233
var scanner = require('../../src/agent/scanner.js');
3334
var path = require('path');
@@ -42,7 +43,9 @@ function stateIsClean(api) {
4243
}
4344

4445
describe('v8debugapi', function() {
45-
config.workingDirectory = path.join(process.cwd(), 'test', 'standalone');
46+
var config = extend({}, defaultConfig, {
47+
workingDirectory: path.join(process.cwd(), 'test', 'standalone')
48+
});
4649
var logger = logModule.create(config.logLevel);
4750
var api = null;
4851

test/test-v8debugapi.js renamed to test/standalone/test-v8debugapi.js

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ var breakpointInFoo = {
3232
var MAX_INT = 2147483647; // Max signed int32.
3333

3434
var assert = require('assert');
35-
var v8debugapi = require('../src/agent/v8debugapi.js');
35+
var extend = require('extend');
36+
var v8debugapi = require('../../src/agent/v8debugapi.js');
3637
var logModule = require('@google/cloud-diagnostics-common').logger;
37-
var config = require('../src/agent/config.js');
38-
var StatusMessage = require('../src/status-message.js');
39-
var scanner = require('../src/agent/scanner.js');
40-
var SourceMapper = require('../src/agent/sourcemapper.js');
38+
var defaultConfig = require('../../src/agent/config.js');
39+
var StatusMessage = require('../../src/status-message.js');
40+
var scanner = require('../../src/agent/scanner.js');
41+
var SourceMapper = require('../../src/agent/sourcemapper.js');
4142
var path = require('path');
4243
var semver = require('semver');
4344

@@ -111,7 +112,9 @@ function validateBreakpoint(breakpoint) {
111112
}
112113

113114
describe('v8debugapi', function() {
114-
config.workingDirectory = path.join(process.cwd(), 'test');
115+
var config = extend({}, defaultConfig, {
116+
workingDirectory: path.join(process.cwd(), 'test')
117+
});
115118
var logger = logModule.create(config.logLevel);
116119
var api = null;
117120

@@ -170,7 +173,7 @@ describe('v8debugapi', function() {
170173

171174
it('should set error for breakpoint in non-js files',
172175
function(done) {
173-
require('./fixtures/key-bad.json');
176+
require('../fixtures/key-bad.json');
174177
var bp = { id: 0, location: {line: 1, path: path.join('fixtures',
175178
'key-bad.json')}};
176179
api.set(bp, function(err) {
@@ -185,7 +188,7 @@ describe('v8debugapi', function() {
185188

186189
it('should disambiguate incorrect path if filename is unique',
187190
function(done) {
188-
require('./fixtures/foo.js');
191+
require('../fixtures/foo.js');
189192
var bp = { id: 0, location: {line: 1, path: path.join(path.sep, 'test',
190193
'foo.js')}};
191194
api.set(bp, function(err) {
@@ -197,7 +200,7 @@ describe('v8debugapi', function() {
197200

198201
it('should disambiguate incorrect path if partial path is unique',
199202
function(done) {
200-
require('./fixtures/foo.js');
203+
require('../fixtures/foo.js');
201204
// hello.js is not unique but a/hello.js is.
202205
var bp = { id: 0, location: {line: 1, path: path.join(path.sep, 'Server',
203206
'a', 'hello.js')}};
@@ -232,8 +235,8 @@ describe('v8debugapi', function() {
232235
});
233236

234237
it('should reject breakpoint when filename is ambiguous', function(done) {
235-
require('./fixtures/a/hello.js');
236-
require('./fixtures/b/hello.js');
238+
require('../fixtures/a/hello.js');
239+
require('../fixtures/b/hello.js');
237240
var bp = {id: 'ambiguous', location: {line: 1, path: 'hello.js'}};
238241
api.set(bp, function(err) {
239242
assert.ok(err);
@@ -247,10 +250,10 @@ describe('v8debugapi', function() {
247250
});
248251

249252
it('should reject breakpoint on non-existent line', function(done) {
250-
require('./fixtures/foo.js');
253+
require('../fixtures/foo.js');
251254
var bp = {
252255
id: 'non-existent line',
253-
location: {path: path.join('.', 'fixtures', 'foo.js'), line: 500}
256+
location: {path: path.join('..', 'fixtures', 'foo.js'), line: 500}
254257
};
255258
api.set(bp, function(err) {
256259
assert.ok(err);
@@ -976,7 +979,7 @@ describe('v8debugapi', function() {
976979
'transpile.coffee'), line: 3 },
977980
condition: 'if n == 3 then true else false'
978981
};
979-
var tt = require('./fixtures/coffee/transpile');
982+
var tt = require('../fixtures/coffee/transpile');
980983
api.set(bp, function(err) {
981984
assert.ifError(err);
982985
api.wait(bp, function(err) {
@@ -1022,7 +1025,7 @@ describe('v8debugapi', function() {
10221025
line: 3 },
10231026
condition: 'i + j === 3'
10241027
};
1025-
var tt = require('./fixtures/es6/transpile');
1028+
var tt = require('../fixtures/es6/transpile');
10261029
api.set(bp, function(err) {
10271030
assert.ifError(err);
10281031
api.wait(bp, function(err) {
@@ -1053,7 +1056,7 @@ describe('v8debugapi', function() {
10531056
'transpile.coffee'), line: 3 },
10541057
expressions: ['if n == 3 then Math.PI * n else n']
10551058
};
1056-
var tt = require('./fixtures/coffee/transpile');
1059+
var tt = require('../fixtures/coffee/transpile');
10571060
api.set(bp, function(err) {
10581061
assert.ifError(err);
10591062
api.wait(bp, function(err) {
@@ -1083,7 +1086,7 @@ describe('v8debugapi', function() {
10831086
line: 3 },
10841087
expressions: [':)', 'n n, n', 'process=this', '((x) -> x x) n', 'return']
10851088
};
1086-
var tt = require('./fixtures/coffee/transpile');
1089+
var tt = require('../fixtures/coffee/transpile');
10871090
api.set(bp, function(err) {
10881091
assert.ifError(err);
10891092
api.wait(bp, function(err) {
@@ -1157,7 +1160,7 @@ describe('v8debugapi', function() {
11571160

11581161

11591162
it('should correctly stop on line-1 breakpoints', function(done) {
1160-
var foo = require('./fixtures/foo.js');
1163+
var foo = require('../fixtures/foo.js');
11611164
var bp = { id: 'bp-line-1', location: {
11621165
path: 'foo.js',
11631166
line: 1,

0 commit comments

Comments
 (0)