Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Commit 4c6e351

Browse files
axelsrzaxelsrz
committed
changed test folder structure to match with pattern
1 parent 1c35295 commit 4c6e351

29 files changed

+56
-49
lines changed

‎packages/luis/src/commands/luis/generate/cs.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ export default class LuisGenerateCs extends Command {
5454
)
5555

5656
await LuisToCsConverter.writeFromLuisJson(app, flags.className, space, outputPath)
57-
throw Error(`File was outputed at:${outputPath}`)
5857
} catch (err) {
5958
throw new CLIError(err)
6059
}

‎packages/luis/src/commands/luis/generate/ts.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export default class LuisGenerateTs extends Command {
4747
)
4848

4949
await LuisToTsConverter.writeFromLuisJson(app, flags.className, outputPath)
50-
throw Error(`File was outputed at:${outputPath}`)
5150
} catch (err) {
5251
throw new CLIError(err)
5352
}

‎packages/luis/src/utils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export namespace Utils {
88
const containingDir = dirname(completePath)
99

1010
// If the cointaining folder doesnt exist
11-
if (!existsSync(containingDir)) throw new CLIError("Path doesn't exist")
11+
if (!existsSync(containingDir)) throw new CLIError(`Containing directory path doesn't exist: ${containingDir}`)
1212

1313
const baseElement = basename(completePath)
1414
const pathAlreadyExist = existsSync(completePath)
@@ -19,7 +19,7 @@ export namespace Utils {
1919
}
2020

2121
// If the last element in the path is a folder
22-
if (!pathAlreadyExist) throw new CLIError("Path doesn't exist")
22+
if (!pathAlreadyExist) throw new CLIError(`Target directory path doesn't exist: ${completePath}`)
2323
completePath = join(completePath, defaultFileName)
2424
return existsSync(completePath) ? enumerateFileName(completePath) : completePath
2525
}
@@ -28,7 +28,7 @@ export namespace Utils {
2828
const fileName = basename(filePath)
2929
const containingDir = dirname(filePath)
3030

31-
if (!existsSync(containingDir)) throw new CLIError("Path doesn't exist")
31+
if (!existsSync(containingDir)) throw new CLIError(`Containing directory path doesn't exist: ${containingDir}`)
3232

3333
const extension = extname(fileName)
3434
const baseName = basename(fileName, extension)

‎packages/luis/test/commands/luis/generate/cs.test.ts‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,84 +11,88 @@ const compareSourceFiles = async function (file1: string, file2: string) {
1111
}
1212

1313
describe('luis:generate:cs', () => {
14+
before(async function () {
15+
await fs.ensureDir(path.join(__dirname, '../../../fixtures/generate/results'))
16+
})
17+
1418
after(async function () {
15-
await fs.emptyDir(path.join(__dirname, 'test_data/result_cs'))
19+
await fs.emptyDir(path.join(__dirname, '../../../fixtures/generate/results'))
1620
})
1721

1822
test
1923
.stdout()
2024
.command(['luis:generate:cs',
2125
'--in',
22-
`${path.join(__dirname, 'test_data/Intents.json')}`,
26+
`${path.join(__dirname, '../../../fixtures/generate/Intents.json')}`,
2327
'--out',
24-
`${path.join(__dirname, 'test_data/result_cs/Intents.cs')}`])
28+
`${path.join(__dirname, '../../../fixtures/generate/results/Intents.cs')}`])
2529
.it('Generates intents correctly', async () => {
26-
await compareSourceFiles('test_data/Intents.cs', 'test_data/result_cs/Intents.cs')
30+
await compareSourceFiles('../../../fixtures/generate/Intents.cs', '../../../fixtures/generate/results/Intents.cs')
2731
})
2832

2933
test
3034
.stdout()
3135
.command(['luis:generate:cs',
3236
'--in',
33-
`${path.join(__dirname, 'test_data/SimpleEntities.json')}`,
37+
`${path.join(__dirname, '../../../fixtures/generate/SimpleEntities.json')}`,
3438
'--out',
35-
`${path.join(__dirname, 'test_data/result_cs/SimpleEntities.cs')}`])
39+
`${path.join(__dirname, '../../../fixtures/generate/results/SimpleEntities.cs')}`])
3640
.it('Generates simple entities correctly', async () => {
37-
await compareSourceFiles('test_data/SimpleEntities.cs', 'test_data/result_cs/SimpleEntities.cs')
41+
await compareSourceFiles('../../../fixtures/generate/SimpleEntities.cs', '../../../fixtures/generate/results/SimpleEntities.cs')
3842
})
3943

4044
test
4145
.stdout()
4246
.command(['luis:generate:cs',
4347
'--in',
44-
`${path.join(__dirname, 'test_data/CompositeEntities.json')}`,
48+
`${path.join(__dirname, '../../../fixtures/generate/CompositeEntities.json')}`,
4549
'--out',
46-
`${path.join(__dirname, 'test_data/result_cs/CompositeEntities.cs')}`])
50+
`${path.join(__dirname, '../../../fixtures/generate/results/CompositeEntities.cs')}`])
4751
.it('Generates composites entities correctly', async () => {
48-
await compareSourceFiles('test_data/CompositeEntities.cs', 'test_data/result_cs/CompositeEntities.cs')
52+
await compareSourceFiles('../../../fixtures/generate/CompositeEntities.cs', '../../../fixtures/generate/results/CompositeEntities.cs')
4953
})
5054

5155
test
5256
.stdout()
5357
.command(['luis:generate:cs',
5458
'--in',
55-
`${path.join(__dirname, 'test_data/ClosedLists.json')}`,
59+
`${path.join(__dirname, '../../../fixtures/generate/ClosedLists.json')}`,
5660
'--out',
57-
`${path.join(__dirname, 'test_data/result_cs/ClosedLists.cs')}`])
61+
`${path.join(__dirname, '../../../fixtures/generate/results/ClosedLists.cs')}`])
5862
.it('Generates closed lists entities correctly', async () => {
59-
await compareSourceFiles('test_data/ClosedLists.cs', 'test_data/result_cs/ClosedLists.cs')
63+
await compareSourceFiles('../../../fixtures/generate/ClosedLists.cs', '../../../fixtures/generate/results/ClosedLists.cs')
6064
})
6165

6266
test
6367
.stdout()
6468
.command(['luis:generate:cs',
6569
'--in',
66-
`${path.join(__dirname, 'test_data/PatternEntities.json')}`,
70+
`${path.join(__dirname, '../../../fixtures/generate/PatternEntities.json')}`,
6771
'--out',
68-
`${path.join(__dirname, 'test_data/result_cs/PatternEntities.cs')}`])
72+
`${path.join(__dirname, '../../../fixtures/generate/results/PatternEntities.cs')}`])
6973
.it('Generates pattern entities correctly', async () => {
70-
await compareSourceFiles('test_data/PatternEntities.cs', 'test_data/result_cs/PatternEntities.cs')
74+
await compareSourceFiles('../../../fixtures/generate/PatternEntities.cs', '../../../fixtures/generate/results/PatternEntities.cs')
7175
})
7276

7377
test
7478
.stdout()
7579
.command(['luis:generate:cs',
7680
'--in',
77-
`${path.join(__dirname, 'test_data/RegexEntities.json')}`,
81+
`${path.join(__dirname, '../../../fixtures/generate/RegexEntities.json')}`,
7882
'--out',
79-
`${path.join(__dirname, 'test_data/result_cs/RegexEntities.cs')}`])
83+
`${path.join(__dirname, '../../../fixtures/generate/results/RegexEntities.cs')}`])
8084
.it('Generates regex entities correctly', async () => {
81-
await compareSourceFiles('test_data/RegexEntities.cs', 'test_data/result_cs/RegexEntities.cs')
85+
await compareSourceFiles('../../../fixtures/generate/RegexEntities.cs', '../../../fixtures/generate/results/RegexEntities.cs')
8286
})
8387

8488
test
8589
.stdout()
8690
.command(['luis:generate:cs',
8791
'--in',
88-
`${path.join(__dirname, 'test_data/PrebuiltEntities.json')}`,
92+
`${path.join(__dirname, '../../../fixtures/generate/PrebuiltEntities.json')}`,
8993
'--out',
90-
`${path.join(__dirname, 'test_data/result_cs/PrebuiltEntities.cs')}`])
94+
`${path.join(__dirname, '../../../fixtures/generate/results/PrebuiltEntities.cs')}`])
9195
.it('Generates prebuilt entities correctly', async () => {
92-
await compareSourceFiles('test_data/PrebuiltEntities.cs', 'test_data/result_cs/PrebuiltEntities.cs')
96+
await compareSourceFiles('../../../fixtures/generate/PrebuiltEntities.cs', '../../../fixtures/generate/results/PrebuiltEntities.cs')
9397
})
9498
})

‎packages/luis/test/commands/luis/generate/ts.test.ts‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,85 +11,90 @@ const compareSourceFiles = async function (file1: string, file2: string) {
1111
}
1212

1313
describe('luis:generate:ts', () => {
14+
before(async function () {
15+
await fs.ensureDir(path.join(__dirname, '../../../fixtures/generate/results'))
16+
})
17+
1418
after(async function () {
15-
await fs.emptyDir(path.join(__dirname, 'test_data/result_ts'))
19+
await fs.emptyDir(path.join(__dirname, '../../../fixtures/generate/results'))
1620
})
1721

22+
1823
test
1924
.stdout()
2025
.command(['luis:generate:ts',
2126
'--in',
22-
`${path.join(__dirname, 'test_data/Intents.json')}`,
27+
`${path.join(__dirname, '../../../fixtures/generate/Intents.json')}`,
2328
'--out',
24-
`${path.join(__dirname, 'test_data/result_ts/intents.ts')}`])
29+
`${path.join(__dirname, '../../../fixtures/generate/results/intents.ts')}`])
2530
.it('Generates intents correctly', async () => {
26-
await compareSourceFiles('test_data/intents.ts', 'test_data/result_ts/intents.ts')
31+
await compareSourceFiles('../../../fixtures/generate/intents.ts', '../../../fixtures/generate/results/intents.ts')
2732
})
2833

2934
test
3035
.stdout()
3136
.command(['luis:generate:ts',
3237
'--in',
33-
`${path.join(__dirname, 'test_data/SimpleEntities.json')}`,
38+
`${path.join(__dirname, '../../../fixtures/generate/SimpleEntities.json')}`,
3439
'--out',
35-
`${path.join(__dirname, 'test_data/result_ts/simple-entities.ts')}`])
40+
`${path.join(__dirname, '../../../fixtures/generate/results/simple-entities.ts')}`])
3641
.it('Generates simple entities correctly', async () => {
37-
await compareSourceFiles('test_data/simple-entities.ts', 'test_data/result_ts/simple-entities.ts')
42+
await compareSourceFiles('../../../fixtures/generate/simple-entities.ts', '../../../fixtures/generate/results/simple-entities.ts')
3843
})
3944

4045
test
4146
.stdout()
4247
.command(['luis:generate:ts',
4348
'--in',
44-
`${path.join(__dirname, 'test_data/CompositeEntities.json')}`,
49+
`${path.join(__dirname, '../../../fixtures/generate/CompositeEntities.json')}`,
4550
'--out',
46-
`${path.join(__dirname, 'test_data/result_ts/composite-entities.ts')}`])
51+
`${path.join(__dirname, '../../../fixtures/generate/results/composite-entities.ts')}`])
4752
.it('Generates composites entities correctly', async () => {
48-
await compareSourceFiles('test_data/composite-entities.ts', 'test_data/result_ts/composite-entities.ts')
53+
await compareSourceFiles('../../../fixtures/generate/composite-entities.ts', '../../../fixtures/generate/results/composite-entities.ts')
4954
})
5055

5156
test
5257
.stdout()
5358
.command(['luis:generate:ts',
5459
'--in',
55-
`${path.join(__dirname, 'test_data/ClosedLists.json')}`,
60+
`${path.join(__dirname, '../../../fixtures/generate/ClosedLists.json')}`,
5661
'--out',
57-
`${path.join(__dirname, 'test_data/result_ts/closed-lists.ts')}`])
62+
`${path.join(__dirname, '../../../fixtures/generate/results/closed-lists.ts')}`])
5863
.it('Generates closed lists entities correctly', async () => {
59-
await compareSourceFiles('test_data/closed-lists.ts', 'test_data/result_ts/closed-lists.ts')
64+
await compareSourceFiles('../../../fixtures/generate/closed-lists.ts', '../../../fixtures/generate/results/closed-lists.ts')
6065
})
6166

6267
test
6368
.stdout()
6469
.command(['luis:generate:ts',
6570
'--in',
66-
`${path.join(__dirname, 'test_data/PatternEntities.json')}`,
71+
`${path.join(__dirname, '../../../fixtures/generate/PatternEntities.json')}`,
6772
'--out',
68-
`${path.join(__dirname, 'test_data/result_ts/pattern-entities.ts')}`])
73+
`${path.join(__dirname, '../../../fixtures/generate/results/pattern-entities.ts')}`])
6974
.it('Generates pattern entities correctly', async () => {
70-
await compareSourceFiles('test_data/pattern-entities.ts', 'test_data/result_ts/pattern-entities.ts')
75+
await compareSourceFiles('../../../fixtures/generate/pattern-entities.ts', '../../../fixtures/generate/results/pattern-entities.ts')
7176
})
7277

7378
test
7479
.stdout()
7580
.command(['luis:generate:ts',
7681
'--in',
77-
`${path.join(__dirname, 'test_data/RegexEntities.json')}`,
82+
`${path.join(__dirname, '../../../fixtures/generate/RegexEntities.json')}`,
7883
'--out',
79-
`${path.join(__dirname, 'test_data/result_ts/regex-entities.ts')}`])
84+
`${path.join(__dirname, '../../../fixtures/generate/results/regex-entities.ts')}`])
8085
.it('Generates regex entities correctly', async () => {
81-
await compareSourceFiles('test_data/regex-entities.ts', 'test_data/result_ts/regex-entities.ts')
86+
await compareSourceFiles('../../../fixtures/generate/regex-entities.ts', '../../../fixtures/generate/results/regex-entities.ts')
8287
})
8388

8489
test
8590
.stdout()
8691
.command(['luis:generate:ts',
8792
'--in',
88-
`${path.join(__dirname, 'test_data/PrebuiltEntities.json')}`,
93+
`${path.join(__dirname, '../../../fixtures/generate/PrebuiltEntities.json')}`,
8994
'--out',
90-
`${path.join(__dirname, 'test_data/result_ts/prebuilt-entities.ts')}`])
95+
`${path.join(__dirname, '../../../fixtures/generate/results/prebuilt-entities.ts')}`])
9196
.it('Generates prebuilt entities correctly', async () => {
92-
await compareSourceFiles('test_data/prebuilt-entities.ts', 'test_data/result_ts/prebuilt-entities.ts')
97+
await compareSourceFiles('../../../fixtures/generate/prebuilt-entities.ts', '../../../fixtures/generate/results/prebuilt-entities.ts')
9398
})
9499

95100
})

packages/luis/test/commands/luis/generate/test_data/ClosedLists.cs renamed to packages/luis/test/fixtures/generate/ClosedLists.cs

File renamed without changes.

packages/luis/test/commands/luis/generate/test_data/ClosedLists.json renamed to packages/luis/test/fixtures/generate/ClosedLists.json

File renamed without changes.

packages/luis/test/commands/luis/generate/test_data/CompositeEntities.cs renamed to packages/luis/test/fixtures/generate/CompositeEntities.cs

File renamed without changes.

packages/luis/test/commands/luis/generate/test_data/CompositeEntities.json renamed to packages/luis/test/fixtures/generate/CompositeEntities.json

File renamed without changes.

packages/luis/test/commands/luis/generate/test_data/ContosoApp.cs renamed to packages/luis/test/fixtures/generate/ContosoApp.cs

File renamed without changes.

0 commit comments

Comments
 (0)