From 2928c54a22976787613c2d49fbc42592f4e97092 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Wed, 20 Jan 2021 10:47:13 -0500 Subject: [PATCH] Fixed ignored test --- .../ghidra/app/merge/datatypes/DataTypeMerge3Test.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge3Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge3Test.java index 1a6e1fc287..78ea69269c 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge3Test.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge3Test.java @@ -17,7 +17,8 @@ package ghidra.app.merge.datatypes; import static org.junit.Assert.*; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; import ghidra.program.database.*; import ghidra.program.model.data.*; @@ -1246,12 +1247,10 @@ public class DataTypeMerge3Test extends AbstractDataTypeMergeTest { } - @Test - @Ignore +// TODO See GP-585 for design issue preventing this test from passing +// @Test public void testEditStructureWithReplacementAndRemoval() throws Exception { - // See GP-585 for design issue preventing this test from passing - mtf.initialize("notepad", new OriginalProgramModifierListener() { @Override