From 7e0a5205b266bfc5c49fa297fd0ee687fdfbc5c1 Mon Sep 17 00:00:00 2001 From: Udeesha Gautam <46980425+udeeshagautam@users.noreply.github.com> Date: Tue, 17 Sep 2019 14:11:23 -0700 Subject: [PATCH] Fix Failng dacpac and SC integration tests (#7245) --- extensions/integration-tests/src/dacpac.test.ts | 6 ++++-- .../integration-tests/src/schemaCompare.test.ts | 10 +++++----- .../{src => }/testData/Database1.bacpac | Bin .../{src => }/testData/Database1.dacpac | Bin .../{src => }/testData/Database2.dacpac | Bin 5 files changed, 9 insertions(+), 7 deletions(-) rename extensions/integration-tests/{src => }/testData/Database1.bacpac (100%) rename extensions/integration-tests/{src => }/testData/Database1.dacpac (100%) rename extensions/integration-tests/{src => }/testData/Database2.dacpac (100%) diff --git a/extensions/integration-tests/src/dacpac.test.ts b/extensions/integration-tests/src/dacpac.test.ts index bf56c0ea5b..e7f72e37ec 100644 --- a/extensions/integration-tests/src/dacpac.test.ts +++ b/extensions/integration-tests/src/dacpac.test.ts @@ -18,6 +18,8 @@ import { getStandaloneServer } from './testConfig'; import assert = require('assert'); const retryCount = 24; // 2 minutes +const dacpac1: string = path.join(__dirname, '../testData/Database1.dacpac'); +const bacpac1: string = path.join(__dirname, '../testData/Database1.bacpac'); if (context.RunTest) { suite('Dacpac integration test suite', () => { suiteSetup(async function () { @@ -40,7 +42,7 @@ if (context.RunTest) { assert(dacfxService, 'DacFx Service Provider is not available'); // Deploy dacpac - const deployResult = await dacfxService.deployDacpac(path.join(__dirname, 'testData/Database1.dacpac'), databaseName, false, ownerUri, azdata.TaskExecutionMode.execute); + const deployResult = await dacfxService.deployDacpac(dacpac1, databaseName, false, ownerUri, azdata.TaskExecutionMode.execute); await utils.assertDatabaseCreationResult(databaseName, ownerUri, retryCount); await utils.assertTableCreationResult(databaseName, 'dbo', 'Table1', ownerUri, retryCount); await utils.assertTableCreationResult(databaseName, 'dbo', 'Table2', ownerUri, retryCount); @@ -76,7 +78,7 @@ if (context.RunTest) { assert(dacfxService, 'DacFx Service Provider is not available'); // Import bacpac - const importResult = await dacfxService.importBacpac(path.join(__dirname, 'testData/Database1.bacpac'), databaseName, ownerUri, azdata.TaskExecutionMode.execute); + const importResult = await dacfxService.importBacpac(bacpac1, databaseName, ownerUri, azdata.TaskExecutionMode.execute); await utils.assertDatabaseCreationResult(databaseName, ownerUri, retryCount); await utils.assertTableCreationResult(databaseName, 'dbo', 'Table1', ownerUri, retryCount, true); await utils.assertTableCreationResult(databaseName, 'dbo', 'Table2', ownerUri, retryCount, true); diff --git a/extensions/integration-tests/src/schemaCompare.test.ts b/extensions/integration-tests/src/schemaCompare.test.ts index d26be7fe50..4058eb3f85 100644 --- a/extensions/integration-tests/src/schemaCompare.test.ts +++ b/extensions/integration-tests/src/schemaCompare.test.ts @@ -19,9 +19,10 @@ import { getStandaloneServer } from './testConfig'; import { stressify } from 'adstest'; let schemaCompareService: mssql.ISchemaCompareService; +let dacfxService: mssql.IDacFxService; let schemaCompareTester: SchemaCompareTester; -let dacpac1: string = path.join(__dirname, 'testData/Database1.dacpac'); -let dacpac2: string = path.join(__dirname, 'testData/Database2.dacpac'); +const dacpac1: string = path.join(__dirname, '../testData/Database1.dacpac'); +const dacpac2: string = path.join(__dirname, '../testData/Database2.dacpac'); const SERVER_CONNECTION_TIMEOUT: number = 3000; const retryCount = 24; // 2 minutes const folderPath = path.join(os.tmpdir(), 'SchemaCompareTest'); @@ -38,6 +39,7 @@ if (context.RunTest) { attempts--; await utils.sleep(1000); // To ensure the providers are registered. } + dacfxService = ((await vscode.extensions.getExtension(mssql.extension.name).activate() as mssql.IExtension)).dacFx; schemaCompareTester = new SchemaCompareTester(); console.log(`Start schema compare tests`); }); @@ -120,7 +122,6 @@ class SchemaCompareTester { const targetDB: string = 'ads_schemaCompare_targetDB_' + now.getTime().toString(); try { - let dacfxService = ((await vscode.extensions.getExtension(mssql.extension.name).activate() as mssql.IExtension)).dacFx; assert(dacfxService, 'DacFx Service Provider is not available'); let result1 = await dacfxService.deployDacpac(dacpac1, sourceDB, true, ownerUri, azdata.TaskExecutionMode.execute); let result2 = await dacfxService.deployDacpac(dacpac2, targetDB, true, ownerUri, azdata.TaskExecutionMode.execute); @@ -200,9 +201,8 @@ class SchemaCompareTester { const targetDB: string = 'ads_schemaCompare_targetDB_' + now.getTime().toString(); try { - let dacfxService = (vscode.extensions.getExtension('mssql').exports as mssql.IExtension).dacFx; assert(dacfxService, 'DacFx Service Provider is not available'); - let result = await dacfxService.deployDacpac(path.join(__dirname, 'testData/Database2.dacpac'), targetDB, true, ownerUri, azdata.TaskExecutionMode.execute); + let result = await dacfxService.deployDacpac(dacpac2, targetDB, true, ownerUri, azdata.TaskExecutionMode.execute); assert(result.success === true, 'Deploy database 2 (target) should succeed'); diff --git a/extensions/integration-tests/src/testData/Database1.bacpac b/extensions/integration-tests/testData/Database1.bacpac similarity index 100% rename from extensions/integration-tests/src/testData/Database1.bacpac rename to extensions/integration-tests/testData/Database1.bacpac diff --git a/extensions/integration-tests/src/testData/Database1.dacpac b/extensions/integration-tests/testData/Database1.dacpac similarity index 100% rename from extensions/integration-tests/src/testData/Database1.dacpac rename to extensions/integration-tests/testData/Database1.dacpac diff --git a/extensions/integration-tests/src/testData/Database2.dacpac b/extensions/integration-tests/testData/Database2.dacpac similarity index 100% rename from extensions/integration-tests/src/testData/Database2.dacpac rename to extensions/integration-tests/testData/Database2.dacpac