From b81ea073a974550833421213e8ea1303a22d1452 Mon Sep 17 00:00:00 2001 From: Volker Berlin Date: Sun, 20 Oct 2019 12:43:26 +0200 Subject: [PATCH] Improve error message if there is not an expected number --- .../inetsoftware/jwebassembly/WasmRule.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/test/de/inetsoftware/jwebassembly/WasmRule.java b/test/de/inetsoftware/jwebassembly/WasmRule.java index e9b872a..52fcccc 100644 --- a/test/de/inetsoftware/jwebassembly/WasmRule.java +++ b/test/de/inetsoftware/jwebassembly/WasmRule.java @@ -375,14 +375,25 @@ public class WasmRule extends TemporaryFolder { expected = new Integer( ((Boolean)expected) ? 1 : 0 ); } - String actual = evalWasm( script, methodName, params ); + Object actual; + String actualStr = evalWasm( script, methodName, params ); if( expected instanceof Double ) { // handle different string formating of double values - assertEquals( actual, expected, Double.valueOf( actual ) ); + try { + actual = Double.valueOf( actualStr ); + } catch( NumberFormatException ex ) { + actual = actualStr; + } } else if( expected instanceof Float ) { // handle different string formating of float values - assertEquals( actual, expected, Float.valueOf( actual ) ); + try { + actual = Float.valueOf( actualStr ); + } catch( NumberFormatException ex ) { + actual = actualStr; + } } else { - assertEquals( String.valueOf( expected ), actual ); + expected = String.valueOf( expected ); + actual = actualStr; } + assertEquals( expected, actual ); } catch( Throwable ex ) { failed = true; throwException( ex );