added tests

Author: ecmel

src/commands/serverCommand.ts

@@ -895,37 +895,43 @@ async function _executeQuery(
     );
   } else {
     /* istanbul ignore next */
-    const data = resultToBase64(results);
-    if (data) {
-      const active = ext.activeTextEditor;
-      if (active) {
-        const plot = <Plot>{
-          charts: [{ data }],
-        };
-        const uri = await addWorkspaceFile(
-          active.document.uri,
-          "plot",
-          ".plot",
-        );
-        if (!workspaceHas(uri)) {
-          await workspace.openTextDocument(uri);
-          await openWith(uri, ChartEditorProvider.viewType, ViewColumn.Beside);
+    if (ext.isResultsTabVisible) {
+      const data = resultToBase64(results);
+      if (data) {
+        const active = ext.activeTextEditor;
+        if (active) {
+          const plot = <Plot>{
+            charts: [{ data }],
+          };
+          const uri = await addWorkspaceFile(
+            active.document.uri,
+            "plot",
+            ".plot",
+          );
+          if (!workspaceHas(uri)) {
+            await workspace.openTextDocument(uri);
+            await openWith(
+              uri,
+              ChartEditorProvider.viewType,
+              ViewColumn.Beside,
+            );
+          }
+          await setUriContent(uri, JSON.stringify(plot));
         }
-        await setUriContent(uri, JSON.stringify(plot));
+      } else {
+        await writeQueryResultsToView(
+          results,
+          query,
+          connLabel,
+          executorName,
+          isInsights,
+          isWorkbook ? "WORKBOOK" : "SCRATCHPAD",
+          isPython,
+          duration,
+          isFromConnTree,
+          connVersion,
+        );
       }
-    } else if (ext.isResultsTabVisible) {
-      await writeQueryResultsToView(
-        results,
-        query,
-        connLabel,
-        executorName,
-        isInsights,
-        isWorkbook ? "WORKBOOK" : "SCRATCHPAD",
-        isPython,
-        duration,
-        isFromConnTree,
-        connVersion,
-      );
     } else {
       await writeQueryResultsToConsole(
         results,

src/utils/queryUtils.ts

@@ -396,30 +396,18 @@ export function formatScratchpadStacktrace(stacktrace: ScratchpadStacktrace) {
     .join("\n");
 }
 
+const PNG = ["0x89", "0x50", "0x4e", "0x47", "0x0d", "0x0a", "0x1a", "0x0a"];
+
 export function resultToBase64(result: any): string | undefined {
   const bytes =
-    result?.columns?.type === "bytes" ? result?.columns?.values : result;
-
-  if (Array.isArray(bytes) && bytes.length > 7) {
-    const png = [
-      "0x89",
-      "0x50",
-      "0x4e",
-      "0x47",
-      "0x0d",
-      "0x0a",
-      "0x1a",
-      "0x0a",
-    ];
-
-    for (let i = 0; i < png.length; i++) {
-      if (bytes[i] !== png[i] && bytes[i] !== parseInt(png[i], 16)) {
+    result?.columns?.type === "bytes" ? result.columns.values : result;
+  if (Array.isArray(bytes) && bytes.length > 66) {
+    for (let i = 0; i < PNG.length; i++) {
+      if (bytes[i] !== PNG[i] && bytes[i] !== parseInt(PNG[i], 16)) {
         return undefined;
       }
     }
-
     return `data:image/png;base64,${Buffer.from(bytes).toString("base64")}`;
   }
-
   return undefined;
 }

test/suite/utils.test.ts

@@ -1974,4 +1974,58 @@ describe("Utils", () => {
       );
     });
   });
+
+  describe("resultToBase64", () => {
+    const png = [
+      "0x89",
+      "0x50",
+      "0x4e",
+      "0x47",
+      "0x0d",
+      "0x0a",
+      "0x1a",
+      "0x0a",
+    ];
+    const img = Array.from({ length: 59 }, () => "0x00");
+
+    it("should return undefined for undefined", () => {
+      const result = queryUtils.resultToBase64(undefined);
+      assert.strictEqual(result, undefined);
+    });
+    it("should return undefined for just signature", () => {
+      const result = queryUtils.resultToBase64(png);
+      assert.strictEqual(result, undefined);
+    });
+    it("should return undefined for undefined for bad signature", () => {
+      const result = queryUtils.resultToBase64([
+        ...png.map((v) => parseInt(v, 16) + 1),
+        ,
+        ...img,
+      ]);
+      assert.strictEqual(result, undefined);
+    });
+    it("should return base64 for minimum img str", () => {
+      const result = queryUtils.resultToBase64([...png, ...img]);
+      assert.ok(result.startsWith("data:image/png;base64"));
+    });
+    it("should return base64 for minimum img num", () => {
+      const result = queryUtils.resultToBase64([
+        ...png.map((v) => parseInt(v, 16)),
+        ...img.map((v) => parseInt(v, 16)),
+      ]);
+      assert.ok(result.startsWith("data:image/png;base64"));
+    });
+    it("should return base64 for minimum img str for structuredText", () => {
+      const result = queryUtils.resultToBase64({
+        columns: { type: "bytes", values: [...png, ...img] },
+      });
+      assert.ok(result.startsWith("data:image/png;base64"));
+    });
+    it("should return undefined for bogus structuredText", () => {
+      const result = queryUtils.resultToBase64({
+        columns: { type: "bytes" },
+      });
+      assert.strictEqual(result, undefined);
+    });
+  });
 });