Merge branch '__rultor'

objectionary · Aug 9, 2023 · 4717b03 · 4717b03 · 0pdd · Aug 9, 2023
2 parents 6309ea9 + 1dc20da
commit 4717b03
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 18 deletions.
diff --git a/eo-runtime/src/main/eo/org/eolang/float.eo b/eo-runtime/src/main/eo/org/eolang/float.eo
@@ -29,6 +29,7 @@
 [] > float
   # Tests that $ = x
   [x] > eq
+    x > value!
     if. > @
       and.
         eq.
@@ -39,7 +40,7 @@
           zero-as-bytes
       eq.
         ^.neg.as-bytes
-        x.neg.as-bytes
+        value.neg.as-bytes
       eq.
         self-as-bytes
         x-as-bytes
@@ -48,25 +49,27 @@
   [x] > lt
     gt. > @
       plus.
-        x
         neg.
           ^
+        x
       0.0
 
   # Tests that $ ≤ x
   [x] > lte
+    x > value!
     or. > @
-      ^.eq x
-      ^.lt x
+      ^.eq value
+      ^.lt value
 
   # Tests that $ > x
   [x] > gt /bool
 
   # Tests that $ ≥ x
   [x] > gte
+    x > value!
     or. > @
-      ^.eq x
-      ^.gt x
+      ^.eq value
+      ^.gt value
 
   # Multiplication of $ and x
   [x...] > times /float

diff --git a/eo-runtime/src/main/java/EOorg/EOeolang/EOio/EOstdout.java b/eo-runtime/src/main/java/EOorg/EOeolang/EOio/EOstdout.java
@@ -27,7 +27,6 @@
  */
 package EOorg.EOeolang.EOio;
 
-import java.io.PrintStream;
 import org.eolang.AtComposite;
 import org.eolang.AtFree;
 import org.eolang.Data;
@@ -44,12 +43,6 @@
  */
 @XmirObject(oname = "stdout")
 public class EOstdout extends PhDefault {
-
-    /**
-     * Default out.
-     */
-    private static final PrintStream OUT = System.out;
-
     /**
      * Ctor.
      * @param sigma Sigma
@@ -62,7 +55,7 @@ public EOstdout(final Phi sigma) {
             new AtComposite(
                 this,
                 rho -> {
-                    EOstdout.OUT.print(
+                    System.out.print(
                         new Param(rho, "text").strong(String.class)
                     );
                     return new Data.ToPhi(true);

diff --git a/eo-runtime/src/test/eo/org/eolang/seq-tests.eo b/eo-runtime/src/test/eo/org/eolang/seq-tests.eo
@@ -27,10 +27,6 @@
 +package org.eolang
 +version 0.0.0
 
-# @todo #1299:60min Implement test that will
-#  check output of stdout. That should proven
-#  that there is no double printage, when
-#  methods lt., gt., lte., gte. are called.
 [] > seq-single-dataization-float-less-than-test
   memory 0.0 > counter
   assert-that > @

diff --git a/eo-runtime/src/test/java/EOorg/EOeolang/EOio/EOstdoutTest.java b/eo-runtime/src/test/java/EOorg/EOeolang/EOio/EOstdoutTest.java
@@ -27,14 +27,20 @@
  */
 package EOorg.EOeolang.EOio;
 
+import EOorg.EOeolang.EOseq;
 import org.eolang.Data;
 import org.eolang.Dataized;
 import org.eolang.PhCopy;
+import org.eolang.PhMethod;
 import org.eolang.PhWith;
 import org.eolang.Phi;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junitpioneer.jupiter.StdIo;
+import org.junitpioneer.jupiter.StdOut;
 
 /**
  * Test case for {@link EOstdout}.
@@ -57,4 +63,70 @@ public void printsString() {
         );
     }
 
+    @StdIo
+    @ParameterizedTest
+    @CsvSource({"lt", "gt", "lte", "gte"})
+    public void doesNotPrintTwiceOnIntComparisonMethods(final String method, final StdOut out) {
+        final String str = "Hello world";
+        new Dataized(
+            new PhWith(
+                new PhMethod(
+                    new Data.ToPhi(1L),
+                    method
+                ),
+                0,
+                new PhWith(
+                    new PhWith(
+                        new EOseq(Phi.Φ),
+                        0,
+                        new PhWith(
+                            new EOstdout(Phi.Φ),
+                            "text",
+                            new Data.ToPhi(str)
+                        )
+                    ),
+                    0,
+                    new Data.ToPhi(2L)
+                )
+            )
+        ).take();
+        MatcherAssert.assertThat(
+            out.capturedLines()[0],
+            Matchers.equalTo(str)
+        );
+        out.capturedLines();
+    }
+
+    @StdIo
+    @ParameterizedTest
+    @CsvSource({"lt", "gt", "lte", "gte"})
+    public void doesNotPrintTwiceOnFloatComparisonMethods(final String method, final StdOut out) {
+        final String str = "Hello world";
+        new Dataized(
+            new PhWith(
+                new PhMethod(
+                    new Data.ToPhi(1.0),
+                    method
+                ),
+                0,
+                new PhWith(
+                    new PhWith(
+                        new EOseq(Phi.Φ),
+                        0,
+                        new PhWith(
+                            new EOstdout(Phi.Φ),
+                            "text",
+                            new Data.ToPhi(str)
+                        )
+                    ),
+                    0,
+                    new Data.ToPhi(3.0)
+                )
+            )
+        ).take();
+        MatcherAssert.assertThat(
+            out.capturedLines()[0],
+            Matchers.equalTo(str)
+        );
+    }
 }