Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 07:39:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_ghidragon_junit_fixes_Feb18'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-02-18 13:50:24 -05:00
parent 9f558ce395 660a4bb235
commit 33769562c4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/EnumMergerTest.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class EnumMergerTest extends AbstractGenericTest {
} }
catch (DataTypeMergeException e) { catch (DataTypeMergeException e) {
assertEquals( assertEquals(
"Enum conflict due to one enum having negative values and the other large unsigned values", "Enum conflict: one enum has negative values: one has large unsigned values",
e.getMessage()); e.getMessage());
} }
} }
Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/UnionMergerTest.java
+3 -3
View File
@@ -156,7 +156,7 @@ public class UnionMergerTest extends AbstractGenericTest {
Union result = merger.merge(); Union result = merger.merge();
assertUnionEquals(expected, result); assertUnionEquals(expected, result);
assertEquals("Merging \"undefined4\" and \"int to \"int\" for member \"joe\".", assertEquals("Merging 'undefined4' and 'int' to 'int' for member 'joe'.",
merger.getWarnings().get(0)); merger.getWarnings().get(0));
} }
@@ -178,7 +178,7 @@ public class UnionMergerTest extends AbstractGenericTest {
Union result = merger.merge(); Union result = merger.merge();
assertUnionEquals(expected, result); assertUnionEquals(expected, result);
assertEquals("Merging \"int\" and \"undefined4 to \"int\" for member \"joe\".", assertEquals("Merging 'int' and 'undefined4' to 'int' for member 'joe'.",
merger.getWarnings().get(0)); merger.getWarnings().get(0));
} }
@@ -200,7 +200,7 @@ public class UnionMergerTest extends AbstractGenericTest {
Union result = merger.merge(); Union result = merger.merge();
assertUnionEquals(expected, result); assertUnionEquals(expected, result);
assertEquals("Merging \"int\" and \"word * to \"word *\" for member \"joe\".", assertEquals("Merging 'int' and 'word *' to 'word *' for member 'joe'.",
merger.getWarnings().get(0)); merger.getWarnings().get(0));
} }