From 283e148b26e3e73729f4d52841566e6e1c81ebbf Mon Sep 17 00:00:00 2001
From: dev747368 <48332326+dev747368@users.noreply.github.com>
Date: Thu, 30 Jan 2020 12:30:44 -0500
Subject: [PATCH] GT-0 fix unittests broken by string rep changes

---
 .../plugin/core/datapreview/DataTypePreviewPluginTest.java  | 6 +++---
 .../ghidra/app/plugin/core/script/EditBytesScriptTest.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datapreview/DataTypePreviewPluginTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datapreview/DataTypePreviewPluginTest.java
index 2a478cac74..5637560c5b 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datapreview/DataTypePreviewPluginTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/datapreview/DataTypePreviewPluginTest.java
@@ -18,7 +18,7 @@
  */
 package ghidra.app.plugin.core.datapreview;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import org.junit.*;
 
@@ -86,7 +86,7 @@ public class DataTypePreviewPluginTest extends AbstractGhidraHeadedIntegrationTe
 		assertEquals(
 			"u\"The Margin values are not correct. Either they are not numeric characters " +
 				"or they don't fit the dimensions of the page. Try either entering a number " +
-				"or decreasing the margins.\",02,00,\"&f\\aPage &p\"",
+				"or decreasing the margins.\",02h,00h,\"&f\\aPage &p\"",
 			model.getValueAt(7, DTPPTableModel.PREVIEW_COL));
 
 		gotoService.goTo(addr(program, 0x100e08c));
@@ -118,7 +118,7 @@ public class DataTypePreviewPluginTest extends AbstractGhidraHeadedIntegrationTe
 		assertEquals("6.119088925166103E-308", model.getValueAt(9, DTPPTableModel.PREVIEW_COL));
 		assertEquals("2600h", model.getValueAt(10, DTPPTableModel.PREVIEW_COL));
 		assertEquals("7000h", model.getValueAt(11, DTPPTableModel.PREVIEW_COL));
-		assertEquals("\"\\0\\0\\0\\0\\0\\0\\0\",0E,\"\\0f\"",
+		assertEquals("\"\\0\\0\\0\\0\\0\\0\\0\",0Eh,\"\\0f\"",
 			model.getValueAt(12, DTPPTableModel.PREVIEW_COL));
 
 		assertEquals(14, model.getRowCount());
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/EditBytesScriptTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/EditBytesScriptTest.java
index c09afb8fe6..ec5963ba16 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/EditBytesScriptTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/EditBytesScriptTest.java
@@ -250,7 +250,7 @@ public class EditBytesScriptTest extends AbstractGhidraHeadedIntegrationTest {
 
 		assertData(dsAddr, 6, "6d 6f 72 65 11 00", "ds");
 
-		assertOperands(dsAddr, "\"more\",11");
+		assertOperands(dsAddr, "\"more\",11h");
 	}
 
 	//Change bytes in string to make different string of longer length by overwriting null