Skip to content

Commit a3c6272

Browse files
author
Eunjae Lee
authored
chore: restructure folder (#89)
* chore: restructure folder for cts * chore: fix script * chore: restructure * chore: testing ci * revert: chore: testing ci This reverts commit 1404650. * chore: test ci * chore: test ci 2 * chore: revert tests * chore: move cts specs
1 parent 7a5e513 commit a3c6272

File tree

112 files changed

+20
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+20
-15
lines changed

tests/CTS/methods/responses/.gitkeep

Whitespace-only changes.

tests/CTS/methods/templates/java/requests.mustache

Whitespace-only changes.

tests/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"scripts": {
88
"build": "tsc",
99
"lint:fix": "yarn workspace javascript-tests lint:fix",
10-
"generate": "node dist/tests/src/main.js ${0:-javascript} ${1:-search}",
10+
"generate": "yarn generate:methods:requets ${0:-javascript} ${1:-search}",
11+
"generate:methods:requets": "node dist/tests/src/methods/requests/main.js ${0:-javascript} ${1:-search}",
1112
"start": "yarn build && yarn generate ${0:-javascript} ${1:-search} && yarn lint:fix"
1213
},
1314
"devDependencies": {

tests/src/client/.gitkeep

Whitespace-only changes.

tests/src/integrations/.gitkeep

Whitespace-only changes.

tests/src/cts.ts renamed to tests/src/methods/requests/cts.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import SwaggerParser from '@apidevtools/swagger-parser';
44
import type { OpenAPIV3 } from 'openapi-types';
55

66
import type { CTS, CTSBlock, Tests } from './types';
7-
import { removeObjectName, walk } from './utils';
7+
import { removeObjectName, walk } from '../../utils';
88

99
async function loadRequestsCTS(client: string): Promise<CTSBlock[]> {
1010
// load the list of operations from the spec
@@ -19,7 +19,7 @@ async function loadRequestsCTS(client: string): Promise<CTSBlock[]> {
1919

2020
const ctsClient: CTSBlock[] = [];
2121

22-
for await (const file of walk(`./CTS/clients/${client}/requests`)) {
22+
for await (const file of walk(`./CTS/methods/requests/${client}`)) {
2323
if (!file.name.endsWith('json')) {
2424
continue;
2525
}

tests/src/generate.ts renamed to tests/src/methods/requests/generate.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ import Mustache from 'mustache';
55
import { loadCTS } from './cts';
66
import { loadRequestsTemplate } from './templates';
77
import type { CTSBlock } from './types';
8-
import { extensionForLanguage } from './types';
9-
import { createClientName, packageNames } from './utils';
8+
import {
9+
createClientName,
10+
packageNames,
11+
extensionForLanguage,
12+
} from '../../utils';
1013

1114
async function createOutputDir(language: string): Promise<void> {
12-
await fsp.mkdir(`output/${language}`, { recursive: true });
13-
await fsp.mkdir(`output/${language}/tests`, { recursive: true });
15+
await fsp.mkdir(`output/${language}/tests/methods/requests`, {
16+
recursive: true,
17+
});
1418
}
1519

1620
async function generateRequestsTests(
@@ -35,7 +39,7 @@ async function generateRequestsTests(
3539
].includes(client),
3640
});
3741
await fsp.writeFile(
38-
`output/${language}/tests/${client}Requests.${extensionForLanguage[language]}`,
42+
`output/${language}/tests/methods/requests/${client}.${extensionForLanguage[language]}`,
3943
code
4044
);
4145
}

tests/src/main.ts renamed to tests/src/methods/requests/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-console */
22

33
import { generateTests } from './generate';
4-
import { packageNames } from './utils';
4+
import { packageNames } from '../../utils';
55

66
function printUsage(): void {
77
console.log(`usage: generateCTS language client`);

tests/src/templates.ts renamed to tests/src/methods/requests/templates.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import fsp from 'fs/promises';
22

33
export async function loadRequestsTemplate(language: string): Promise<string> {
44
return (
5-
await fsp.readFile(`CTS/templates/${language}/requests.mustache`)
5+
await fsp.readFile(`CTS/methods/templates/${language}/requests.mustache`)
66
).toString();
77
}

tests/src/types.ts renamed to tests/src/methods/requests/types.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,3 @@ export type CTSBlock = {
3030
export type CTS = {
3131
requests: CTSBlock[];
3232
};
33-
34-
export const extensionForLanguage: Record<string, string> = {
35-
javascript: 'test.ts',
36-
java: 'java',
37-
};

tests/src/utils.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,8 @@ export function removeObjectName(obj: Record<string, any>): void {
5656
}
5757
}
5858
}
59+
60+
export const extensionForLanguage: Record<string, string> = {
61+
javascript: 'test.ts',
62+
java: 'java',
63+
};

0 commit comments

Comments
 (0)