objectionary#3793 fix Expect

eo-runtime/src/main/java/org/eolang/Expect.java

@@ -81,7 +81,13 @@ public static Expect<Phi> at(final Phi phi, final String attr) {
     public <R> Expect<R> that(final Function<T, R> fun) {
         return new Expect<>(
             this.subject,
-            () -> fun.apply(this.sup.get())
+            () -> {
+                try {
+                    return fun.apply(this.sup.get());
+                } catch (ExFailure ex) {
+                    throw new ExpectFailureInThat(ex.getMessage(), ex);
+                }
+            }
         );
     }
 
@@ -96,11 +102,16 @@ public Expect<T> otherwise(final String message) {
             () -> {
                 try {
                     return this.sup.get();
-                } catch (final ExFailure ex) {
+                } catch (final ExpectFailureInMust ex) {
                     throw new ExFailure(
                         String.format("%s %s %s", this.subject, ex.getMessage(), message),
                         ex
                     );
+                } catch (final ExpectFailureInThat ex) {
+                    throw new ExFailure(
+                        message,
+                        ex
+                    );
                 }
             }
         );
@@ -117,7 +128,7 @@ public Expect<T> must(final Function<T, Boolean> fun) {
             () -> {
                 final T ret = this.sup.get();
                 if (!fun.apply(ret)) {
-                    throw new ExFailure(
+                    throw new ExpectFailureInMust(
                         String.format("(%s)", ret)
                     );
                 }
@@ -134,5 +145,4 @@ public Expect<T> must(final Function<T, Boolean> fun) {
     public T it() {
         return this.sup.get();
     }
-
 }

eo-runtime/src/main/java/org/eolang/ExpectFailureInMust.java

@@ -0,0 +1,57 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2025 Objectionary.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.eolang;
+
+/**
+ * Expect exception.
+ *
+ * @since 0.51
+ */
+class ExpectFailureInMust extends ExFailure {
+
+    /**
+     * Serialization identifier.
+     */
+    private static final long serialVersionUID = 597748325437012615L;
+
+    /**
+     * Ctor.
+     * @param cause Exception cause
+     * @param args Arguments for {@link String#format(String, Object...)}
+     */
+    public ExpectFailureInMust(final String cause, final Object... args) {
+        super(String.format(cause, args));
+    }
+
+    /**
+     * Ctor.
+     * @param cause Exception cause
+     * @param root Cause exception
+     */
+    public ExpectFailureInMust(final String cause, final Throwable root) {
+        super(cause, root);
+    }
+}
+

eo-runtime/src/main/java/org/eolang/ExpectFailureInThat.java

@@ -0,0 +1,55 @@
+package org.eolang;/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2025 Objectionary.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Expect exception.
+ *
+ * @since 0.51
+ */
+class ExpectFailureInThat extends ExFailure {
+
+    /**
+     * Serialization identifier.
+     */
+    private static final long serialVersionUID = 597748358437012215L;
+
+    /**
+     * Ctor.
+     * @param cause Exception cause
+     * @param args Arguments for {@link String#format(String, Object...)}
+     */
+    public ExpectFailureInThat(final String cause, final Object... args) {
+        super(String.format(cause, args));
+    }
+
+    /**
+     * Ctor.
+     * @param cause Exception cause
+     * @param root Cause exception
+     */
+    public ExpectFailureInThat(final String cause, final Throwable root) {
+        super(cause, root);
+    }
+}
+

eo-runtime/src/test/java/org/eolang/ExpectTest.java

@@ -133,7 +133,7 @@ void failsWithCorrectTraceWithExFailureInThat() {
                     })
                     .otherwise("something went wrong")
                     .it(),
-                "fails on check integer"
+                "fails on 'that'"
             ).getMessage(),
             Matchers.equalTo("something went wrong")
         );