Merge remote-tracking branch 'origin/GT-3599-dragonmacher-analysis-rollback-on-exception'

This commit is contained in:
ghidravore 2020-08-05 12:39:33 -04:00
commit e828628bd9
6 changed files with 291 additions and 76 deletions

View file

@ -15,15 +15,13 @@
*/
package ghidra.feature.vt.gui.filters;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;
import java.io.IOException;
import java.util.*;
import org.junit.*;
import db.DBHandle;
import ghidra.feature.vt.api.db.VTSessionDB;
import ghidra.feature.vt.api.impl.VTChangeManager;
import ghidra.feature.vt.api.impl.VersionTrackingChangeRecord;
@ -32,7 +30,7 @@ import ghidra.feature.vt.db.DummyTestProgramCorrelator;
import ghidra.feature.vt.db.VTBaseTestCase;
import ghidra.feature.vt.gui.plugin.VTController;
import ghidra.feature.vt.gui.plugin.VTControllerListener;
import ghidra.framework.data.DomainObjectAdapterDB;
import ghidra.framework.data.DummyDomainObject;
import ghidra.framework.model.*;
import ghidra.framework.plugintool.ServiceProvider;
import ghidra.program.model.listing.Program;
@ -433,23 +431,6 @@ public class TagFilterTest extends VTBaseTestCase {
}
}
class DummyDomainObject extends DomainObjectAdapterDB {
protected DummyDomainObject(Object consumer) throws IOException {
super(new DBHandle(), "Dummy", 10, 1, consumer);
}
@Override
public String getDescription() {
return "Test object: " + getName();
}
@Override
public boolean isChangeable() {
return true;
}
}
public static VTProgramCorrelator createProgramCorrelator(ServiceProvider serviceProvider,
Program sourceProgram, Program destinationProgram) {
return new DummyTestProgramCorrelator(serviceProvider, sourceProgram, destinationProgram);