yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +02:00
Code Issues Releases Wiki Activity

GP-0 corrected diff apply failures

Browse source
This commit is contained in:
James 2024-12-17 17:12:06 +00:00
parent a414919073
commit 5a156112a0
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffApplyTestAdapter.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -204,15 +204,15 @@ public class DiffApplyTestAdapter extends DiffTestAdapter {
(JComboBox<?>) findComponentByName(settingsPanel, "Code Units Diff Apply CB"); (JComboBox<?>) findComponentByName(settingsPanel, "Code Units Diff Apply CB");
refApplyCB = (JComboBox<?>) findComponentByName(settingsPanel, "References Diff Apply CB"); refApplyCB = (JComboBox<?>) findComponentByName(settingsPanel, "References Diff Apply CB");
plateCommentApplyCB = plateCommentApplyCB =
(JComboBox<?>) findComponentByName(settingsPanel, "Plate Comments Diff Apply CB"); (JComboBox<?>) findComponentByName(settingsPanel, "Comments, Plate Diff Apply CB");
preCommentApplyCB = preCommentApplyCB =
(JComboBox<?>) findComponentByName(settingsPanel, "Pre Comments Diff Apply CB"); (JComboBox<?>) findComponentByName(settingsPanel, "Comments, Pre Diff Apply CB");
eolCommentApplyCB = eolCommentApplyCB =
(JComboBox<?>) findComponentByName(settingsPanel, "Eol Comments Diff Apply CB"); (JComboBox<?>) findComponentByName(settingsPanel, "Comments, EOL Diff Apply CB");
repeatableCommentApplyCB = repeatableCommentApplyCB =
(JComboBox<?>) findComponentByName(settingsPanel, "Repeatable Comments Diff Apply CB"); (JComboBox<?>) findComponentByName(settingsPanel, "Comments, Repeatable Diff Apply CB");
postCommentApplyCB = postCommentApplyCB =
(JComboBox<?>) findComponentByName(settingsPanel, "Post Comments Diff Apply CB"); (JComboBox<?>) findComponentByName(settingsPanel, "Comments, Post Diff Apply CB");
labelApplyCB = (JComboBox<?>) findComponentByName(settingsPanel, "Labels Diff Apply CB"); labelApplyCB = (JComboBox<?>) findComponentByName(settingsPanel, "Labels Diff Apply CB");
functionApplyCB = functionApplyCB =
(JComboBox<?>) findComponentByName(settingsPanel, "Functions Diff Apply CB"); (JComboBox<?>) findComponentByName(settingsPanel, "Functions Diff Apply CB");

4
Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffTestAdapter.java
View file

@ -103,6 +103,7 @@ public class DiffTestAdapter extends AbstractGhidraHeadedIntegrationTest {
JCheckBox functionCB; JCheckBox functionCB;
JCheckBox bookmarkCB; JCheckBox bookmarkCB;
JCheckBox propertiesCB; JCheckBox propertiesCB;
JCheckBox sourceMapCB;
JCheckBox limitToSelectionCB; JCheckBox limitToSelectionCB;
JTextArea limitText; JTextArea limitText;
@ -1072,6 +1073,7 @@ public class DiffTestAdapter extends AbstractGhidraHeadedIntegrationTest {
functionCB = (JCheckBox) findComponentByName(win, "FunctionsDiffCB"); functionCB = (JCheckBox) findComponentByName(win, "FunctionsDiffCB");
bookmarkCB = (JCheckBox) findComponentByName(win, "BookmarksDiffCB"); bookmarkCB = (JCheckBox) findComponentByName(win, "BookmarksDiffCB");
propertiesCB = (JCheckBox) findComponentByName(win, "PropertiesDiffCB"); propertiesCB = (JCheckBox) findComponentByName(win, "PropertiesDiffCB");
sourceMapCB = (JCheckBox) findComponentByName(win, "SourceMapDiffCB");
limitToSelectionCB = (JCheckBox) findComponentByName(win, "LimitToSelectionDiffCB"); limitToSelectionCB = (JCheckBox) findComponentByName(win, "LimitToSelectionDiffCB");
limitText = (JTextArea) findComponentByName(win, "AddressTextArea"); limitText = (JTextArea) findComponentByName(win, "AddressTextArea");
@ -1079,7 +1081,7 @@ public class DiffTestAdapter extends AbstractGhidraHeadedIntegrationTest {
void setAllTypes(boolean select) { void setAllTypes(boolean select) {
setCheckBoxes(select, new JCheckBox[] { programContextCB, byteCB, codeUnitCB, refCB, setCheckBoxes(select, new JCheckBox[] { programContextCB, byteCB, codeUnitCB, refCB,
commentCB, labelCB, functionCB, bookmarkCB, propertiesCB }); commentCB, labelCB, functionCB, bookmarkCB, propertiesCB, sourceMapCB });
} }
void topOfFile(final FieldPanel fp) { void topOfFile(final FieldPanel fp) {