Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(core): reorganise test suite #2626

Merged
merged 7 commits into from
Apr 4, 2024
Merged

test(core): reorganise test suite #2626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b8a3b3d
test(core): rename tests using consistent pattern
bernardobridge Apr 4, 2024
68441f8
test(core): move acceptance tests to same folder
bernardobridge Apr 4, 2024
ebdcb58
test(core): move csvs to data folder in scripts
bernardobridge Apr 4, 2024
4c05a61
test(core): move certs to targets folder
bernardobridge Apr 4, 2024
0bfe68e
test(core): remove unused test
bernardobridge Apr 4, 2024
ab5280a
test(core): remove superfluous test/core folder hierarchy
bernardobridge Apr 4, 2024
b2626e5
test(core): reflect new folder structure in package.json
bernardobridge Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"lint": "eslint --ext \".js,.ts,.tsx\" .",
"lint-fix": "npm run lint -- --fix",
"test": "npm run test:unit && npm run test:acceptance",
"test:unit": "tap --no-coverage --color --timeout=300 test/core/unit/*.test.js",
"test:acceptance": "tap --no-coverage --color --timeout 300 test/core/test_* && tap --no-coverage --color --timeout=300 test/core/acceptance/**/*.test.js"
"test:unit": "tap --no-coverage --color --timeout=300 test/unit/*.test.js",
"test:acceptance": "tap --no-coverage --color --timeout 300 test/acceptance/*.test.js && tap --no-coverage --color --timeout=300 test/acceptance/**/*.test.js"
},
"devDependencies": {
"@hapi/basic": "^6.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/core/test/core/test_arrivals.js → ...ges/core/test/acceptance/arrivals.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const { test, beforeEach, afterEach } = require('tap');
const runner = require('../..').runner.runner;
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -17,7 +17,7 @@ afterEach(() => {
});

test('arrival phases', function (t) {
const script = require('./scripts/arrival_phases.json');
const script = require('../scripts/arrival_phases.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand All @@ -42,7 +42,7 @@ test('arrival phases', function (t) {
});

test('arrival phases - with modified time format', function (t) {
const script = require('./scripts/arrival_phases_time_format.json');
const script = require('../scripts/arrival_phases_time_format.json');
script.config.target = `http://127.0.0.1:${port}`;

const initialTime = Date.now();
Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/core/test_basic_auth.js → ...s/core/test/acceptance/basic-auth.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const { test, beforeEach, afterEach } = require('tap');
const runner = require('../..').runner.runner;
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -17,7 +17,7 @@ afterEach(() => {
});

test('HTTP basic auth', (t) => {
const script = require('./scripts/hello_basic_auth.json');
const script = require('../scripts/hello_basic_auth.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down
0 packages/core/test/core/test_capture.js → ...ages/core/test/acceptance/capture.test.js
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ore/test/core/test_concurrent_requests.js → ...st/acceptance/concurrent-requests.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const { test, beforeEach, afterEach } = require('tap');
const runner = require('../..').runner.runner;
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -17,7 +17,7 @@ afterEach(() => {
});

test('scenarios avoided - arrival rate', function (t) {
const script = require('./scripts/concurrent_requests_arrival_rate.json');
const script = require('../scripts/concurrent_requests_arrival_rate.json');
script.config.target = `http://127.0.0.1:${port}`;
console.log('script', script);

Expand Down Expand Up @@ -70,7 +70,7 @@ test('scenarios avoided - arrival rate', function (t) {
// });

test('scenarios avoided - ramp to', function (t) {
const script = require('./scripts/concurrent_requests_ramp_to.json');
const script = require('../scripts/concurrent_requests_ramp_to.json');
script.config.target = `http://127.0.0.1:${port}`;
console.log('script', script);

Expand All @@ -95,7 +95,7 @@ test('scenarios avoided - ramp to', function (t) {
});

test('scenarios avoided - multiple phases', function (t) {
const script = require('./scripts/concurrent_requests_multiple_phases.json');
const script = require('../scripts/concurrent_requests_multiple_phases.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/core/test_if.js → ...t/acceptance/conditional-requests.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const { test, beforeEach, afterEach } = require('tap');
const runner = require('../..').runner.runner;
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -17,7 +17,7 @@ afterEach(() => {
});

test('ifTrue', (t) => {
const script = require('./scripts/iftrue.json');
const script = require('../scripts/iftrue.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down
18 changes: 9 additions & 9 deletions packages/core/test/core/test_cookies.js → ...core/test/acceptance/cookies-http.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const runner = require('../..').runner.runner;
const l = require('lodash');
const request = require('got');
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -19,7 +19,7 @@ afterEach(() => {
});

test('cookie jar http', function (t) {
const script = require('./scripts/cookies.json');
const script = require('../scripts/cookies.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down Expand Up @@ -48,7 +48,7 @@ test('cookie jar http', function (t) {
});

test('cookie jar invalid response', function (t) {
const script = require('./scripts/cookies_malformed_response.json');
const script = require('../scripts/cookies_malformed_response.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand All @@ -72,7 +72,7 @@ test('cookie jar invalid response', function (t) {
});

test('setting cookie jar parsing options', function (t) {
const script = require('./scripts/cookies_malformed_response.json');
const script = require('../scripts/cookies_malformed_response.json');
script.config.target = `http://127.0.0.1:${port}`;

Object.assign(script.config, {
Expand All @@ -97,7 +97,7 @@ test('setting cookie jar parsing options', function (t) {
});

test('default cookies', function (t) {
const script = require('./scripts/defaults_cookies.json');
const script = require('../scripts/defaults_cookies.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand All @@ -117,7 +117,7 @@ test('default cookies', function (t) {
});

test('default cookies from config.http.defaults instead', function (t) {
const script = l.cloneDeep(require('./scripts/defaults_cookies.json'));
const script = l.cloneDeep(require('../scripts/defaults_cookies.json'));
script.config.target = `http://127.0.0.1:${port}`;

const cookie = script.config.defaults.cookie;
Expand All @@ -141,7 +141,7 @@ test('default cookies from config.http.defaults instead', function (t) {
});

test('default cookies from config.http.defaults should take precedence', function (t) {
const script = l.cloneDeep(require('./scripts/defaults_cookies.json'));
const script = l.cloneDeep(require('../scripts/defaults_cookies.json'));
script.config.target = `http://127.0.0.1:${port}`;

const cookie = script.config.defaults.cookie;
Expand All @@ -165,7 +165,7 @@ test('default cookies from config.http.defaults should take precedence', functio
});

test('no default cookie', function (t) {
const script = require('./scripts/defaults_cookies.json');
const script = require('../scripts/defaults_cookies.json');
script.config.target = `http://127.0.0.1:${port}`;

delete script.config.defaults.cookie;
Expand All @@ -186,7 +186,7 @@ test('no default cookie', function (t) {
});

test('no default cookie still sends cookies defined in script', function (t) {
const script = require('./scripts/no_defaults_cookies.json');
const script = require('../scripts/no_defaults_cookies.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down
4 changes: 2 additions & 2 deletions ...s/core/test/core/test_cookies_socketio.js → .../test/acceptance/cookies-socketio.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const runner = require('../..').runner.runner;
const l = require('lodash');
const request = require('got');
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/express_socketio');
const createTestServer = require('../targets/express_socketio');

let server;
let port;
Expand All @@ -22,7 +22,7 @@ afterEach(() => {
});

test('cookie jar socketio', function (t) {
const script = require('./scripts/cookies_socketio.json');
const script = require('../scripts/cookies_socketio.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/core/test_headers.js → ...ages/core/test/acceptance/headers.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { test, beforeEach, afterEach } = require('tap');
const runner = require('../..').runner.runner;
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand Down
8 changes: 4 additions & 4 deletions packages/core/test/core/test_loop.js → packages/core/test/acceptance/loop.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const { test, beforeEach, afterEach } = require('tap');
const runner = require('../..').runner.runner;
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -17,7 +17,7 @@ afterEach(() => {
});

test('simple loop', (t) => {
const script = require('./scripts/loop.json');
const script = require('../scripts/loop.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand All @@ -42,7 +42,7 @@ test('simple loop', (t) => {
});

test('loop with range', (t) => {
const script = require('./scripts/loop_range.json');
const script = require('../scripts/loop_range.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down Expand Up @@ -73,7 +73,7 @@ test('loop with range', (t) => {
});

test('loop with nested range', (t) => {
const script = require('./scripts/loop_nested_range.json');
const script = require('../scripts/loop_nested_range.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down
4 changes: 2 additions & 2 deletions .../core/test/core/acceptance/misc/helper.js → packages/core/test/acceptance/misc/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const l = require('lodash');
const runner = require('../../../..').runner.runner;
const { SSMS } = require('../../../../lib/ssms');
const runner = require('../../..').runner.runner;
const { SSMS } = require('../../../lib/ssms');

const runGenericRunnerTest = (script, t) => {
const startedAt = process.hrtime();
Expand Down
0 ...re/test/core/acceptance/misc/http.test.js → ...es/core/test/acceptance/misc/http.test.js
View file
Open in desktop
File renamed without changes.
0 ...ore/acceptance/misc/large-payload.test.js → ...est/acceptance/misc/large-payload.test.js
View file
Open in desktop
File renamed without changes.
0 ...e/acceptance/misc/multiple-phases.test.js → ...t/acceptance/misc/multiple-phases.test.js
View file
Open in desktop
File renamed without changes.
0 ...cceptance/misc/socketio-with-args.test.js → ...cceptance/misc/socketio-with-args.test.js
View file
Open in desktop
File renamed without changes.
0 ...cceptance/misc/socketio-with-http.test.js → ...cceptance/misc/socketio-with-http.test.js
View file
Open in desktop
File renamed without changes.
0 ...est/core/acceptance/misc/socketio.test.js → ...ore/test/acceptance/misc/socketio.test.js
View file
Open in desktop
File renamed without changes.
0 ...est/core/acceptance/misc/ws-proxy.test.js → ...ore/test/acceptance/misc/ws-proxy.test.js
View file
Open in desktop
File renamed without changes.
0 ...core/test/core/acceptance/misc/ws.test.js → ...ages/core/test/acceptance/misc/ws.test.js
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions .../core/test/core/test_multiple_payloads.js → ...test/acceptance/multiple-payloads.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const path = require('path');
const csv = require('csv-parse');
const async = require('async');
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -21,11 +21,11 @@ afterEach(() => {
});

test('single payload', function (t) {
const fn = path.resolve(__dirname, './scripts/single_payload.json');
const fn = path.resolve(__dirname, '../scripts/single_payload.json');
let script = require(fn);
script.config.target = `http://127.0.0.1:${port}`;

let data = fs.readFileSync(path.join(__dirname, 'pets.csv'));
let data = fs.readFileSync(path.join(__dirname, '../scripts/data/pets.csv'));
csv(data, function (err, parsedData) {
if (err) {
t.fail(err);
Expand Down Expand Up @@ -68,7 +68,7 @@ test('single payload', function (t) {
});

test('multiple_payloads', function (t) {
const fn = path.resolve(__dirname, './scripts/multiple_payloads.json');
const fn = path.resolve(__dirname, '../scripts/multiple_payloads.json');
let script = require(fn);
script.config.target = `http://127.0.0.1:${port}`;

Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/core/test_reuse.js → .../test/acceptance/multiple-runners.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const { test, afterEach, beforeEach } = require('tap');
const runner = require('../..').runner.runner;
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -17,7 +17,7 @@ afterEach(() => {
});

test('concurrent runners', function (t) {
let script = require('./scripts/hello.json');
let script = require('../scripts/hello.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee1) {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/core/test_parallel.js → ...ges/core/test/acceptance/parallel.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const { test, beforeEach, afterEach } = require('tap');
const runner = require('../..').runner.runner;
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -16,7 +16,7 @@ afterEach(() => {
});

test('parallel requests', (t) => {
const script = require('./scripts/parallel.json');
const script = require('../scripts/parallel.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/core/test_probability.js → .../core/test/acceptance/probability.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const { test, beforeEach, afterEach } = require('tap');
const runner = require('../..').runner.runner;
const { SSMS } = require('../../lib/ssms');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -17,7 +17,7 @@ afterEach(() => {
});

test('request probability', (t) => {
const script = require('./scripts/probability.json');
const script = require('../scripts/probability.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand Down
8 changes: 4 additions & 4 deletions packages/core/test/core/test_think.js → ...s/core/test/acceptance/think-time.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const { test, beforeEach, afterEach } = require('tap');
const runner = require('../..').runner.runner;
const { SSMS } = require('../../lib/ssms');
const l = require('lodash');
const createTestServer = require('./targets/simple');
const createTestServer = require('../targets/simple');

let server;
let port;
Expand All @@ -18,7 +18,7 @@ afterEach(() => {
});

test('think', function (t) {
const script = require('./scripts/thinks_http.json');
const script = require('../scripts/thinks_http.json');
script.config.target = `http://127.0.0.1:${port}`;

runner(script).then(function (ee) {
Expand All @@ -43,7 +43,7 @@ test('think', function (t) {
});

test('think - invalid think time', function (t) {
const script = l.cloneDeep(require('./scripts/thinks_http.json'));
const script = l.cloneDeep(require('../scripts/thinks_http.json'));
script.config.target = `http://127.0.0.1:${port}`;
delete script.scenarios[0].flow;
script.scenarios[0].flow = [{ think: '1 potatoe' }];
Expand All @@ -68,7 +68,7 @@ test('think - invalid think time', function (t) {
});

test('think - with defaults from config.http.defaults instead', function (t) {
const script = l.cloneDeep(require('./scripts/thinks_http.json'));
const script = l.cloneDeep(require('../scripts/thinks_http.json'));
script.config.target = `http://127.0.0.1:${port}`;
const think = script.config.defaults.think;
delete script.config.defaults;
Expand Down
0 packages/core/test/core/test_engine_ws.js → ...es/core/test/acceptance/ws-engine.test.js
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions packages/core/test/core/http/index.js
View file
Open in desktop

This file was deleted.

0 .../test/core/plugins/normal_plugin/index.js → .../core/test/plugins/normal_plugin/index.js
View file
Open in desktop
File renamed without changes.
0 ...t/core/plugins/normal_plugin/package.json → ...e/test/plugins/normal_plugin/package.json
View file
Open in desktop
File renamed without changes.
0 ...est/core/plugins/packaged_plugin/index.js → ...ore/test/plugins/packaged_plugin/index.js
View file
Open in desktop
File renamed without changes.
0 ...core/plugins/packaged_plugin/package.json → ...test/plugins/packaged_plugin/package.json
View file
Open in desktop
File renamed without changes.
Loading
Loading