objectionary#2645: Edited MainTest

levBagryansky · Jan 18, 2024 · c10d2cb · c10d2cb
1 parent eb26ee3
commit c10d2cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/eo-runtime/src/main/java/org/eolang/ToStringVerbose.java b/eo-runtime/src/main/java/org/eolang/ToStringVerbose.java
@@ -24,6 +24,7 @@
 package org.eolang;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.function.Function;
 
 /**
@@ -42,29 +43,29 @@ public String apply(final byte[] raw) {
             case 0:
                 result = String.format(
                     "%s",
-                    bytes
+                    Arrays.toString(raw)
                 );
                 break;
             case 1:
                 result = String.format(
                     "%s = %s",
-                    bytes,
+                    Arrays.toString(raw),
                     raw[0] != 0
                 );
                 break;
             case 8:
                 result = String.format(
-                    "%s = %s, or %s, or %s)",
-                    bytes,
+                    "%s = %s, or %s, or \"%s\")",
+                    Arrays.toString(raw),
                     bytes.asNumber(Long.class),
                     bytes.asNumber(Double.class),
                     new String(raw, StandardCharsets.UTF_8)
                 );
                 break;
             default:
                 result = String.format(
-                    "%s = %s",
-                    bytes,
+                    "%s = \"%s\"",
+                    Arrays.toString(raw),
                     new String(raw, StandardCharsets.UTF_8)
                 );
         }

diff --git a/eo-runtime/src/test/java/EOorg/EOeolang/EOerrorTest.java b/eo-runtime/src/test/java/EOorg/EOeolang/EOerrorTest.java
@@ -79,7 +79,9 @@ void getsReadableError(final Object cnst) {
         assert error != null;
         MatcherAssert.assertThat(
             error.toString(),
-            Matchers.containsString(cnst.toString())
+            Matchers.containsString(
+                new ToStringVerboseTest.ArgumentsUtils().toString(cnst)
+            )
         );
     }
 

diff --git a/eo-runtime/src/test/java/org/eolang/MainTest.java b/eo-runtime/src/test/java/org/eolang/MainTest.java
@@ -66,7 +66,11 @@ void printsHelp() {
     void deliversCleanOutput() {
         MatcherAssert.assertThat(
             MainTest.exec("org.eolang.io.tupled-stdout", "Hello!"),
-            Matchers.equalTo(String.format("Hello!%n---%n%s%n", Arrays.toString(new byte[]{0x01})))
+            Matchers.stringContainsInOrder(
+                String.format("Hello!%n---%n"),
+                "true",
+                String.format("%n")
+            )
         );
     }