Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-10 14:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-5-28-24'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-05-28 11:04:04 -04:00
commit 298602b2d7
2 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Ghidra/Framework/Docking/src/test/java/docking/widgets/table/columnfilter/ColumnTableFilterTest.java
View File

@ -86,8 +86,7 @@ public class ColumnTableFilterTest extends AbstractDockingTest {
testTableModel.addColumn("Name",
new String[] { "Hello World\n", "\nHello World", "Hello\nWorld", "Hello World" });
testTableModel.addColumn("Long ID",
new Long[] { 1000l, 2000l, 3000l });
testTableModel.addColumn("Long ID", new Long[] { 1000l, 2000l, 3000l });
return new TableModelWrapper<>(testTableModel);
}
@ -775,18 +774,22 @@ public class ColumnTableFilterTest extends AbstractDockingTest {
private void addFilter(String columnName, String constraintName, String constraintValue,
LogicOperation logicOperation, boolean first) {
DialogFilterRow filterRow = createFilterRow(logicOperation, first);
ColumnFilterData<?> columnData = getColumnFilterData(columnName);
filterRow.setColumnData(columnData);
List<DialogFilterCondition<?>> conditions = filterRow.getFilterConditions();
DialogFilterCondition<?> condition = conditions.get(0);
condition.setSelectedConstraint(constraintName);
condition.setValue(constraintValue, null);
// Many of the hasValidValue() implementations compare against a GUI component that
// doesn't get built without these calls.
condition.getInlineEditorComponent();
condition.getDetailEditorComponent();
runSwing(() -> {
DialogFilterRow filterRow = createFilterRow(logicOperation, first);
ColumnFilterData<?> columnData = getColumnFilterData(columnName);
filterRow.setColumnData(columnData);
List<DialogFilterCondition<?>> conditions = filterRow.getFilterConditions();
DialogFilterCondition<?> condition = conditions.get(0);
condition.setSelectedConstraint(constraintName);
condition.setValue(constraintValue, null);
// Many of the hasValidValue() implementations compare against a GUI component that
// doesn't get built without these calls.
condition.getInlineEditorComponent();
condition.getDetailEditorComponent();
});
}
private DialogFilterRow createFilterRow(LogicOperation logicalOp, boolean first) {
@ -799,8 +802,10 @@ public class ColumnTableFilterTest extends AbstractDockingTest {
}
private void applyFilter() {
ColumnBasedTableFilter<Integer> tableColumnFilter = filterModel.getTableColumnFilter();
tableModel.setTableFilter(tableColumnFilter);
runSwing(() -> {
ColumnBasedTableFilter<Integer> tableColumnFilter = filterModel.getTableColumnFilter();
tableModel.setTableFilter(tableColumnFilter);
});
}
private ColumnFilterData<?> getColumnFilterData(String columnName) {
@ -816,31 +821,34 @@ public class ColumnTableFilterTest extends AbstractDockingTest {
private void addConstraints(String columnName, String[] constraintNames,
String[] constraintValues, boolean first) {
DialogFilterRow filterRow = createFilterRow(LogicOperation.AND, first);
ColumnFilterData<?> columnData = getColumnFilterData(columnName);
filterRow.setColumnData(columnData);
runSwing(() -> {
DialogFilterRow filterRow = createFilterRow(LogicOperation.AND, first);
ColumnFilterData<?> columnData = getColumnFilterData(columnName);
filterRow.setColumnData(columnData);
// set the first one
List<DialogFilterCondition<?>> conditions = filterRow.getFilterConditions();
DialogFilterCondition<?> condition = conditions.get(0);
condition.setSelectedConstraint(constraintNames[0]);
condition.setValue(constraintValues[0], null);
// Many of the hasValidValue() implementations compare against a GUI component that
// doesn't get built without these calls.
condition.getInlineEditorComponent();
condition.getDetailEditorComponent();
for (int i = 1; i < constraintNames.length; i++) {
DialogFilterCondition<?> c = filterRow.addFilterCondition();
c.setSelectedConstraint(constraintNames[i]);
c.setValue(constraintValues[i], null);
// set the first one
List<DialogFilterCondition<?>> conditions = filterRow.getFilterConditions();
DialogFilterCondition<?> condition = conditions.get(0);
condition.setSelectedConstraint(constraintNames[0]);
condition.setValue(constraintValues[0], null);
// Many of the hasValidValue() implementations compare against a GUI component that
// doesn't get built without these calls.
c.getInlineEditorComponent();
c.getDetailEditorComponent();
}
condition.getInlineEditorComponent();
condition.getDetailEditorComponent();
for (int i = 1; i < constraintNames.length; i++) {
DialogFilterCondition<?> c = filterRow.addFilterCondition();
c.setSelectedConstraint(constraintNames[i]);
c.setValue(constraintValues[i], null);
// Many of the hasValidValue() implementations compare against a GUI component that
// doesn't get built without these calls.
c.getInlineEditorComponent();
c.getDetailEditorComponent();
}
});
}
}

6
Ghidra/Framework/Docking/src/test/java/docking/widgets/table/columnfilter/TestTableModel.java
View File

@ -20,13 +20,11 @@ import java.util.List;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.AbstractTableModel;
import docking.widgets.table.RowObjectTableModel;
/**
* Table model used by {@link ColumnTableFilterTest}
*/
class TestTableModel implements RowObjectTableModel<Integer> {
public class TestTableModel extends AbstractTableModel implements RowObjectTableModel<Integer> {
private List<ColumnTestData<?>> columns = new ArrayList<>();
private int rowCount = 0;