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

Merge remote-tracking branch

Browse source 
'origin/GT-3545-dragonmacher-gnu-demangler-parsing-bugs'

Fixes #1457 Fixes #1569
This commit is contained in:
ghidorahrex 2020-03-13 12:51:40 -04:00
commit f1782a7629
59 changed files with 3255 additions and 7594 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/CodeBrowserPluginScreenShots.java
View file

@ -15,7 +15,7 @@
*/
package help.screenshot;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.*;
import java.awt.*;
import java.awt.event.ActionListener;
@ -148,7 +148,7 @@ public class CodeBrowserPluginScreenShots extends GhidraScreenShotGenerator {
makeSelection(0x0406be1, 0x0406bf1);
performAction("Create Table From Selection", "CodeBrowserPlugin", true);
Window window = waitForWindowByTitleContaining(null, "Selection Table", 2000);
Window window = waitForWindowByTitleContaining("Selection Table");
Point loc = plugin.getListingPanel().getLocationOnScreen();
Dimension size = window.getSize();
window.setBounds(loc.x + 300, loc.y + 150, size.width, 300);
@ -240,7 +240,7 @@ public class CodeBrowserPluginScreenShots extends GhidraScreenShotGenerator {
JWindow popup = (JWindow) waitForWindowByName("ListingHoverProvider");
paintFix(popup);
captureProvider(CodeViewerProvider.class);
CodeViewerProvider provider = getProvider(CodeViewerProvider.class);
captureProviderWithScreenShot(provider);
}

2
Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/NavigationScreenShots.java
View file

@ -142,7 +142,7 @@ public class NavigationScreenShots extends GhidraScreenShotGenerator {
setGotoText(dialog, "LAB*");
pressOkOnDialog();
Window window =
waitForWindowByTitleContaining(null, "Search Limit Exceeded!", DEFAULT_WINDOW_TIMEOUT);
waitForWindowByTitleContaining("Search Limit Exceeded!");
assertNotNull(window);
pressButtonByText(window, "OK");
waitForSwing();