From b297617fdd88e39154b077de7bff60d19d58720b Mon Sep 17 00:00:00 2001 From: Ashish Date: Sat, 31 Aug 2024 12:30:47 +0200 Subject: [PATCH 1/4] Removed unwanted Run Settings options --- .../ide/main/settings/INGeniousSettings.form | 214 +++++++----------- .../ide/main/settings/INGeniousSettings.java | 197 ++++++---------- 2 files changed, 153 insertions(+), 258 deletions(-) diff --git a/IDE/src/main/java/com/ing/ide/main/settings/INGeniousSettings.form b/IDE/src/main/java/com/ing/ide/main/settings/INGeniousSettings.form index 0d97be4..bbb602a 100644 --- a/IDE/src/main/java/com/ing/ide/main/settings/INGeniousSettings.form +++ b/IDE/src/main/java/com/ing/ide/main/settings/INGeniousSettings.form @@ -28,7 +28,7 @@ - + @@ -36,8 +36,8 @@ - - + + @@ -54,7 +54,7 @@ - + @@ -117,8 +117,8 @@ - - + + @@ -136,104 +136,89 @@ - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + - + - - - + + + - - - - - - - - - - - - - - - + + + + + - - - - - - + + + + + - - - - + + + + + + + + + + + + + + - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + + - + + + + + - - - - - - - - - - - - - - - + @@ -287,30 +272,25 @@ - - - + - - + - - + - - + - + @@ -493,15 +473,6 @@ - - - - - - - - - @@ -544,23 +515,6 @@ - - - - - - - - - - - - - - - - - @@ -604,18 +558,6 @@ - - - - - - - - - - - - @@ -657,8 +599,8 @@ - - + + diff --git a/IDE/src/main/java/com/ing/ide/main/settings/INGeniousSettings.java b/IDE/src/main/java/com/ing/ide/main/settings/INGeniousSettings.java index e949a56..3811cc2 100644 --- a/IDE/src/main/java/com/ing/ide/main/settings/INGeniousSettings.java +++ b/IDE/src/main/java/com/ing/ide/main/settings/INGeniousSettings.java @@ -215,11 +215,11 @@ private void loadRunSettings() { fullpagescreenshot.setSelected(execSettings.getRunSettings().getTakeFullPageScreenShot()); reRunNo.getModel().setValue(execSettings.getRunSettings().getRerunTimes()); - useExistingDriver.setSelected(execSettings.getRunSettings().useExistingDriver()); + // useExistingDriver.setSelected(execSettings.getRunSettings().useExistingDriver()); reportPerformanceLog.setSelected(execSettings.getRunSettings().isPerformanceLogEnabled()); bddReport.setSelected(execSettings.getRunSettings().isBddReportEnabled()); - sendMail.setSelected(execSettings.getRunSettings().isMailSend()); - excelReporting.setSelected(execSettings.getRunSettings().isExcelReport()); + // sendMail.setSelected(execSettings.getRunSettings().isMailSend()); + // excelReporting.setSelected(execSettings.getRunSettings().isExcelReport()); extent.setSelected(execSettings.getRunSettings().isExtentReport()); azure.setSelected(execSettings.getRunSettings().isAzureEnabled()); rpUpdate.setSelected(execSettings.getRunSettings().isRPUpdate()); @@ -309,17 +309,17 @@ private void saveRunSettings() { execSettings.getRunSettings().setTracingEnabled(enableTracing.isSelected()); execSettings.getRunSettings().setHARrecordingEnabled(enableHAR.isSelected()); execSettings.getRunSettings().setRerunTimes(reRunNo.getModel().getValue().toString()); - execSettings.getRunSettings().useExistingDriver(useExistingDriver.isSelected()); + // execSettings.getRunSettings().useExistingDriver(useExistingDriver.isSelected()); execSettings.getRunSettings().setReportPerformanceLog(reportPerformanceLog.isSelected()); execSettings.getRunSettings().setBddReport(bddReport.isSelected()); - execSettings.getRunSettings().setMailSend(sendMail.isSelected()); - execSettings.getRunSettings().setExcelReport(excelReporting.isSelected()); + // execSettings.getRunSettings().setMailSend(sendMail.isSelected()); + // execSettings.getRunSettings().setExcelReport(excelReporting.isSelected()); execSettings.getRunSettings().setRPUpdate(rpUpdate.isSelected()); execSettings.getRunSettings().setExtentReport(extent.isSelected()); execSettings.getRunSettings().setAzureReport(azure.isSelected()); execSettings.getRunSettings().setSlackNotification(slackNotify.isSelected()); execSettings.getRunSettings().setTestEnv(testEnv.getSelectedItem().toString()); - execSettings.getRunSettings().setAutoHealMode(autoHeal.isSelected()); + // execSettings.getRunSettings().setAutoHealMode(autoHeal.isSelected()); execSettings.getRunSettings().save(); sMainFrame.reloadSettings(); } @@ -495,18 +495,14 @@ private void initComponents() { jLabel29 = new javax.swing.JLabel(); reRunNo = new javax.swing.JSpinner(); jLabel30 = new javax.swing.JLabel(); - useExistingDriver = new javax.swing.JCheckBox(); reportPerformanceLog = new javax.swing.JCheckBox(); envLabel = new javax.swing.JLabel(); testEnv = new javax.swing.JComboBox<>(); bddReport = new javax.swing.JCheckBox(); - sendMail = new javax.swing.JCheckBox(); - excelReporting = new javax.swing.JCheckBox(); slackNotify = new javax.swing.JCheckBox(); rpUpdate = new javax.swing.JCheckBox(); extent = new javax.swing.JCheckBox(); azure = new javax.swing.JCheckBox(); - autoHeal = new javax.swing.JCheckBox(); recordVideo = new javax.swing.JCheckBox(); enableTracing = new javax.swing.JCheckBox(); enableHAR = new javax.swing.JCheckBox(); @@ -530,8 +526,9 @@ public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } }); + getContentPane().setLayout(new java.awt.BorderLayout()); - savePanel.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); + savePanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); savePanel.setFont(new java.awt.Font("sansserif", 0, 11)); // NOI18N saveSettings.setFont(UIManager.getFont("TableMenu.font")); @@ -555,7 +552,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { savePanelLayout.setHorizontalGroup( savePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(savePanelLayout.createSequentialGroup() - .addContainerGap(478, Short.MAX_VALUE) + .addContainerGap(466, Short.MAX_VALUE) .addComponent(saveSettings) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(resetSettings) @@ -575,7 +572,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { runSettingsTab.setFont(new java.awt.Font("sansserif", 0, 11)); // NOI18N - globalSettings.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); + globalSettings.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); jLabel1.setFont(UIManager.getFont("TableMenu.font")); jLabel1.setText("ExecutionTimeOut"); @@ -649,10 +646,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { jLabel30.setFont(UIManager.getFont("TableMenu.font")); jLabel30.setText("Times"); - useExistingDriver.setFont(UIManager.getFont("TableMenu.font")); - useExistingDriver.setText("Use Existing Browser"); - useExistingDriver.setToolTipText("Will use the same browser instance for all the TestCases and Iterations in Testsets"); - reportPerformanceLog.setFont(UIManager.getFont("TableMenu.font")); reportPerformanceLog.setText("Performance Reporting"); reportPerformanceLog.setToolTipText("Report page performance logs."); @@ -667,13 +660,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { bddReport.setFont(UIManager.getFont("TableMenu.font")); bddReport.setText("Bdd Reporting"); - sendMail.setFont(UIManager.getFont("TableMenu.font")); - sendMail.setText("Send Mail after Execution"); - - excelReporting.setFont(UIManager.getFont("TableMenu.font")); - excelReporting.setText("Excel Reporting"); - excelReporting.setToolTipText("Excel Reporting"); - slackNotify.setFont(UIManager.getFont("TableMenu.font")); slackNotify.setText("Slack Notification"); slackNotify.setToolTipText("Send notification to slack"); @@ -703,15 +689,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { } }); - autoHeal.setFont(UIManager.getFont("TableMenu.font")); - autoHeal.setText("Auto Heal Mode"); - autoHeal.setToolTipText("Auto Heal of Elements"); - autoHeal.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - autoHealActionPerformed(evt); - } - }); - recordVideo.setFont(UIManager.getFont("TableMenu.font")); recordVideo.setText("Video"); recordVideo.setToolTipText("Record Execution Video"); @@ -746,81 +723,70 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGroup(globalSettingsLayout.createSequentialGroup() .addContainerGap() .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(globalSettingsLayout.createSequentialGroup() + .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel29) + .addGroup(globalSettingsLayout.createSequentialGroup() + .addGap(111, 111, 111) + .addComponent(reRunNo, javax.swing.GroupLayout.PREFERRED_SIZE, 116, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jLabel30))) + .addGap(0, 0, Short.MAX_VALUE)) .addGroup(globalSettingsLayout.createSequentialGroup() .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(envLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 84, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(globalSettingsLayout.createSequentialGroup() .addGap(4, 4, 4) - .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(excelReporting) - .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(autoHeal, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 137, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(useExistingDriver, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 137, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(globalSettingsLayout.createSequentialGroup() - .addComponent(rpUpdate) - .addGap(44, 44, 44)))) - .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(bddReport) - .addComponent(sendMail) - .addComponent(extent)) - .addGap(2, 2, 2) .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(reportPerformanceLog) - .addComponent(slackNotify) - .addComponent(azure)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(rpUpdate) + .addComponent(slackNotify)) + .addGap(60, 60, 60) .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(enableHAR) + .addComponent(extent) + .addComponent(bddReport) + .addComponent(azure))) + .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(globalSettingsLayout.createSequentialGroup() + .addComponent(jLabel1) + .addGap(18, 18, 18) + .addComponent(executionTimeOut, javax.swing.GroupLayout.PREFERRED_SIZE, 252, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, globalSettingsLayout.createSequentialGroup() + .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel2) + .addComponent(jLabel3) + .addComponent(jLabel4)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(globalSettingsLayout.createSequentialGroup() + .addComponent(jRadioButton1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jRadioButton2)) + .addGroup(globalSettingsLayout.createSequentialGroup() + .addComponent(jRadioButton3) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jRadioButton4)) + .addComponent(threadCount, javax.swing.GroupLayout.PREFERRED_SIZE, 116, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(testEnv, javax.swing.GroupLayout.PREFERRED_SIZE, 121, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(56, 56, 56)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, globalSettingsLayout.createSequentialGroup() + .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel5) + .addComponent(jLabel9)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(globalSettingsLayout.createSequentialGroup() + .addComponent(passCheckBox) + .addGap(18, 18, 18) + .addComponent(failCheckBox) + .addGap(95, 95, 95) + .addComponent(fullpagescreenshot)) + .addComponent(remoteGridURL, javax.swing.GroupLayout.PREFERRED_SIZE, 252, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(enableTracing) - .addComponent(recordVideo)))) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addGroup(globalSettingsLayout.createSequentialGroup() - .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(globalSettingsLayout.createSequentialGroup() - .addComponent(jLabel1) - .addGap(18, 18, 18) - .addComponent(executionTimeOut, javax.swing.GroupLayout.PREFERRED_SIZE, 252, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, globalSettingsLayout.createSequentialGroup() - .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel2) - .addComponent(jLabel3) - .addComponent(jLabel4)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(globalSettingsLayout.createSequentialGroup() - .addComponent(jRadioButton1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jRadioButton2)) - .addGroup(globalSettingsLayout.createSequentialGroup() - .addComponent(jRadioButton3) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jRadioButton4)) - .addComponent(threadCount, javax.swing.GroupLayout.PREFERRED_SIZE, 116, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(testEnv, javax.swing.GroupLayout.PREFERRED_SIZE, 121, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(56, 56, 56)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, globalSettingsLayout.createSequentialGroup() - .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel5) - .addComponent(jLabel9)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(globalSettingsLayout.createSequentialGroup() - .addComponent(passCheckBox) - .addGap(18, 18, 18) - .addComponent(failCheckBox)) - .addComponent(remoteGridURL, javax.swing.GroupLayout.PREFERRED_SIZE, 252, javax.swing.GroupLayout.PREFERRED_SIZE)))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 36, Short.MAX_VALUE) - .addComponent(fullpagescreenshot) - .addGap(46, 46, 46)) - .addGroup(globalSettingsLayout.createSequentialGroup() - .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel29) - .addGroup(globalSettingsLayout.createSequentialGroup() - .addGap(111, 111, 111) - .addComponent(reRunNo, javax.swing.GroupLayout.PREFERRED_SIZE, 116, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jLabel30))) - .addGap(0, 0, Short.MAX_VALUE)))) + .addComponent(recordVideo) + .addComponent(enableHAR)))) + .addGap(114, 136, Short.MAX_VALUE)))) ); globalSettingsLayout.setVerticalGroup( globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -862,32 +828,27 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(jLabel29) .addComponent(reRunNo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel30)) - .addGap(35, 35, 35) - .addComponent(autoHeal) - .addGap(18, 18, 18) + .addGap(74, 74, 74) .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(useExistingDriver) - .addComponent(sendMail) .addComponent(reportPerformanceLog) - .addComponent(recordVideo)) + .addComponent(recordVideo) + .addComponent(bddReport)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(bddReport) - .addComponent(slackNotify) .addComponent(rpUpdate) - .addComponent(enableTracing)) + .addComponent(enableTracing) + .addComponent(extent)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(globalSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(excelReporting) - .addComponent(extent) .addComponent(azure) - .addComponent(enableHAR)) - .addContainerGap(50, Short.MAX_VALUE)) + .addComponent(enableHAR) + .addComponent(slackNotify)) + .addContainerGap(40, Short.MAX_VALUE)) ); runSettingsTab.addTab("Run Settings", globalSettings); - qcrunSettings.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); + qcrunSettings.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1)); qcrunSettings.setLayout(new java.awt.BorderLayout()); tsTMTable.setModel(new javax.swing.table.DefaultTableModel( @@ -1043,10 +1004,6 @@ private void jRadioButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN // TODO add your handling code here: }//GEN-LAST:event_jRadioButton1ActionPerformed - private void autoHealActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_autoHealActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_autoHealActionPerformed - private void recordVideoActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_recordVideoActionPerformed // TODO add your handling code here: }//GEN-LAST:event_recordVideoActionPerformed @@ -1080,14 +1037,12 @@ private void testConnection(final Sync connection) { // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JCheckBox autoHeal; private javax.swing.JCheckBox azure; private javax.swing.JCheckBox bddReport; private javax.swing.ButtonGroup eModeBgroup; private javax.swing.JCheckBox enableHAR; private javax.swing.JCheckBox enableTracing; private javax.swing.JLabel envLabel; - private javax.swing.JCheckBox excelReporting; private javax.swing.JTextField executionTimeOut; private javax.swing.JCheckBox extent; private javax.swing.JCheckBox failCheckBox; @@ -1124,7 +1079,6 @@ private void testConnection(final Sync connection) { private javax.swing.JTabbedPane runSettingsTab; private javax.swing.JPanel savePanel; private javax.swing.JButton saveSettings; - private javax.swing.JCheckBox sendMail; private javax.swing.JCheckBox slackNotify; private javax.swing.JButton testConn; private javax.swing.JComboBox testEnv; @@ -1132,6 +1086,5 @@ private void testConnection(final Sync connection) { private javax.swing.JSpinner threadCount; private javax.swing.JTable tsTMTable; private javax.swing.JCheckBox updateresultscheckbox; - private javax.swing.JCheckBox useExistingDriver; // End of variables declaration//GEN-END:variables } From c3842f1c979f12630e677eade47fbe0b04b3cca3 Mon Sep 17 00:00:00 2001 From: Ashish Date: Sat, 31 Aug 2024 13:12:39 +0200 Subject: [PATCH 2/4] Removed retired icons --- .../main/java/com/ing/ide/main/mainui/AppToolBar.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/IDE/src/main/java/com/ing/ide/main/mainui/AppToolBar.java b/IDE/src/main/java/com/ing/ide/main/mainui/AppToolBar.java index 8cd0d52..9e798d1 100644 --- a/IDE/src/main/java/com/ing/ide/main/mainui/AppToolBar.java +++ b/IDE/src/main/java/com/ing/ide/main/mainui/AppToolBar.java @@ -27,15 +27,15 @@ private void init() { add(createButton("Save Project")); addSeparator(); - add(createButton("Object Spy")); - add(createButton("Object Heal")); - addSeparator(); + // add(createButton("Object Spy")); + // add(createButton("Object Heal")); + // addSeparator(); // add(createButton("Mobile Spy")); - add(createButton("Image Spy")); + // add(createButton("Image Spy")); addSeparator(); add(createButton("Run Settings")); add(createButton("Browser Configuration")); - add(createButton("AzureDevOps TestPlan Configuration")); + // add(createButton("AzureDevOps TestPlan Configuration")); addSeparator(); add(new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767))); // add(createButton("Refresh")); From 74bc13b217fac44b41ecc0147cf82906abd2b7d7 Mon Sep 17 00:00:00 2001 From: Ashish Date: Sat, 31 Aug 2024 13:34:26 +0200 Subject: [PATCH 3/4] Removed AzDo TestPlan Config option from toolbar --- IDE/src/main/java/com/ing/ide/main/mainui/AppMenuBar.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/IDE/src/main/java/com/ing/ide/main/mainui/AppMenuBar.java b/IDE/src/main/java/com/ing/ide/main/mainui/AppMenuBar.java index 54c7943..61a0dce 100644 --- a/IDE/src/main/java/com/ing/ide/main/mainui/AppMenuBar.java +++ b/IDE/src/main/java/com/ing/ide/main/mainui/AppMenuBar.java @@ -199,10 +199,10 @@ private JMenu createConfigurationMenu() { withMnemonics( withIcon( Utils.createMenuItem("Browser Configuration", sActionListener)), 'B')); - configure.add( - withMnemonics( - withIcon( - Utils.createMenuItem("AzureDevOps TestPlan Configuration", sActionListener)), 'T')); + // configure.add( + // withMnemonics( + // withIcon( + // Utils.createMenuItem("AzureDevOps TestPlan Configuration", sActionListener)), 'T')); configure.addSeparator(); // configure.add( From 65aa18b96bae804b1cb3bb725d6eec6a9ead7d4d Mon Sep 17 00:00:00 2001 From: Ashish Date: Sun, 1 Sep 2024 12:33:47 +0200 Subject: [PATCH 4/4] Added playwright close for every iteration --- .../main/java/com/ing/engine/core/Task.java | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/Engine/src/main/java/com/ing/engine/core/Task.java b/Engine/src/main/java/com/ing/engine/core/Task.java index c2f6217..f27d25c 100644 --- a/Engine/src/main/java/com/ing/engine/core/Task.java +++ b/Engine/src/main/java/com/ing/engine/core/Task.java @@ -1,4 +1,3 @@ - package com.ing.engine.core; import com.ing.datalib.component.Project; @@ -67,12 +66,13 @@ public void run() { try { System.out.println("Running Iteration " + iter); runIteration(iter++); + closePlaywrightInstance(iter-1); } catch (Exception ex) { LOG.log(Level.SEVERE, ex.getMessage(), ex); } } Date endEexcDate = new Date(); - + if (report != null) { Status s = report.finalizeReport(); Control.ReportManager.startDate = startexecDate; @@ -82,6 +82,25 @@ public void run() { } } + private void closePlaywrightInstance(int iter) { + String browserName = playwrightDriver.getCurrentBrowser(); + if (playwrightDriver != null) { + playwrightDriver.closeBrowser(); + playwrightDriver.playwright.close(); + } + String closureConfirmationText = "Playwright instance with [" + browserName + "] has been closed for Iteration : " + iter; + System.out.println("\n"); + for (int i = 0; i < closureConfirmationText.length() + 7; i++) { + System.out.print("-"); + } + System.out.println(); + System.out.println("| " + closureConfirmationText + " |"); + for (int i = 0; i < closureConfirmationText.length() + 7; i++) { + System.out.print("-"); + } + System.out.println("\n"); + } + private TestCase getTestCase() { try { Scenario scn = project().getScenarioByName(runContext.Scenario); @@ -144,7 +163,7 @@ private void launchBrowser() throws UnCaughtException { } private CommandControl createControl() { - return new CommandControl(playwrightDriver,playwrightDriver,playwrightDriver, report) { + return new CommandControl(playwrightDriver, playwrightDriver, playwrightDriver, report) { @Override public void execute(String com, int sub) { runner.runTestCase(com, sub);