Merge branch 'main' of github.com:os-fpga/rapid_power_estimator into user-guide-ToC

Author: MustafaAbdaal

.github/workflows/rpe_test.yml

@@ -5,8 +5,7 @@ on:
     tags:
       - '*'
     branches: 
-      - '*'
-      - '*/**'
+      - main
   pull_request:
 
 concurrency:
@@ -21,7 +20,7 @@ jobs:
         os: 
           - ubuntu-latest
           - ubuntu-22.04 # This is CentOS 7 under the hood
-          - macos-12
+          - macos-latest
           - windows-latest
 
     runs-on: ${{ matrix.os }}
@@ -30,6 +29,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
+      - name: Bring in device.xml
+        uses: actions/checkout@v4
+        with:
+          repository: os-fpga/Raptor
+          path: Raptor
+          sparse-checkout: 'etc'      
 
       - name: Setup Node.js ${{ matrix.os }}
         if: ${{ matrix.os != 'ubuntu-22.04' }}
@@ -86,10 +92,17 @@ jobs:
       - name: Unit Jtest Linux latest & windows & MacOS
         if: ${{ matrix.os != 'ubuntu-22.04' }}
         run: npm test
+        
+      - name: E2E Playwright tests on Linux latest & MacOS
+        if: ${{ matrix.os == 'ubuntu-latest' }}     
+        run: |
+            cp -rf Raptor/etc backend
+            npm run compile && xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npx playwright test
+
+      - name: cat RPE log
+        if: matrix.os == 'ubuntu-latest'  &&  always()
+        run: find $HOME -type f -name "rpe.log" -exec cat {} +
 
-     # - name: E2E Playwright tests on Linux latest & MacOS
-     #   if: ${{ matrix.os == 'ubuntu-latest' }}     
-     #   run: npm run compile && xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npx playwright test
 
       - name: Run ESLint only on ubuntu-latest
         if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -116,7 +129,7 @@ jobs:
       matrix:
         os: 
           - ubuntu-22.04 # This is CentOS 7 under the hood
-          - macos-12
+          - macos-latest
           - windows-latest
 
     runs-on: ${{ matrix.os }}
@@ -206,15 +219,15 @@ jobs:
             echo ${{ github.ref }} 
 
       - name: Upload Package
-        if: ${{ github.ref == 'refs/heads/main' &&  matrix.os != 'windows-latest'  }}
-        uses: actions/upload-artifact@v3
+        if: ${{ github.ref == 'refs/heads/main' &&  matrix.os != 'windows-latest' }}
+        uses: actions/upload-artifact@v4.4.3
         with:
             name: rapid_power_estimator_${{ matrix.os }}
             path: dist/rapid_power_estimator*.tar.gz 
 
       - name: Upload Package
         if: ${{ github.ref == 'refs/heads/main' &&  matrix.os == 'windows-latest' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.4.3
         with:
             name: rapid_power_estimator_${{ matrix.os }}
             path: dist/rapid_power_estimator*.exe

src/tests/Tables_tests/PowerSummaryTable.test.js

@@ -70,4 +70,27 @@ describe('PowerSummaryTable Component', () => {
     expect(within(noMessageRow).queryByText('Warning message')).toBeNull();
     expect(within(noMessageRow).queryByText('Error message')).toBeNull();
   });
+
+  test('total and percent values match sum of data', () => {
+    render(<PowerSummaryTable title="Power Summary" data={mockData} total={60} percent={80} />);
+  
+    const displayedTotal = screen.getByText((content) => content.includes('60.00') && content.includes('W'));
+    expect(displayedTotal).toBeInTheDocument();
+  
+    const progressBar = screen.getByRole('progressbar');
+    expect(progressBar).toHaveAttribute('value', '80');
+    expect(progressBar).toHaveAttribute('max', '100');
+  });  
+
+  test('renders correctly with no data entries', () => {
+    render(<PowerSummaryTable title="Power Summary" data={[]} total={0} percent={0} />);
+  
+    expect(screen.getByText('Power Summary')).toBeInTheDocument();
+  
+    expect(screen.getByText('0.00 W')).toBeInTheDocument();
+    expect(screen.getByText('0 %')).toBeInTheDocument();
+  
+    const progressBar = screen.getByRole('progressbar');
+    expect(progressBar).toHaveAttribute('value', '0');
+  });  
 });

tests/e2e/fle.test.js

@@ -1,25 +1,26 @@
-// const { _electron: electron } = require('playwright');
-// const { test, expect } = require('@playwright/test');
+ const { _electron: electron } = require('playwright');
+ const { test, expect } = require('@playwright/test');
 
-// test('Launch Electron app and click on FLE block', async () => {
-//   const app = await electron.launch({ args: ['main.js'] });
+ test('Launch Electron app and click on FLE block', async () => {
+   const app = await electron.launch({ args: ['main.js'] });
 
-//   const window = await app.firstWindow();
+   const window = await app.firstWindow();
 
-//     // selecting the device (MPW1 Gemini)
-//   const deviceDropdown = await window.waitForSelector('#deviceId');
-//   await deviceDropdown.selectOption('MPW1');
-//   await new Promise((resolve) => setTimeout(resolve, 2000));
+   // selecting the device (MPW1 Gemini)
+   const deviceDropdown = await window.waitForSelector('#deviceId');
+   await deviceDropdown.selectOption('MPW1');
+   await new Promise((resolve) => setTimeout(resolve, 2000));
 
-//   const fleBlock = await window.waitForSelector('#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col2 > div.top-l2-col2-elem > div > div:nth-child(2) > div:nth-child(2) > div');
-//   await fleBlock.click();
+   // Clicking on the FLE block
+   const fleBlock = await window.waitForSelector('#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col2 > div.top-l2-col2-elem > div > div:nth-child(2) > div:nth-child(2) > div');
+   await fleBlock.click();
 
-//   const flePowerVisible = await window.isVisible('div.title-comp-total-text');
-//   expect(flePowerVisible).toBeTruthy();
+   const flePowerVisible = await window.isVisible('div.title-comp-total-text');
+   expect(flePowerVisible).toBeTruthy();
 
-//   console.log('FLE block clicked and verified.');
+   console.log('FLE block clicked and verified.');
 
-//   await new Promise((resolve) => setTimeout(resolve, 5000));
+   await new Promise((resolve) => setTimeout(resolve, 5000));
 
-//   await app.close();
-// });
+   await app.close();
+ });