Merge pull request #277 from unsigable/test

Fixing java lesson's test output
hexlet-basics · Nov 1, 2024 · a477387 · a477387
2 parents 6d7c86a + 88765ac
commit a477387
Show file tree

Hide file tree

Showing 27 changed files with 135 additions and 55 deletions.
diff --git a/modules/10-basics/10-hello-world/Test.java b/modules/10-basics/10-hello-world/Test.java
@@ -1,21 +1,24 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
-import org.assertj.core.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class Test {
     public static void main(final String[] args) {
         final var expected = "Hello, World!";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
-        Assertions.assertThat(actual).isEqualTo(expected);
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
+        assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/10-basics/40-testing/Test.java b/modules/10-basics/40-testing/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -8,17 +10,17 @@ class Test {
     public static void main(String[] args) {
         final var expected = "420262531";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
-        assertThat(actual).isEqualTo(expected);
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
 
+        assertThat(actual).isEqualTo(expected);
     }
 
 }
diff --git a/modules/10-basics/50-syntax-error/Test.java b/modules/10-basics/50-syntax-error/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(final String[] args) {
         final var expected = "What Is Dead May Never Die";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/20-arithmetics/10-basics/Test.java b/modules/20-arithmetics/10-basics/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "9";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/20-arithmetics/20-operators/Test.java b/modules/20-arithmetics/20-operators/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -8,17 +10,17 @@ class Test {
     public static void main(String[] args) {
         final var expected = "87";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
-        assertThat(actual).isEqualTo(expected);
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
 
+        assertThat(actual).isEqualTo(expected);
     }
 
 }
diff --git a/modules/20-arithmetics/40-composition/Test.java b/modules/20-arithmetics/40-composition/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "10";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/20-arithmetics/50-priority/Test.java b/modules/20-arithmetics/50-priority/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "49";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/20-arithmetics/60-float/Test.java b/modules/20-arithmetics/60-float/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "0.0858";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/20-arithmetics/80-linting/Test.java b/modules/20-arithmetics/80-linting/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "-14";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/25-strings/10-quotes/Test.java b/modules/25-strings/10-quotes/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "\"Khal Drogo's favorite word is \"athjahakar\"\"";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/25-strings/20-strings-concatenation/Test.java b/modules/25-strings/20-strings-concatenation/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "Winter " + "came " + "for " + "the " + "House " + "of " + "Frey.";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/30-variables/10-definition/Test.java b/modules/30-variables/10-definition/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "What Is Dead May Never Die!";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/30-variables/12-change/Test.java b/modules/30-variables/12-change/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "anneirB";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/30-variables/13-variables-naming/Test.java b/modules/30-variables/13-variables-naming/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "-110.00000000000001";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }
diff --git a/modules/30-variables/14-errors/Test.java b/modules/30-variables/14-errors/Test.java
@@ -1,4 +1,6 @@
 import java.io.ByteArrayOutputStream;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,15 +9,16 @@ class Test {
     public static void main(String[] args) {
         final var expected = "Targaryen and Dragon";
 
-        App.main(null);
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         System.setOut(new PrintStream(out));
 
         App.main(null);
 
         final var actual = out.toString().trim();
 
+        System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
+        System.out.println(actual);
+
         assertThat(actual).isEqualTo(expected);
     }
 }