From 10156b1f4984069fa4e18b1496aa479840bcc3d4 Mon Sep 17 00:00:00 2001
From: Jason Reed <jcreedcmu@github.com>
Date: Mon, 13 Jul 2020 12:46:17 -0400
Subject: [PATCH] Remove semmle-bqrs dependency from test.

---
 .../ql-vscode/test/pure-tests/query-test.ts   | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/extensions/ql-vscode/test/pure-tests/query-test.ts b/extensions/ql-vscode/test/pure-tests/query-test.ts
index 1b5d48037..2b3b640c3 100644
--- a/extensions/ql-vscode/test/pure-tests/query-test.ts
+++ b/extensions/ql-vscode/test/pure-tests/query-test.ts
@@ -2,8 +2,6 @@ import { expect } from 'chai';
 import * as fs from 'fs-extra';
 import 'mocha';
 import * as path from 'path';
-import { open as bqrsOpen, ColumnValue } from 'semmle-bqrs';
-import { FileReader } from 'semmle-io-node';
 import * as tmp from 'tmp';
 import * as url from 'url';
 import { CancellationTokenSource } from 'vscode-jsonrpc';
@@ -11,6 +9,7 @@ import * as messages from '../../src/messages';
 import * as qsClient from '../../src/queryserver-client';
 import * as cli from '../../src/cli';
 import { ProgressReporter, Logger } from '../../src/logging';
+import { ColumnValue } from '../../src/bqrs-cli-types';
 
 
 declare module 'url' {
@@ -204,24 +203,14 @@ describe('using the query server', function() {
 
     const actualResultSets: ResultSets = {};
     it(`should be able to parse results of query ${queryName}`, async function() {
-      let fileReader: FileReader | undefined;
-      try {
-        await evaluationSucceeded.done();
-        fileReader = await FileReader.open(RESULTS_PATH);
-        const resultSetsReader = await bqrsOpen(fileReader);
-        for (const reader of resultSetsReader.resultSets) {
-          const actualRows: ColumnValue[][] = [];
-          for await (const row of reader.readTuples()) {
-            actualRows.push(row);
-          }
-          actualResultSets[reader.schema.name] = actualRows;
-        }
-        parsedResults.resolve();
-      } finally {
-        if (fileReader) {
-          fileReader.dispose();
-        }
+      await evaluationSucceeded.done();
+      const info = await cliServer.bqrsInfo(RESULTS_PATH);
+
+      for (const resultSet of info["result-sets"]) {
+        const decoded = await cliServer.bqrsDecode(RESULTS_PATH, resultSet.name);
+        actualResultSets[resultSet.name] = decoded.tuples;
       }
+      parsedResults.resolve();
     });
 
     it(`should have correct results for query ${queryName}`, async function() {