From 0580fa23c6a58f9420532317b1aa3995bc513576 Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Sat, 25 Apr 2020 13:01:50 -0700 Subject: [PATCH] This should be the last fix. --- .../platform/ByReferencePlatformToStringTest.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/contrib/platform/test/com/sun/jna/platform/ByReferencePlatformToStringTest.java b/contrib/platform/test/com/sun/jna/platform/ByReferencePlatformToStringTest.java index 5c43ebb027..8d87f2625e 100644 --- a/contrib/platform/test/com/sun/jna/platform/ByReferencePlatformToStringTest.java +++ b/contrib/platform/test/com/sun/jna/platform/ByReferencePlatformToStringTest.java @@ -151,18 +151,23 @@ public void testPlatformToStrings() { parseAndTest(vboolbr2.toString(), "VARIANT_BOOL", "1"); VARTYPEByReference varbr = new VARTYPEByReference(new VARTYPE(42)); - parseAndTest(varbr.toString(), "VARTYPE", "0"); + parseAndTest(varbr.toString(), "VARTYPE", "42"); WORDByReference wbr = new WORDByReference(new WORD(42)); parseAndTest(wbr.toString(), "WORD", "42"); - // No way to set value on these without native code + // No way to set value on these without native code. Both methods read a random + // NativeLong and return null if 0 or a random hex string otherwise AtomByReference abr = new AtomByReference(); - // always null - assertTrue(abr.toString().startsWith("null@0x")); + String atomStr = abr.toString(); + if (abr.getValue() == null) { + assertTrue(abr.toString().startsWith("null@0x")); + } else { + assertTrue(atomStr.startsWith("Atom@0x")); + assertTrue(atomStr.contains("=0x")); + } WindowByReference windowbr = new WindowByReference(); - // either null or a random NativeLong hex string String windowStr = windowbr.toString(); if (windowbr.getValue() == null) { assertTrue(windowStr.startsWith("null@0x"));