#2772: byte array tests

objectionary · Jan 17, 2024 · c8d1ddf · c8d1ddf
1 parent 9d584fd
commit c8d1ddf
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 11 deletions.
diff --git a/eo-runtime/src/main/java/EOorg/EOeolang/EOerror.java b/eo-runtime/src/main/java/EOorg/EOeolang/EOerror.java
@@ -28,6 +28,8 @@
 package EOorg.EOeolang;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
 import org.eolang.AtFree;
 import org.eolang.AtLambda;
 import org.eolang.Attr;
@@ -143,38 +145,40 @@ private static String safeMessage(final Phi enclosure) {
                 result = "null Phi";
             } else {
                 try {
-                    final byte[] data = new Dataized(enclosure).take();
-                    switch (data.length) {
+                    final byte[] raw = new Dataized(enclosure).take();
+                    final Bytes bytes = new BytesOf(raw);
+                    switch (raw.length) {
                         case 0:
                             result = String.format(
-                                "%s(Δ = --)",
-                                enclosure
+                                "%s(Δ = %s",
+                                enclosure,
+                                bytes
                             );
                             break;
                         case 1:
                             result = String.format(
-                                "%s(Δ = %s)",
+                                "%s(Δ = %s or %s)",
                                 enclosure,
-                                data[0] != 0
+                                bytes,
+                                raw[0] != 0
                             );
                             break;
                         case 8:
-                            final Bytes bytes = new BytesOf(data);
                             result = String.format(
                                 "%s(Δ = %s = %s, or %s, or %s)",
                                 enclosure,
                                 bytes,
                                 bytes.asNumber(Long.class),
                                 bytes.asNumber(Double.class),
-                                new String(data, StandardCharsets.UTF_8)
+                                new String(raw, StandardCharsets.UTF_8)
                             );
                             break;
                         default:
                             result = String.format(
                                 "%s(Δ = %s or %s)",
                                 enclosure,
-                                new BytesOf(data),
-                                new String(data, StandardCharsets.UTF_8)
+                                bytes,
+                                new String(raw, StandardCharsets.UTF_8)
                             );
                     }
                 } catch (final Throwable first) {

diff --git a/eo-runtime/src/test/java/EOorg/EOeolang/EOerrorTest.java b/eo-runtime/src/test/java/EOorg/EOeolang/EOerrorTest.java
@@ -27,9 +27,11 @@
  */
 package EOorg.EOeolang;
 
+import java.util.Arrays;
 import java.util.stream.Stream;
 import org.eolang.AtComposite;
 import org.eolang.AtOnce;
+import org.eolang.BytesOf;
 import org.eolang.Data;
 import org.eolang.Dataized;
 import org.eolang.ExAbstract;
@@ -81,8 +83,24 @@ void getsReadableError(final Object cnst) {
         );
     }
 
+    @ParameterizedTest
+    @MethodSource("getTestByteArraySources")
+    void getsReadableByteArrayError(final byte[] cnst) {
+        ExAbstract error = null;
+        try {
+            new Dataized(new MyError(cnst)).take();
+        } catch (final ExAbstract exc) {
+            error = exc;
+        }
+        assert error != null;
+        MatcherAssert.assertThat(
+            error.toString(),
+            Matchers.containsString(Arrays.toString(cnst))
+        );
+    }
+
     /**
-     * Input arguments for getsReadableError unit test.
+     * Input arguments for getsReadableError unit tests.
      * @return Stream of arguments.
      */
     private static Stream<Object> getTestSources() {
@@ -95,6 +113,19 @@ private static Stream<Object> getTestSources() {
         );
     }
 
+    /**
+     * Input arguments for getsReadableByteArrayError unit tests.
+     * @return Stream of arguments.
+     */
+    private static Stream<byte[]> getTestByteArraySources() {
+        return Stream.of(
+            new byte[]{},
+            new byte[]{12},
+            new byte[]{10, 11, 12, 13, 14, 15, 16, 17},
+            new byte[]{10, 11, 12, 13, 14, 15, 16, 17, -18, -19, -20, -21, 22}
+        );
+    }
+
     /**
      * The object below.
      * [] > my-error