Add Common submodule (shared code for subprojects)

Author: mperor

…c/test/java/pl/mperor/lab/TestUtils.java …java/pl/mperor/lab/common/TestUtils.javaJavaReleases/src/test/java/pl/mperor/lab/TestUtils.java renamed to Common/src/main/java/pl/mperor/lab/common/TestUtils.java JavaReleases/src/test/java/pl/mperor/lab/TestUtils.java renamed to Common/src/main/java/pl/mperor/lab/common/TestUtils.java

@@ -1,4 +1,4 @@
-package pl.mperor.lab;
+package pl.mperor.lab.common;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -26,19 +26,19 @@ public String all() {
             return out.toString();
         }
 
-        public TestList<String> lines() {
+        public ReadableList<String> lines() {
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(out.toByteArray())))) {
-                return reader.lines().collect(Collectors.toCollection(TestArrayList::new));
+                return reader.lines().collect(Collectors.toCollection(ReadableArrayList::new));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
         }
     }
 
-    public static class TestArrayList<E> extends ArrayList<E> implements TestList<E> {
+    public static class ReadableArrayList<E> extends ArrayList<E> implements ReadableList<E> {
     }
 
-    public interface TestList<E> extends List<E> {
+    public interface ReadableList<E> extends List<E> {
         default E getSecond() {
             return getNext(1);
         }
@@ -47,11 +47,11 @@ default E getThird() {
             return getNext(2);
         }
 
-        private E getNext(int id) {
-            if (this.isEmpty()) {
+        private E getNext(int index) {
+            if (this.isEmpty() && index >= size()) {
                 throw new NoSuchElementException();
             } else {
-                return this.get(id);
+                return this.get(index);
             }
         }
     }

Common/src/test/java/pl/mperor/lab/common/UtilsTest.java

@@ -0,0 +1,34 @@
+package pl.mperor.lab.common;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.NoSuchElementException;
+import java.util.stream.Stream;
+
+class UtilsTest {
+
+    @Test
+    public void testReadableOutputReturnsReadableList() {
+        var out = TestUtils.setTempSystemOut();
+        Stream.of("One", "Two", "Three")
+                .forEach(System.out::println);
+        var readableList = out.lines();
+        Assertions.assertEquals("One", readableList.getFirst());
+        Assertions.assertEquals("Two", readableList.getSecond());
+        Assertions.assertEquals("Three", readableList.getThird());
+        TestUtils.resetSystemOut();
+    }
+
+    @Test
+    public void testNoOutPrintsReturnsEmptyReadableList() {
+        var out = TestUtils.setTempSystemOut();
+        var readableList = out.lines();
+        Assertions.assertThrows(NoSuchElementException.class, () -> readableList.getFirst());
+        Assertions.assertThrows(NoSuchElementException.class, () -> readableList.getSecond());
+        Assertions.assertThrows(NoSuchElementException.class, () -> readableList.getThird());
+        Assertions.assertEquals("", out.all());
+        TestUtils.resetSystemOut();
+    }
+
+}

DesignPatterns/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    testImplementation project(':Common')
+}
+

JavaReleases/build.gradle

@@ -6,5 +6,6 @@ dependencies {
     testRuntimeOnly 'com.h2database:h2:2.2.224'
     testRuntimeOnly "org.graalvm.js:js:${graaljsVersion}"
     testImplementation "org.graalvm.js:js-scriptengine:${graaljsVersion}"
+    implementation project(':Common')
 }
 

JavaReleases/src/test/java/pl/mperor/lab/java/Java16.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.condition.OS;
-import pl.mperor.lab.TestUtils;
+import pl.mperor.lab.common.TestUtils;
 
 import java.io.IOException;
 import java.net.StandardProtocolFamily;

JavaReleases/src/test/java/pl/mperor/lab/java/Java18.java

@@ -3,7 +3,7 @@
 import com.sun.net.httpserver.HttpServer;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import pl.mperor.lab.TestUtils;
+import pl.mperor.lab.common.TestUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;

JavaReleases/src/test/java/pl/mperor/lab/java/Java21.java

@@ -2,7 +2,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import pl.mperor.lab.TestUtils;
+import pl.mperor.lab.common.TestUtils;
 
 import java.util.Collections;
 import java.util.List;

JavaReleases/src/test/java/pl/mperor/lab/java/Java5.java

@@ -2,7 +2,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import pl.mperor.lab.TestUtils;
+import pl.mperor.lab.common.TestUtils;
 import pl.mperor.lab.java.generic.Box;
 
 import java.lang.annotation.*;

JavaReleases/src/test/java/pl/mperor/lab/java/Java8.java

@@ -3,7 +3,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import pl.mperor.lab.TestUtils;
+import pl.mperor.lab.common.TestUtils;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

settings.gradle

@@ -1,2 +1,2 @@
 rootProject.name = 'JavaLab'
-include 'JavaReleases', 'FirstSteps', 'DesignPatterns'
+include 'JavaReleases', 'FirstSteps', 'DesignPatterns', 'Common'