Add foreground tests

src/renderer/webgl/WebglRenderer.api.ts

@@ -35,7 +35,7 @@ describe('WebGL Renderer Integration Tests', () => {
   });
 
   describe('WebGL Renderer', () => {
-    it.only('background colors normal', async function(): Promise<any> {
+    it('foreground colors normal', async function(): Promise<any> {
       this.timeout(10000);
       await openTerminal({
         rendererType: 'dom',
@@ -50,20 +50,73 @@ describe('WebGL Renderer Integration Tests', () => {
           white: '#161718'
         }
       });
-      // await writeSync(`\\x1b[41m${' '.repeat(5 * 5)}`);
+      await writeSync(`\\x1b[30m█\\x1b[31m█\\x1b[32m█\\x1b[33m█\\x1b[34m█\\x1b[35m█\\x1b[36m█\\x1b[37m█`);
-      await writeSync(`\\x1b[40m \\x1b[41m \\x1b[42m \\x1b[43m \\x1b[44m \\x1b[45m \\x1b[46m \\x1b[47m `);
       await page.evaluate(`window.term.loadWebgl(true);`);
-      assert.deepEqual(await getCellBgColor(1, 1), [1, 2, 3, 255]);
+      assert.deepEqual(await getCellColor(1, 1), [1, 2, 3, 255]);
-      assert.deepEqual(await getCellBgColor(2, 1), [4, 5, 6, 255]);
+      assert.deepEqual(await getCellColor(2, 1), [4, 5, 6, 255]);
-      assert.deepEqual(await getCellBgColor(3, 1), [7, 8, 9, 255]);
+      assert.deepEqual(await getCellColor(3, 1), [7, 8, 9, 255]);
-      assert.deepEqual(await getCellBgColor(4, 1), [10, 11, 12, 255]);
+      assert.deepEqual(await getCellColor(4, 1), [10, 11, 12, 255]);
-      assert.deepEqual(await getCellBgColor(5, 1), [13, 14, 15, 255]);
+      assert.deepEqual(await getCellColor(5, 1), [13, 14, 15, 255]);
-      assert.deepEqual(await getCellBgColor(6, 1), [16, 17, 18, 255]);
+      assert.deepEqual(await getCellColor(6, 1), [16, 17, 18, 255]);
-      assert.deepEqual(await getCellBgColor(7, 1), [19, 20, 21, 255]);
+      assert.deepEqual(await getCellColor(7, 1), [19, 20, 21, 255]);
-      assert.deepEqual(await getCellBgColor(8, 1), [22, 23, 24, 255]);
+      assert.deepEqual(await getCellColor(8, 1), [22, 23, 24, 255]);
     });
 
-    it.only('background colors bright', async function(): Promise<any> {
+    it('foreground colors bright', async function(): Promise<any> {
+      this.timeout(10000);
+      await openTerminal({
+        rendererType: 'dom',
+        theme: {
+          brightBlack: '#010203',
+          brightRed: '#040506',
+          brightGreen: '#070809',
+          brightYellow: '#0a0b0c',
+          brightBlue: '#0d0e0f',
+          brightMagenta: '#101112',
+          brightCyan: '#131415',
+          brightWhite: '#161718'
+        }
+      });
+      await writeSync(`\\x1b[90m█\\x1b[91m█\\x1b[92m█\\x1b[93m█\\x1b[94m█\\x1b[95m█\\x1b[96m█\\x1b[97m█`);
+      await page.evaluate(`window.term.loadWebgl(true);`);
+      assert.deepEqual(await getCellColor(1, 1), [1, 2, 3, 255]);
+      assert.deepEqual(await getCellColor(2, 1), [4, 5, 6, 255]);
+      assert.deepEqual(await getCellColor(3, 1), [7, 8, 9, 255]);
+      assert.deepEqual(await getCellColor(4, 1), [10, 11, 12, 255]);
+      assert.deepEqual(await getCellColor(5, 1), [13, 14, 15, 255]);
+      assert.deepEqual(await getCellColor(6, 1), [16, 17, 18, 255]);
+      assert.deepEqual(await getCellColor(7, 1), [19, 20, 21, 255]);
+      assert.deepEqual(await getCellColor(8, 1), [22, 23, 24, 255]);
+    });
+
+    it('background colors normal', async function(): Promise<any> {
+      this.timeout(10000);
+      await openTerminal({
+        rendererType: 'dom',
+        theme: {
+          black: '#010203',
+          red: '#040506',
+          green: '#070809',
+          yellow: '#0a0b0c',
+          blue: '#0d0e0f',
+          magenta: '#101112',
+          cyan: '#131415',
+          white: '#161718'
+        }
+      });
+      await writeSync(`\\x1b[40m \\x1b[41m \\x1b[42m \\x1b[43m \\x1b[44m \\x1b[45m \\x1b[46m \\x1b[47m `);
+      await page.evaluate(`window.term.loadWebgl(true);`);
+      assert.deepEqual(await getCellColor(1, 1), [1, 2, 3, 255]);
+      assert.deepEqual(await getCellColor(2, 1), [4, 5, 6, 255]);
+      assert.deepEqual(await getCellColor(3, 1), [7, 8, 9, 255]);
+      assert.deepEqual(await getCellColor(4, 1), [10, 11, 12, 255]);
+      assert.deepEqual(await getCellColor(5, 1), [13, 14, 15, 255]);
+      assert.deepEqual(await getCellColor(6, 1), [16, 17, 18, 255]);
+      assert.deepEqual(await getCellColor(7, 1), [19, 20, 21, 255]);
+      assert.deepEqual(await getCellColor(8, 1), [22, 23, 24, 255]);
+    });
+
+    it('background colors bright', async function(): Promise<any> {
       this.timeout(10000);
       await openTerminal({
         rendererType: 'dom',
@@ -78,17 +131,16 @@ describe('WebGL Renderer Integration Tests', () => {
           brightWhite: '#161718'
         }
       });
-      // await writeSync(`\\x1b[41m${' '.repeat(5 * 5)}`);
       await writeSync(`\\x1b[100m \\x1b[101m \\x1b[102m \\x1b[103m \\x1b[104m \\x1b[105m \\x1b[106m \\x1b[107m `);
       await page.evaluate(`window.term.loadWebgl(true);`);
-      assert.deepEqual(await getCellBgColor(1, 1), [1, 2, 3, 255]);
+      assert.deepEqual(await getCellColor(1, 1), [1, 2, 3, 255]);
-      assert.deepEqual(await getCellBgColor(2, 1), [4, 5, 6, 255]);
+      assert.deepEqual(await getCellColor(2, 1), [4, 5, 6, 255]);
-      assert.deepEqual(await getCellBgColor(3, 1), [7, 8, 9, 255]);
+      assert.deepEqual(await getCellColor(3, 1), [7, 8, 9, 255]);
-      assert.deepEqual(await getCellBgColor(4, 1), [10, 11, 12, 255]);
+      assert.deepEqual(await getCellColor(4, 1), [10, 11, 12, 255]);
-      assert.deepEqual(await getCellBgColor(5, 1), [13, 14, 15, 255]);
+      assert.deepEqual(await getCellColor(5, 1), [13, 14, 15, 255]);
-      assert.deepEqual(await getCellBgColor(6, 1), [16, 17, 18, 255]);
+      assert.deepEqual(await getCellColor(6, 1), [16, 17, 18, 255]);
-      assert.deepEqual(await getCellBgColor(7, 1), [19, 20, 21, 255]);
+      assert.deepEqual(await getCellColor(7, 1), [19, 20, 21, 255]);
-      assert.deepEqual(await getCellBgColor(8, 1), [22, 23, 24, 255]);
+      assert.deepEqual(await getCellColor(8, 1), [22, 23, 24, 255]);
     });
   });
 });
@@ -121,14 +173,14 @@ async function writeSync(data: string): Promise<void> {
 //   return await page.evaluate(`Array.from(window.result)`);
 // }
 
-async function getCellBgColor(col: number, row: number): Promise<number[]> {
+async function getCellColor(col: number, row: number): Promise<number[]> {
   await page.evaluate(`
     window.gl = window.term._core._renderCoordinator._renderer._gl;
     window.result = new Uint8Array(4);
     window.d = window.term._core._renderCoordinator.dimensions;
     window.gl.readPixels(
-      Math.floor(${col - 1} * window.d.scaledCellWidth),
+      Math.floor((${col - 0.5}) * window.d.scaledCellWidth),
-      Math.floor(window.gl.drawingBufferHeight - 1 - ${row - 1} * window.d.scaledCellHeight),
+      Math.floor(window.gl.drawingBufferHeight - 1 - (${row - 0.5}) * window.d.scaledCellHeight),
       1, 1, window.gl.RGBA, window.gl.UNSIGNED_BYTE, window.result
     );
   `);