From 5764e7174edb8c3f0fd294e3dfb64914c0c8a621 Mon Sep 17 00:00:00 2001 From: dev747368 <48332326+dev747368@users.noreply.github.com> Date: Tue, 23 Apr 2019 14:16:26 -0400 Subject: [PATCH] GT-2698 fix a bad test Test was comparing classes backwards. --- .../java/ghidra/app/plugin/core/diff/DiffTestAdapter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffTestAdapter.java b/Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffTestAdapter.java index 2caf34bd2a..5beaf398c9 100644 --- a/Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffTestAdapter.java +++ b/Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffTestAdapter.java @@ -730,14 +730,14 @@ public class DiffTestAdapter extends AbstractGhidraHeadedIntegrationTest { performAction(action); } - Component getComponentOfType(Container container, Class componentClass) { + T getComponentOfType(Container container, Class componentClass) { Component[] comps = container.getComponents(); for (Component element : comps) { - if (element.getClass().isAssignableFrom(componentClass)) { - return element; + if (componentClass.isInstance(element)) { + return componentClass.cast(element); } else if (element instanceof Container) { - Component subComp = getComponentOfType((Container) element, componentClass); + T subComp = getComponentOfType((Container) element, componentClass); if (subComp != null) { return subComp; }