/
merge.test.ts
472 lines (423 loc) · 19.8 KB
/
merge.test.ts
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
/*!
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License.
*/
// tslint:disable:no-console
// tslint:disable:no-object-literal-type-assertion
import * as fs from 'fs-extra'
import * as glob from 'globby'
import 'mocha'
import * as ppath from 'path'
import * as os from 'os'
import * as assert from 'assert'
import * as gen from '../src/dialogGenerator'
import {compareToOracle} from './generate.test'
type Diff = {
file: string,
position: number
}
type Comparison = {
original: string, originalFiles: string[], originalOnly: string[],
merged: string, mergedFiles: string[], mergedOnly: string[],
same: string[],
different: Diff[]
}
function filePaths(files: string[], base: string): string {
return files.map(f => ppath.resolve(base, f)).join('\n ')
}
function displayCompare(comparison: Comparison) {
console.log(`Compare ${comparison.original} to ${comparison.merged}`)
console.log(` originalOnly:\n ${filePaths(comparison.originalOnly, comparison.original)}`)
console.log(` mergedOnly:\n ${filePaths(comparison.mergedOnly, comparison.merged)}`)
console.log(` same:\n ${comparison.same.join('\n ')}`)
console.log(` different:\n ${comparison.different.map(d => `${d.position}: ${ppath.resolve(comparison.original, d.file)} != ${ppath.resolve(comparison.merged, d.file)}`).join('\n ')}`)
}
function assertCheck(comparison: Comparison, errors: string[]) {
if (errors.length > 0) {
displayCompare(comparison)
assert.fail(os.EOL + errors.join(os.EOL))
}
}
async function allFiles(base: string, path: string, files: Set<string>) {
const stats = await fs.lstat(path)
if (stats.isDirectory()) {
for (const child of await fs.readdir(path)) {
await allFiles(base, ppath.join(path, child), files)
}
} else {
files.add(ppath.relative(base, path))
}
}
async function compareDirs(original: string, merged: string): Promise<Comparison> {
const comparison: Comparison = {original, originalFiles: [], merged, mergedFiles: [], originalOnly: [], mergedOnly: [], same: [], different: []}
const originalFiles = new Set<string>()
const mergedFiles = new Set<string>()
await allFiles(original, original, originalFiles)
await allFiles(merged, merged, mergedFiles)
comparison.originalFiles = Array.from(originalFiles)
comparison.mergedFiles = Array.from(mergedFiles)
for (const file1 of originalFiles) {
if (mergedFiles.has(file1)) {
// See if files are the same
const originalVal = await fs.readFile(ppath.join(original, file1), 'utf-8')
const mergedVal = await fs.readFile(ppath.join(merged, file1), 'utf-8')
if (originalVal === mergedVal) {
comparison.same.push(file1)
} else {
let pos = 0
while (pos < originalVal.length && pos < mergedVal.length) {
if (originalVal[pos] !== mergedVal[pos]) {
break
}
++pos
}
comparison.different.push({file: file1, position: pos})
}
} else {
comparison.originalOnly.push(file1)
}
}
comparison.mergedOnly = [...mergedFiles].filter(x => !originalFiles.has(x))
return comparison
}
function entryCompare(comparison: Comparison, name: string, expected: number | string[] | undefined, errors: string[]) {
if (expected) {
const value = comparison[name] as string[]
if (typeof expected === 'number') {
if (value.length !== expected) {
errors.push(`${name}: ${value.length} != ${expected}`)
}
} else {
for (const expect of expected as string[]) {
if (!value.includes(expect)) {
errors.push(`${name} does not contain ${expect}`)
}
}
}
}
}
function assertCompare(
comparison: Comparison,
errors: string[],
same?: number | string[],
different?: number | string[],
originalOnly?: number | string[],
mergedOnly?: number | string[]): boolean {
entryCompare(comparison, 'same', same, errors)
entryCompare(comparison, 'different', different, errors)
entryCompare(comparison, 'originalOnly', originalOnly, errors)
entryCompare(comparison, 'mergedOnly', mergedOnly, errors)
return errors.length > 0
}
function assertRemoved(comparison: Comparison, file: string, errors: string[]) {
if (comparison.mergedFiles.includes(file)) {
errors.push(`Did not expect ${file} in merged`)
}
}
function assertAddedProperty(comparison: Comparison, added: string, errors: string[]): string[] {
const found: string[] = []
for (const file of comparison.mergedFiles) {
if (file.includes(added)) {
found.push(file)
}
}
if (found.length === 0) {
errors.push(`Missing ${added} in merged files`)
}
return found
}
function assertRemovedProperty(comparison: Comparison, removed: string, errors: string[]): string[] {
const found: string[] = []
for (const file of comparison.mergedFiles) {
if (file.includes(removed)) {
found.push(file)
}
}
if (found.length > 0) {
errors.push(`Found ${removed} in merged files`)
}
return found
}
const output_dir = ppath.join(os.tmpdir(), 'mergeTest')
const merge_data = 'test/merge_data'
const modified_data = `${merge_data}/modified`
const originalSchema = ppath.join(merge_data, 'sandwichMerge.form')
const modifiedSchema = ppath.join(merge_data, 'sandwichMerge-modified.form')
const originalDir = ppath.join(output_dir, 'sandwichMerge-original')
const mergedDir = ppath.join(output_dir, 'sandwichMerge-merged')
function errorOnly(type: gen.FeedbackType, msg: string): void {
if ((type === gen.FeedbackType.warning && !msg.startsWith('Replace')) || type === gen.FeedbackType.error) {
assert.fail(`${type}: ${msg}`)
}
}
function feedback(type: gen.FeedbackType, msg: string): void {
if (type !== gen.FeedbackType.debug) {
console.log(`${type}: ${msg}`)
}
if ((type === gen.FeedbackType.warning && !msg.startsWith('Replace')) || type === gen.FeedbackType.error) {
assert.fail(`${type}: ${msg}`)
}
}
async function assertContains(file: string, regex: RegExp, errors: string[]) {
const val = await fs.readFile(ppath.join(mergedDir, file), 'utf8')
if (!val.match(regex)) {
errors.push(`${file} does not contain expected ${regex}`)
}
}
async function assertMissing(file: string, regex: RegExp, errors: string[]) {
const val = await fs.readFile(ppath.join(mergedDir, file), 'utf8')
if (val.match(regex)) {
errors.push(`${file} contains unexpected ${regex}`)
}
}
async function assertUnchanged(file: string, expected: boolean, errors: string[]) {
const unchanged = await gen.isUnchanged(ppath.join(mergedDir, file))
if (unchanged !== expected) {
errors.push(`${file} is unexpectedly ${expected ? 'changed' : 'unchanged'}`)
}
}
async function copyToMerged(pattern: string) {
const pathPattern = ppath.join(modified_data, pattern).replace(/\\/g, '/')
for (const path of await glob(pathPattern)) {
const file = ppath.relative(modified_data, path)
const dest = ppath.join(mergedDir, file)
console.log(`Modifying ${dest}`)
await fs.copyFile(path, dest)
}
}
async function deleteMerged(pattern: string) {
const pathPattern = ppath.join(mergedDir, pattern).replace(/\\/g, '/')
for (const file of await glob(pathPattern)) {
console.log(`Deleting ${file}`)
await fs.unlink(file)
}
}
function beforeSetup(singleton: boolean) {
return async function () {
try {
console.log('Deleting output directory')
await fs.remove(output_dir)
console.log('Generating original files')
await gen.generate(originalSchema, {
prefix: 'sandwichMerge',
outDir: originalDir,
singleton: singleton,
feedback: errorOnly
})
} catch (e) {
assert.fail((e as Error).message)
}
}
}
function beforeEachSetup() {
return async function () {
try {
console.log('\n\nCopying original generated to merged')
await fs.remove(mergedDir)
await fs.copy(originalDir, mergedDir)
} catch (e) {
assert.fail((e as Error).message)
}
}
}
describe('dialog:generate --merge files', async function () {
before(beforeSetup(false))
beforeEach(beforeEachSetup())
// Ensure merge with no changes is unchanged
it('merge: self', async function () {
try {
console.log('Self merging')
await gen.generate(originalSchema, {
outDir: mergedDir,
merge: true,
feedback
})
const comparison = await compareDirs(originalDir, mergedDir)
const errors: string[] = []
assertCompare(comparison, errors, comparison.originalFiles.length)
assertCheck(comparison, errors)
} catch (e) {
assert.fail((e as Error).message)
}
})
// Ensure merge with modified schema changes as expected
it('merge: modified', async function () {
try {
console.log('Modified merge')
await gen.generate(modifiedSchema, {
prefix: 'sandwichMerge',
outDir: mergedDir,
merge: true,
feedback
})
const comparison = await compareDirs(originalDir, mergedDir)
const errors = []
assertAddedProperty(comparison, 'Hobby', errors)
assertRemovedProperty(comparison, 'Meat', errors)
assertRemovedProperty(comparison, 'Toppings', errors)
assertRemovedProperty(comparison, 'Sauces', errors)
await assertContains('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', /black/, errors)
await assertMissing('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', /white/, errors)
//sandwichMerge
await assertContains('language-generation/en-us/CheeseValue/sandwichMerge-CheeseValue.en-us.lg', /brie/, errors)
// Unchanged hash + optional enum fixes = hash updated
await assertUnchanged('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', true, errors)
await assertUnchanged('language-generation/en-us/Name/sandwichMerge-Name.en-us.lg', true, errors)
assertCheck(comparison, errors)
} catch (e) {
assert.fail((e as Error).message)
}
})
// Respect user changes
it('merge: respect changes', async function () {
try {
// Modify a dialog file it should stay unchanged except for main.dialog which should be updated, but not hash updated
// Remove a dialog file and it should not come back
// Modify an .lu file and it should have enum updated, but not hash
// Modify an .lg file and it should have enum updated, but not hash
console.log('Respect changes merge')
await copyToMerged('**/language-generation/en-us/Bread/*')
await copyToMerged('**/language-generation/en-us/BreadValue/*')
await copyToMerged('**/language-understanding/en-us/Bread/*')
await copyToMerged('**/language-understanding/en-us/form/*')
const dialogPath = ppath.join(mergedDir, 'sandwichMerge.dialog')
const old = await fs.readJSON(dialogPath)
old.$comment = 'changed dialog'
old.triggers = ["sandwichMerge-foo-missing", ...old.triggers.filter(t => t !== 'sandwichMerge-price-remove-money')]
await fs.writeJSON(dialogPath, old)
await copyToMerged('dialogs/sandwichMerge-foo-missing.dialog')
await deleteMerged('dialogs/Price/sandwichMerge-price-remove-money.dialog')
await gen.generate(modifiedSchema, {
prefix: 'sandwichMerge',
outDir: mergedDir,
merge: true,
feedback
})
const comparison = await compareDirs(originalDir, mergedDir)
const errors = []
// Changed + optional enum fixes = hash not updated, so still changed
await assertUnchanged('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', false, errors)
await assertUnchanged('sandwichMerge.dialog', false, errors)
// Despite enum update, hash updated so unchanged
await assertUnchanged('language-generation/en-us/CheeseValue/sandwichMerge-CheeseValue.en-us.lg', true, errors)
// Main should still be updated
await assertContains('sandwichMerge.dialog', /sandwichMerge-foo/, errors)
await assertMissing('sandwichMerge.dialog', /sandwichMerge-price-remove-money/, errors)
await assertContains('sandwichMerge.dialog', /changed dialog/, errors)
// Removed should stay removed
assertRemoved(comparison, 'dialogs/sandwichMerged-price-remove-money.dialog', errors)
// Still get enum updates
await assertContains('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', /black/, errors)
await assertMissing('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', /white/, errors)
//sandwichMerge
await assertMissing('language-understanding/en-us/sandwichMerge.en-us.lu', /pulled/, errors)
await assertContains('language-understanding/en-us/Bread/sandwichMerge-Bread-BreadValue.en-us.lu', />- {BreadProperty={BreadValue=rye}}/, errors)
await assertContains('language-understanding/en-us/Bread/sandwichMerge-Bread-BreadValue.en-us.lu', /black/, errors)
assertCheck(comparison, errors)
} catch (e) {
assert.fail((e as Error).message)
}
})
})
describe('dialog:generate --merge singleton', async function () {
before(beforeSetup(true))
beforeEach(beforeEachSetup())
// Ensure merge with no changes is unchanged
it('merge singleton: self', async function () {
try {
console.log('Self merging')
await gen.generate(originalSchema, {
outDir: mergedDir,
merge: true,
singleton: true,
feedback
})
const comparison = await compareDirs(originalDir, mergedDir)
const errors: string[] = []
assertCompare(comparison, errors, comparison.originalFiles.length)
assertCheck(comparison, errors)
} catch (e) {
assert.fail((e as Error).message)
}
})
// Ensure merge with modified schema changes as expected
it('merge singleton: modified', async function () {
try {
console.log('Modified merge')
await gen.generate(modifiedSchema, {
prefix: 'sandwichMerge',
outDir: mergedDir,
merge: true,
singleton: true,
feedback
})
const comparison = await compareDirs(originalDir, mergedDir)
const errors = []
assertAddedProperty(comparison, 'Hobby', errors)
assertRemovedProperty(comparison, 'Meat', errors)
assertRemovedProperty(comparison, 'Toppings', errors)
assertRemovedProperty(comparison, 'Sauces', errors)
await assertContains('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', /black/, errors)
await assertMissing('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', /white/, errors)
await assertContains('language-generation/en-us/CheeseValue/sandwichMerge-CheeseValue.en-us.lg', /brie/, errors)
// Unchanged hash + optional enum fixes = hash updated
await assertUnchanged('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', true, errors)
await assertUnchanged('language-generation/en-us/Name/sandwichMerge-Name.en-us.lg', true, errors)
assertCheck(comparison, errors)
await compareToOracle(ppath.join(mergedDir, 'sandwichMerge.dialog'))
} catch (e) {
assert.fail((e as Error).message)
}
})
// Respect user changes
it('merge singleton: respect changes', async function () {
try {
// Modify a dialog file it should stay unchanged except for main.dialog which should be updated, but not hash updated
// Remove a dialog file and it should not come back
// Modify an .lu file and it should have enum updated, but not hash
// Modify an .lg file and it should have enum updated, but not hash
console.log('Respect changes merge')
await copyToMerged('**/language-generation/en-us/Bread/*')
await copyToMerged('**/language-generation/en-us/BreadValue/*')
await copyToMerged('**/language-understanding/en-us/Bread/*')
await copyToMerged('**/language-understanding/en-us/sandwichMerge.en-us.lu')
// Modify an existing trigger and add a custom trigger
const dialogPath = ppath.join(mergedDir, 'sandwichMerge.dialog')
const oldDialog = await fs.readJSON(dialogPath)
const modifiedTrigger = oldDialog.triggers[1]
const reorderedTrigger = oldDialog.triggers[2]
modifiedTrigger.actions.push({$kind: "Microsoft.SetProperty"})
const newTrigger = {$kind: "Microsoft.OnCondition", actions: []}
oldDialog.triggers.splice(3, 1, newTrigger, reorderedTrigger)
oldDialog.triggers.splice(2, 1)
await fs.writeFile(dialogPath, gen.stringify(oldDialog))
await gen.generate(modifiedSchema, {
prefix: 'sandwichMerge',
outDir: mergedDir,
merge: true,
singleton: true,
feedback
})
const comparison = await compareDirs(originalDir, mergedDir)
const errors = []
// Changed + optional enum fixes = hash not updated, so still changed
await assertUnchanged('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', false, errors)
await assertUnchanged('sandwichMerge.dialog', false, errors)
// Despite enum update, hash updated so unchanged
await assertUnchanged('language-generation/en-us/CheeseValue/sandwichMerge-CheeseValue.en-us.lg', true, errors)
// Still get enum updates
await assertContains('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', /black/, errors)
await assertMissing('language-generation/en-us/BreadValue/sandwichMerge-BreadValue.en-us.lg', /white/, errors)
await assertMissing('language-understanding/en-us/sandwichMerge.en-us.lu', /pulled/, errors)
await assertContains('language-understanding/en-us/Bread/sandwichMerge-Bread-BreadValue.en-us.lu', />- {BreadProperty={BreadValue=rye}}/, errors)
await assertContains('language-understanding/en-us/Bread/sandwichMerge-Bread-BreadValue.en-us.lu', /black/, errors)
assertCheck(comparison, errors)
const mergedDialog = await fs.readJSON(dialogPath)
assert.deepStrictEqual(mergedDialog.triggers[1], modifiedTrigger, 'Did not preserve modified trigger')
assert.deepStrictEqual(mergedDialog.triggers[2], newTrigger, 'Did not preserve custom trigger')
assert.deepStrictEqual(mergedDialog.triggers[3], reorderedTrigger, 'Did not preserve reordered trigger')
} catch (e) {
assert.fail((e as Error).message)
}
})
})