chore: Fix tests for cloud providers (#6377)

Author: ovr

packages/cubejs-athena-driver/test/AthenaDriver.test.ts

@@ -1,15 +1,27 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { DriverTests } from '@cubejs-backend/testing-shared';
+import { DriverTests, smartStringTrim } from '@cubejs-backend/testing-shared';
 
 import { AthenaDriver } from '../src';
 
+class AthenaDriverTest extends DriverTests {
+  protected getExpectedCsvRows() {
+    // Athena uses \N for null values
+    return smartStringTrim`
+      orders__status,orders__amount
+      new,300
+      processed,400
+      \N,500
+    `;
+  }
+}
+
 describe('AthenaDriver', () => {
-  let tests: DriverTests;
+  let tests: AthenaDriverTest;
 
   jest.setTimeout(2 * 60 * 1000);
 
   beforeAll(async () => {
-    tests = new DriverTests(
+    tests = new AthenaDriverTest(
       new AthenaDriver({}),
       {
         expectStringFields: true,

packages/cubejs-testing-shared/src/DriverTests.ts

@@ -47,11 +47,14 @@ export class DriverTests {
     { id: 4, amount: 500, status: null },
   ];
 
-  public static CSV_ROWS = dedent`
-    orders__status,orders__amount
-    new,300
-    processed,400
-  `;
+  protected getExpectedCsvRows() {
+    return dedent`
+      orders__status,orders__amount
+      new,300
+      processed,400
+      ,500
+    `;
+  }
 
   public async testQuery() {
     const rows = await this.driver.query(DriverTests.QUERY, []);
@@ -73,16 +76,16 @@ export class DriverTests {
       SELECT orders.status AS orders__status, sum(orders.amount) AS orders__amount        
       FROM (${DriverTests.QUERY}) AS orders
       GROUP BY 1
-      ORDER BY 1
+      ORDER BY 2
     `;
     const tableName = await this.createUnloadTable(query);
     assert(this.driver.unload);
     const data = await this.driver.unload(tableName, { maxFileSize: 64 });
     expect(data.csvFile.length).toEqual(1);
     const string = await downloadAndGunzip(data.csvFile[0]);
     const expectedRows = this.options.csvNoHeader
-      ? DriverTests.skipFirstLine(DriverTests.CSV_ROWS)
-      : DriverTests.CSV_ROWS;
+      ? DriverTests.skipFirstLine(this.getExpectedCsvRows())
+      : this.getExpectedCsvRows();
     expect(string.trim()).toEqual(expectedRows);
   }
 
@@ -171,15 +174,17 @@ export class DriverTests {
     return text.split('\n').slice(1).join('\n');
   }
 
-  private static rowsToString(rows: Record<string, any>[]): Record<string, string>[] {
-    const result: Record<string, string>[] = [];
+  private static rowsToString(rows: Record<string, any>[]): Record<string, string | null>[] {
+    const result: Record<string, string | null>[] = [];
+
     for (const row of rows) {
       const newRow: Record<string, string> = {};
       for (const k of Object.keys(row)) {
-        newRow[k] = row[k].toString();
+        newRow[k] = row[k] === null ? null : row[k].toString();
       }
       result.push(newRow);
     }
+
     return result;
   }
 }

packages/cubejs-testing-shared/src/index.ts

@@ -1,6 +1,10 @@
+import dedent from 'dedent';
+
 export * from './query-test.abstract';
 export * from './DriverTests';
 export * from './utils';
 export * from './response-fake';
 
 export * from './db';
+
+export const smartStringTrim = dedent;