From 5d696cd1d9de2695c012787dc7ba447a13cd6d09 Mon Sep 17 00:00:00 2001 From: mwajahatabbasi Date: Mon, 20 Jan 2025 22:55:09 +0500 Subject: [PATCH] NMS-16986 : Handel Merge changes as well as changes suggest in standup meeting. --- .../jsp/admin/support/systemReportList.jsp | 4 ++-- .../org/opennms/smoketest/SupportPageIT.java | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/support/systemReportList.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/support/systemReportList.jsp index 842265b9b5f1..c1303f230a38 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/support/systemReportList.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/support/systemReportList.jsp @@ -104,7 +104,7 @@ function toggleGroup(activeGroup) {
- +
@@ -119,7 +119,7 @@ function toggleGroup(activeGroup) {
- +
diff --git a/smoke-test/src/test/java/org/opennms/smoketest/SupportPageIT.java b/smoke-test/src/test/java/org/opennms/smoketest/SupportPageIT.java index 177bc911f4e7..80ace6270df1 100644 --- a/smoke-test/src/test/java/org/opennms/smoketest/SupportPageIT.java +++ b/smoke-test/src/test/java/org/opennms/smoketest/SupportPageIT.java @@ -64,14 +64,14 @@ public void testSystemReport() { final WebElement textFileReportRadio = driver.findElement(By.id("radio1")); final WebElement logFilesRadio = driver.findElement(By.id("radio2")); final WebElement javaReportCheckbox = driver.findElement(By.cssSelector("input[type=checkbox][name=plugins][value=Java]")); - final WebElement threadsReportRadio = driver.findElement(By.cssSelector("input[type=radio][name=plugins][value=Threads]")); - final WebElement topReportRadio = driver.findElement(By.cssSelector("input[type=radio][name=plugins][value=Top]")); + final WebElement configurationReportRadio = driver.findElement(By.cssSelector("input[type=radio][name=plugins][value=Configuration]")); + final WebElement logsReportRadio = driver.findElement(By.cssSelector("input[type=radio][name=plugins][value=Logs]")); assertThat(textFileReportRadio.isSelected(), is(true)); assertThat(logFilesRadio.isSelected(), is(false)); assertThat(javaReportCheckbox.isSelected(), is(true)); - assertThat(threadsReportRadio.isSelected(), is(false)); - assertThat(topReportRadio.isSelected(), is(false)); + assertThat(configurationReportRadio.isSelected(), is(false)); + assertThat(logsReportRadio.isSelected(), is(false)); javaReportCheckbox.click(); assertThat(javaReportCheckbox.isSelected(), is(false)); @@ -80,11 +80,12 @@ public void testSystemReport() { assertThat(textFileReportRadio.isSelected(), is(false)); assertThat(logFilesRadio.isSelected(), is(true)); assertThat(javaReportCheckbox.isSelected(), is(false)); - assertThat(threadsReportRadio.isSelected(), is(true)); - assertThat(topReportRadio.isSelected(), is(false)); + assertThat(configurationReportRadio.isSelected(), is(true)); + assertThat(logsReportRadio.isSelected(), is(false)); - topReportRadio.click(); - assertThat(threadsReportRadio.isSelected(), is(false)); - assertThat(topReportRadio.isSelected(), is(true)); + logsReportRadio.click(); + assertThat(configurationReportRadio.isSelected(), is(false)); + assertThat(logsReportRadio.isSelected(), is(true)); } + }