Ghidra is a software reverse engineering (SRE) framework
fixing merger tests
ghidragon660a4bb235d0
diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/EnumMergerTest.java b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/EnumMergerTest.javaindex 717df34aca..6d3cbb9491 100644--- a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/EnumMergerTest.java+++ b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/EnumMergerTest.java@@ -141,7 +141,7 @@ public class EnumMergerTest extends AbstractGenericTest {}catch (DataTypeMergeException e) {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());}}diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/UnionMergerTest.java b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/UnionMergerTest.javaindex 4ea6d510c6..afc6d57dde 100644--- a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/UnionMergerTest.java+++ b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/data/merge/UnionMergerTest.java@@ -156,7 +156,7 @@ public class UnionMergerTest extends AbstractGenericTest {Union result = merger.merge();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));}@@ -178,7 +178,7 @@ public class UnionMergerTest extends AbstractGenericTest {Union result = merger.merge();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));}@@ -200,7 +200,7 @@ public class UnionMergerTest extends AbstractGenericTest {Union result = merger.merge();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));}