From c80297eaacb47a5d903f71e7d014f87fc091516b Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Tue, 31 Jan 2023 14:35:16 -0500
Subject: [PATCH] Test fixes
---
.../feature/vt/api/VTAddToSessionTest.java | 133 ++++++++----------
.../provider/AbstractVTCorrelatorTest.java | 49 +++----
2 files changed, 80 insertions(+), 102 deletions(-)
diff --git a/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/api/VTAddToSessionTest.java b/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/api/VTAddToSessionTest.java
index cf19c3fcf3..7ea050ff5e 100644
--- a/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/api/VTAddToSessionTest.java
+++ b/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/api/VTAddToSessionTest.java
@@ -65,7 +65,6 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
private AddressSet destinationSelection;
public VTAddToSessionTest() {
- super();
}
@Before
@@ -129,8 +128,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
createWizardManager();
- runSwingLater(
- () -> wizardManager.showWizard(controller.getParentComponent()));
+ runSwingLater(() -> wizardManager.showWizard(controller.getParentComponent()));
waitForDialogComponent(WizardManager.class);
@@ -146,12 +144,12 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// Check the summary panel.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" + sessionName +
- "
" + TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
+ String summaryString = "Add to Version Tracking Session
" + sessionName + "
" +
+ TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
"Exact Function Instructions Match
" + "No
" + "Entire Source Program
" +
"Entire Destination Program
" + "";
checkSummaryPanel(labelString, summaryString, VTWizardPanelAction.FINISH);
@@ -185,8 +183,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
createWizardManager();
- runSwingLater(
- () -> wizardManager.showWizard(controller.getParentComponent()));
+ runSwingLater(() -> wizardManager.showWizard(controller.getParentComponent()));
waitForDialogComponent(WizardManager.class);
@@ -208,12 +205,12 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// Check the summary panel.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" + sessionName +
- "
" + TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
+ String summaryString = "Add to Version Tracking Session
" + sessionName + "
" +
+ TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
"Exact Function Instructions Match
" + "No
" + "Entire Source Program
" +
"Entire Destination Program
" + "";
checkSummaryPanel(labelString, summaryString, VTWizardPanelAction.FINISH);
@@ -247,8 +244,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
createWizardManager();
- runSwingLater(
- () -> wizardManager.showWizard(controller.getParentComponent()));
+ runSwingLater(() -> wizardManager.showWizard(controller.getParentComponent()));
waitForDialogComponent(WizardManager.class);
@@ -270,12 +266,12 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// Check the summary panel.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" + sessionName +
- "
" + TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
+ String summaryString = "Add to Version Tracking Session
" + sessionName + "
" +
+ TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
"Exact Function Instructions Match
" + "No
" + "Manually Defined
" +
"Manually Defined
" + "";
checkSummaryPanel(labelString, summaryString, VTWizardPanelAction.FINISH);
@@ -309,8 +305,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
createWizardManager();
- runSwingLater(
- () -> wizardManager.showWizard(controller.getParentComponent()));
+ runSwingLater(() -> wizardManager.showWizard(controller.getParentComponent()));
waitForDialogComponent(WizardManager.class);
@@ -345,12 +340,12 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// Check the summary panel.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" + sessionName +
- "
" + TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
+ String summaryString = "Add to Version Tracking Session
" + sessionName + "
" +
+ TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
"Exact Function Instructions Match
" + "No
" + "Manually Defined
" +
"Manually Defined
" + "";
checkSummaryPanel(labelString, summaryString, VTWizardPanelAction.FINISH);
@@ -386,8 +381,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
createWizardManager();
- runSwingLater(
- () -> wizardManager.showWizard(controller.getParentComponent()));
+ runSwingLater(() -> wizardManager.showWizard(controller.getParentComponent()));
waitForDialogComponent(WizardManager.class);
@@ -409,12 +403,12 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// Check the summary panel.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" + sessionName +
- "
" + TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
+ String summaryString = "Add to Version Tracking Session
" + sessionName + "
" +
+ TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
"Exact Function Instructions Match
" + "No
" + "Entire Source Program
" +
"Entire Destination Program
" + "";
checkSummaryPanel(labelString, summaryString, VTWizardPanelAction.FINISH);
@@ -450,8 +444,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
createWizardManager();
- runSwingLater(
- () -> wizardManager.showWizard(controller.getParentComponent()));
+ runSwingLater(() -> wizardManager.showWizard(controller.getParentComponent()));
waitForDialogComponent(WizardManager.class);
@@ -473,12 +466,12 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// Check the summary panel.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" + sessionName +
- "
" + TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
+ String summaryString = "Add to Version Tracking Session
" + sessionName + "
" +
+ TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
"Exact Function Instructions Match
No
Source Tool Selection
" +
"Destination Tool Selection
";
checkSummaryPanel(labelString, summaryString, VTWizardPanelAction.FINISH);
@@ -514,8 +507,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
createWizardManager();
- runSwingLater(
- () -> wizardManager.showWizard(controller.getParentComponent()));
+ runSwingLater(() -> wizardManager.showWizard(controller.getParentComponent()));
waitForDialogComponent(WizardManager.class);
@@ -550,12 +542,12 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// Check the summary panel.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" + sessionName +
- "
" + TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
+ String summaryString = "Add to Version Tracking Session
" + sessionName + "
" +
+ TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
"Exact Function Instructions Match
" + "No
" + "Manually Defined
" +
"Manually Defined
" + "";
checkSummaryPanel(labelString, summaryString, VTWizardPanelAction.FINISH);
@@ -591,8 +583,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
createWizardManager();
- runSwingLater(
- () -> wizardManager.showWizard(controller.getParentComponent()));
+ runSwingLater(() -> wizardManager.showWizard(controller.getParentComponent()));
waitForDialogComponent(WizardManager.class);
@@ -626,12 +617,12 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// Check the summary panel and then begin going back through wizard panels.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" + sessionName +
- "
" + TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
+ String summaryString = "Add to Version Tracking Session
" + sessionName + "
" +
+ TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
"Exact Function Instructions Match
" + "Yes
" + "Manually Defined
" +
"Manually Defined
" + "";
checkSummaryPanel(labelString, summaryString, VTWizardPanelAction.BACK);
@@ -693,8 +684,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
createWizardManager();
- runSwingLater(
- () -> wizardManager.showWizard(controller.getParentComponent()));
+ runSwingLater(() -> wizardManager.showWizard(controller.getParentComponent()));
waitForDialogComponent(WizardManager.class);
@@ -710,12 +700,12 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// Check the summary panel.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" + sessionName +
- "
" + TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
+ String summaryString = "Add to Version Tracking Session
" + sessionName + "
" +
+ TEST_SOURCE_PROGRAM_NAME + "
" + TEST_DESTINATION_PROGRAM_NAME + "
" +
"Data Reference Match
" + "No
" + "Entire Source Program
" +
"Entire Destination Program
" + "";
checkSummaryPanel(labelString, summaryString, VTWizardPanelAction.FINISH);
@@ -790,7 +780,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// options.putString(testOptionKey, firstNewOptionValue);
// assertEquals(firstNewOptionValue, options.getString(testOptionKey, null));
// correlator.setOptions(LCSAddressCorrelator.class, options);
-// // save the options
+// // save the options
// SaveState saveState = new SaveState();
// controller.writeConfigState(saveState);
//
@@ -800,7 +790,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
// correlator.setOptions(LCSAddressCorrelator.class, options);
//
// // pull the values again and make sure they are still correct (that writing the config
-// // state did not change the cached controller and options)
+// // state did not change the cached controller and options)
// correlator = controller.getCorrelator();
// options = correlator.getOptions(LCSAddressCorrelator.class);
// assertEquals(secondNewValue, options.getString(testOptionKey, null));
@@ -820,9 +810,8 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
(JCheckBox) TestUtils.getInstanceField("excludeCheckbox", addressSetOptionsPanel);
assertNotNull(excludeCheckbox);
- JCheckBox showAddressSetPanelsCheckbox =
- (JCheckBox) TestUtils.getInstanceField("showAddressSetPanelsCheckbox",
- addressSetOptionsPanel);
+ JCheckBox showAddressSetPanelsCheckbox = (JCheckBox) TestUtils
+ .getInstanceField("showAddressSetPanelsCheckbox", addressSetOptionsPanel);
assertNotNull(showAddressSetPanelsCheckbox);
assertEquals("Exclude Accepted Matches checkbox", excludeAccepted,
@@ -844,9 +833,8 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
(JCheckBox) TestUtils.getInstanceField("excludeCheckbox", addressSetOptionsPanel);
assertNotNull(excludeCheckbox);
- JCheckBox showAddressSetPanelsCheckbox =
- (JCheckBox) TestUtils.getInstanceField("showAddressSetPanelsCheckbox",
- addressSetOptionsPanel);
+ JCheckBox showAddressSetPanelsCheckbox = (JCheckBox) TestUtils
+ .getInstanceField("showAddressSetPanelsCheckbox", addressSetOptionsPanel);
assertNotNull(showAddressSetPanelsCheckbox);
if (excludeCheckbox.isSelected() != excludeAccepted) {
@@ -908,9 +896,8 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
AddressSetView panelSourceSet =
(AddressSetView) TestUtils.invokeInstanceMethod("getAddressSetView", sourceSetPanel);
- AddressSetView panelDestinationSet =
- (AddressSetView) TestUtils.invokeInstanceMethod("getAddressSetView",
- destinationSetPanel);
+ AddressSetView panelDestinationSet = (AddressSetView) TestUtils
+ .invokeInstanceMethod("getAddressSetView", destinationSetPanel);
assertEquals("Source Address Set", desiredSourceSet, panelSourceSet);
assertEquals("Destination Address Set", desiredDestinationSet, panelDestinationSet);
}
@@ -1003,8 +990,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
(ChooseAddressSetEditorPanel) TestUtils.getInstanceField("panel", addressSetPanel);
assertNotNull(panel);
- JButton addRangeButton =
- (JButton) TestUtils.getInstanceField("addRangeButton", panel);
+ JButton addRangeButton = (JButton) TestUtils.getInstanceField("addRangeButton", panel);
assertNotNull("Couldn't get button for adding address range.", addRangeButton);
JButton listRemoveRangeButton =
(JButton) TestUtils.getInstanceField("removeRangeButton", panel);
@@ -1034,8 +1020,7 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
(ChooseAddressSetEditorPanel) TestUtils.getInstanceField("panel", addressSetPanel);
assertNotNull(panel);
- JButton addRangeButton =
- (JButton) TestUtils.getInstanceField("addRangeButton", panel);
+ JButton addRangeButton = (JButton) TestUtils.getInstanceField("addRangeButton", panel);
JButton subtractRangeButton =
(JButton) TestUtils.getInstanceField("subtractRangeButton", panel);
@@ -1051,8 +1036,8 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
}
}
- private void enterAddressRange(boolean isSource, String buttonText,
- String minAddress, String maxAddress) {
+ private void enterAddressRange(boolean isSource, String buttonText, String minAddress,
+ String maxAddress) {
AddRemoveAddressRangeDialog addRemoveDialog =
waitForDialogComponent(AddRemoveAddressRangeDialog.class);
@@ -1087,8 +1072,8 @@ public class VTAddToSessionTest extends AbstractGhidraHeadedIntegrationTest {
assertTrue("Dialog not closed after pressing: " + buttonText, !addRemoveDialog.isShowing());
}
- private void enterAddressRange(boolean isSource, String buttonText,
- Address minAddress, Address maxAddress) {
+ private void enterAddressRange(boolean isSource, String buttonText, Address minAddress,
+ Address maxAddress) {
AddRemoveAddressRangeDialog addRemoveDialog =
waitForDialogComponent(AddRemoveAddressRangeDialog.class);
diff --git a/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/gui/provider/AbstractVTCorrelatorTest.java b/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/gui/provider/AbstractVTCorrelatorTest.java
index c778c3fc25..5806fcc9b7 100644
--- a/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/gui/provider/AbstractVTCorrelatorTest.java
+++ b/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/gui/provider/AbstractVTCorrelatorTest.java
@@ -51,7 +51,6 @@ import ghidra.program.model.listing.Library;
import ghidra.program.model.listing.Program;
import ghidra.program.model.symbol.*;
import ghidra.test.AbstractGhidraHeadedIntegrationTest;
-import ghidra.util.HTMLUtilities;
import ghidra.util.Msg;
import ghidra.util.table.GhidraTable;
import ghidra.util.task.Task;
@@ -75,7 +74,6 @@ public abstract class AbstractVTCorrelatorTest extends AbstractGhidraHeadedInteg
protected WizardManager wizardManager;
public AbstractVTCorrelatorTest(String sourceProgLoc, String destProgLoc) {
- super();
this.sourceProgLoc = sourceProgLoc;
this.destProgLoc = destProgLoc;
}
@@ -132,16 +130,14 @@ public abstract class AbstractVTCorrelatorTest extends AbstractGhidraHeadedInteg
// Check the summary panel.
checkWizardButtonEnablement(true, false, true, true);
- String labelString = "" + "Operation:
" + "Session Name:
" +
- "Source Program:
" + "Destination Program:
" + "Program Correlator:
" +
+ String labelString = "Operation:
" + "Session Name:
" + "Source Program:
" +
+ "Destination Program:
" + "Program Correlator:
" +
"Exclude Accepted Matches:
" + "Source Address Set:
" +
"Destination Address Set:
" + "";
- String summaryString = "" + "Add to Version Tracking Session
" +
- session.getName() + "
" + srcProg.getName() + "
" + destProg.getName() + "
" +
- correlatorName + "
" + "No
" + "Entire Source Program
" +
- "Entire Destination Program
" + "";
- checkSummaryPanel(HTMLUtilities.toHTML(labelString), HTMLUtilities.toHTML(summaryString),
- wizardManager::finish);
+ String summaryString = "Add to Version Tracking Session
" + session.getName() + "
" +
+ srcProg.getName() + "
" + destProg.getName() + "
" + correlatorName + "
" +
+ "No
" + "Entire Source Program
" + "Entire Destination Program
" + "