From 871862dbe13c1748d0ee0419b03e5e8c4026b92e Mon Sep 17 00:00:00 2001
From: dev747368 <48332326+dev747368@users.noreply.github.com>
Date: Tue, 18 Feb 2020 11:29:49 -0500
Subject: [PATCH] Fix tests that relied on string format of hex values

---
 .../ghidra/app/plugin/core/data/DataAction4Test.java   | 10 +++++-----
 .../app/plugin/core/equate/EquatePlugin1Test.java      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/data/DataAction4Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/data/DataAction4Test.java
index 2ea75aed19..058a6264a9 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/data/DataAction4Test.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/data/DataAction4Test.java
@@ -818,7 +818,7 @@ public class DataAction4Test extends AbstractDataActionTest {
 
 		d = getContextData();
 		assertEquals("ChooseFontW\0\u0015\0ReplaceTextW\0\0\u0004", d.getValue());
-		assertEquals("\"ChooseFontW\\0\",15,\"\\0ReplaceTextW\\0\\0\",04",
+		assertEquals("\"ChooseFontW\\0\",15h,\"\\0ReplaceTextW\\0\\0\",04h",
 			d.getDefaultValueRepresentation());
 
 	}
@@ -851,7 +851,7 @@ public class DataAction4Test extends AbstractDataActionTest {
 		assertEquals("\"ChooseFontW\"", d.getDefaultValueRepresentation());
 
 		d = checkNextData(dit, TerminatedStringDataType.class, 0x01006a0e, 2);
-		assertEquals("15", d.getDefaultValueRepresentation());
+		assertEquals("15h", d.getDefaultValueRepresentation());
 
 		d = checkNextData(dit, TerminatedStringDataType.class, 0x01006a10, 13);
 		assertEquals("ReplaceTextW", d.getValue());
@@ -862,7 +862,7 @@ public class DataAction4Test extends AbstractDataActionTest {
 		assertEquals("\"\"", d.getDefaultValueRepresentation());
 
 		d = checkNextData(dit, TerminatedStringDataType.class, 0x01006a1e, 2);
-		assertEquals("04", d.getDefaultValueRepresentation());
+		assertEquals("04h", d.getDefaultValueRepresentation());
 	}
 
 	@Test
@@ -890,7 +890,7 @@ public class DataAction4Test extends AbstractDataActionTest {
 		checkOnDefined(null, UnicodeDataType.class);
 
 		d = getContextData();
-		assertEquals("01,00,\"\\0Sample\"", d.getDefaultValueRepresentation());
+		assertEquals("01h,00h,\"\\0Sample\"", d.getDefaultValueRepresentation());
 		assertEquals("\1\0Sample", d.getValue());
 
 	}
@@ -925,7 +925,7 @@ public class DataAction4Test extends AbstractDataActionTest {
 		// check for wchar16[2] garbage string
 		d = checkNextData(dit, TerminatedUnicodeDataType.class, 0x01008014, 4);
 		assertEquals(d.getLength(), 4);
-		assertEquals("01,00", d.getDefaultValueRepresentation());
+		assertEquals("01h,00h", d.getDefaultValueRepresentation());
 		assertEquals("\1", d.getValue());
 
 		// check for "Sample" string
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/equate/EquatePlugin1Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/equate/EquatePlugin1Test.java
index 340ad37bc5..ed7d244862 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/equate/EquatePlugin1Test.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/equate/EquatePlugin1Test.java
@@ -1175,7 +1175,7 @@ public class EquatePlugin1Test extends AbstractEquatePluginTest {
 		performAction("Convert To Char");
 
 		ListingTextField tf = (ListingTextField) cb.getCurrentField();
-		assertEquals("'\\x02'", tf.getFieldElement(0, 11).getText());
+		assertEquals("02h", tf.getFieldElement(0, 11).getText());
 
 		undo(program);
 		tf = (ListingTextField) cb.getCurrentField();
@@ -1184,7 +1184,7 @@ public class EquatePlugin1Test extends AbstractEquatePluginTest {
 
 		redo(program);
 		tf = (ListingTextField) cb.getCurrentField();
-		assertEquals("'\\x02'", tf.getFieldElement(0, 11).getText());
+		assertEquals("02h", tf.getFieldElement(0, 11).getText());
 	}
 
 	@Test