refactor tests for EONumber

objectionary · Jan 25, 2025 · 2a9b19d · 2a9b19d
1 parent cccff19
commit 2a9b19d
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 528 deletions.
diff --git a/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOas_i64.java b/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOas_i64.java
@@ -32,7 +32,6 @@
 import org.eolang.Attr;
 import org.eolang.BytesOf;
 import org.eolang.Data;
-import org.eolang.Dataized;
 import org.eolang.Expect;
 import org.eolang.PhDefault;
 import org.eolang.Phi;
@@ -53,10 +52,7 @@ public Phi lambda() {
             0,
             new Data.ToPhi(
                 new BytesOf(
-                    Expect.at(this, Attr.RHO)
-                        .that(phi -> new Dataized(phi).take(Long.class))
-                        .otherwise("must be a number")
-                        .it()
+                    new Expect.Number(Expect.at(this, Attr.RHO)).it().longValue()
                 ).take()
             )
         );

diff --git a/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOfloor.java b/eo-runtime/src/main/java/EOorg/EOeolang/EOnumber$EOfloor.java
@@ -31,7 +31,6 @@
 import org.eolang.Atom;
 import org.eolang.Attr;
 import org.eolang.Data;
-import org.eolang.Dataized;
 import org.eolang.Expect;
 import org.eolang.PhDefault;
 import org.eolang.Phi;
@@ -49,10 +48,7 @@ public final class EOnumber$EOfloor extends PhDefault implements Atom {
     @Override
     public Phi lambda() {
         return new Data.ToPhi(
-            Expect.at(this, Attr.RHO)
-                .that(phi -> new Dataized(phi).take(Long.class))
-                .otherwise("must be a number")
-                .it()
+            new Expect.Number(Expect.at(this, Attr.RHO)).it().longValue()
         );
     }
 }
diff --git a/eo-runtime/src/test/java/EOorg/EOeolang/EOnumber$EOas_i64Test.java b/eo-runtime/src/test/java/EOorg/EOeolang/EOnumber$EOas_i64Test.java
diff --git a/eo-runtime/src/test/java/EOorg/EOeolang/EOnumber$EOdivTest.java b/eo-runtime/src/test/java/EOorg/EOeolang/EOnumber$EOdivTest.java
diff --git a/eo-runtime/src/test/java/EOorg/EOeolang/EOnumber$EOfloorTest.java b/eo-runtime/src/test/java/EOorg/EOeolang/EOnumber$EOfloorTest.java
diff --git a/eo-runtime/src/test/java/EOorg/EOeolang/EOnumber$EOgtTest.java b/eo-runtime/src/test/java/EOorg/EOeolang/EOnumber$EOgtTest.java