#20: Outlined all tests and their dependencies to a separate module

skapral · Aug 3, 2022 · b2a0407 · b2a0407
1 parent b20b4e8
commit b2a0407
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 66 deletions.
diff --git a/oo-memoized/memoized-chm/pom.xml b/oo-memoized/memoized-chm/pom.xml
@@ -14,5 +14,9 @@
             <groupId>com.pragmaticobjects.oo.memoized</groupId>
             <artifactId>memoized-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/oo-memoized/memoized-core/pom.xml b/oo-memoized/memoized-core/pom.xml
@@ -9,23 +9,4 @@
     <artifactId>memoized-core</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.pragmaticobjects.oo.tests</groupId>
-            <artifactId>tests-junit5</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-        </dependency>
-    </dependencies>
 </project>
diff --git a/...oized/memoized-core/src/test/java/com/pragmaticobjects/oo/memoized/core/package-info.java b/...oized/memoized-core/src/test/java/com/pragmaticobjects/oo/memoized/core/package-info.java
diff --git a/oo-memoized/memoized-tests/pom.xml b/oo-memoized/memoized-tests/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>oo-memoized</artifactId>
+        <groupId>com.pragmaticobjects.oo.memoized</groupId>
+        <version>0.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>memoized-assertions</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.pragmaticobjects.oo.memoized</groupId>
+            <artifactId>memoized-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.pragmaticobjects.oo.memoized</groupId>
+            <artifactId>memoized-chm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.pragmaticobjects.oo.tests</groupId>
+            <artifactId>tests-junit5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...cts/oo/memoized/core/AssertCallTimes.java → .../memoized/assertions/AssertCallTimes.java b/...cts/oo/memoized/core/AssertCallTimes.java → .../memoized/assertions/AssertCallTimes.java
@@ -1,6 +1,6 @@
 /*-
  * ===========================================================================
- * memoized-core
+ * memoized-assertions
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Copyright (C) 2019 - 2022 Kapralov Sergey
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -23,13 +23,15 @@
  * THE SOFTWARE.
  * ============================================================================
  */
-package com.pragmaticobjects.oo.memoized.core;
+package com.pragmaticobjects.oo.memoized.assertions;
 
 import com.pragmaticobjects.oo.tests.Assertion;
 import org.assertj.core.api.Assertions;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.pragmaticobjects.oo.memoized.core.Memory;
+
 public class AssertCallTimes implements Assertion {
     private final Memory memory;
     private final int callNums;
@@ -44,7 +46,7 @@ public AssertCallTimes(Memory memory, int callNums, int expectedNumCalls) {
     @Override
     public final void check() throws Exception {
         AtomicInteger counter = new AtomicInteger();
-        for(int i = 0; i < callNums; i++) {
+        for (int i = 0; i < callNums; i++) {
             memory.memoized(new TestCallable(counter));
         }
         Assertions.assertThat(counter).hasValue(expectedNumCalls);

diff --git a/...ects/oo/memoized/core/AssertDisposal.java → ...o/memoized/assertions/AssertDisposal.java b/...ects/oo/memoized/core/AssertDisposal.java → ...o/memoized/assertions/AssertDisposal.java
@@ -1,6 +1,6 @@
 /*-
  * ===========================================================================
- * memoized-core
+ * memoized-assertions
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Copyright (C) 2019 - 2022 Kapralov Sergey
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -23,8 +23,10 @@
  * THE SOFTWARE.
  * ============================================================================
  */
-package com.pragmaticobjects.oo.memoized.core;
+package com.pragmaticobjects.oo.memoized.assertions;
 
+import com.pragmaticobjects.oo.memoized.core.MemoizedCallable;
+import com.pragmaticobjects.oo.memoized.core.Memory;
 import com.pragmaticobjects.oo.tests.Assertion;
 import io.vavr.collection.List;
 import org.assertj.core.api.Assertions;

diff --git a/...bjects/oo/memoized/core/TestCallable.java → .../oo/memoized/assertions/TestCallable.java b/...bjects/oo/memoized/core/TestCallable.java → .../oo/memoized/assertions/TestCallable.java
@@ -1,6 +1,6 @@
 /*-
  * ===========================================================================
- * memoized-core
+ * memoized-assertions
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Copyright (C) 2019 - 2022 Kapralov Sergey
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -23,7 +23,9 @@
  * THE SOFTWARE.
  * ============================================================================
  */
-package com.pragmaticobjects.oo.memoized.core;
+package com.pragmaticobjects.oo.memoized.assertions;
+
+import com.pragmaticobjects.oo.memoized.core.MemoizedCallable;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

diff --git a/...oo/memoized/core/AssertCallTimesTest.java → ...oized/assertions/AssertCallTimesTest.java b/...oo/memoized/core/AssertCallTimesTest.java → ...oized/assertions/AssertCallTimesTest.java
@@ -1,6 +1,6 @@
 /*-
  * ===========================================================================
- * memoized-core
+ * memoized-assertions
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Copyright (C) 2019 - 2022 Kapralov Sergey
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  * ============================================================================
  */
-package com.pragmaticobjects.oo.memoized.core;
+package com.pragmaticobjects.oo.memoized.assertions;
 
 import com.pragmaticobjects.oo.tests.AssertAssertionPasses;
 import com.pragmaticobjects.oo.tests.TestCase;
@@ -40,8 +40,8 @@ public AssertCallTimesTest() {
                 new AssertAssertionPasses(
                     new AssertCallTimes(
                         new BluntMemory(),
-                            10,
-                            10
+                        10,
+                        10
                     )
                 )
             )

diff --git a/.../oo/memoized/core/AssertDisposalTest.java → ...moized/assertions/AssertDisposalTest.java b/.../oo/memoized/core/AssertDisposalTest.java → ...moized/assertions/AssertDisposalTest.java
@@ -1,6 +1,6 @@
 /*-
  * ===========================================================================
- * memoized-core
+ * memoized-assertions
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Copyright (C) 2019 - 2022 Kapralov Sergey
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  * ============================================================================
  */
-package com.pragmaticobjects.oo.memoized.core;
+package com.pragmaticobjects.oo.memoized.assertions;
 
 import com.pragmaticobjects.oo.tests.AssertAssertionPasses;
 import com.pragmaticobjects.oo.tests.TestCase;

diff --git a/...objects/oo/memoized/core/BluntMemory.java → ...s/oo/memoized/assertions/BluntMemory.java b/...objects/oo/memoized/core/BluntMemory.java → ...s/oo/memoized/assertions/BluntMemory.java
@@ -1,6 +1,6 @@
 /*-
  * ===========================================================================
- * memoized-core
+ * memoized-assertions
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Copyright (C) 2019 - 2022 Kapralov Sergey
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -23,10 +23,14 @@
  * THE SOFTWARE.
  * ============================================================================
  */
-package com.pragmaticobjects.oo.memoized.core;
+package com.pragmaticobjects.oo.memoized.assertions;
+
+import com.pragmaticobjects.oo.memoized.core.MemoizedCallable;
+import com.pragmaticobjects.oo.memoized.core.Memory;
 
 import java.util.Optional;
 
+
 /**
  * Test {@link Memory} implementation that memoises nothing
  */

diff --git a/...bjects/oo/memoized/core/package-info.java → .../oo/memoized/assertions/package-info.java b/...bjects/oo/memoized/core/package-info.java → .../oo/memoized/assertions/package-info.java
@@ -1,6 +1,6 @@
 /*-
  * ===========================================================================
- * memoized-core
+ * memoized-assertions
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Copyright (C) 2019 - 2022 Kapralov Sergey
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -23,4 +23,4 @@
  * THE SOFTWARE.
  * ============================================================================
  */
-package com.pragmaticobjects.oo.memoized.core;
+package com.pragmaticobjects.oo.memoized.assertions;
diff --git a/...bjects/oo/memoized/chm/MemoryCHMTest.java → ...bjects/oo/memoized/chm/MemoryCHMTest.java b/...bjects/oo/memoized/chm/MemoryCHMTest.java → ...bjects/oo/memoized/chm/MemoryCHMTest.java
@@ -1,6 +1,6 @@
 /*-
  * ===========================================================================
- * memoized-chm
+ * memoized-assertions
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Copyright (C) 2019 - 2022 Kapralov Sergey
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -26,8 +26,8 @@
 package com.pragmaticobjects.oo.memoized.chm;
 
 
-import com.pragmaticobjects.oo.memoized.core.AssertCallTimes;
-import com.pragmaticobjects.oo.memoized.core.AssertDisposal;
+import com.pragmaticobjects.oo.memoized.assertions.AssertCallTimes;
+import com.pragmaticobjects.oo.memoized.assertions.AssertDisposal;
 import com.pragmaticobjects.oo.memoized.core.MemoizedCallable;
 import com.pragmaticobjects.oo.tests.TestCase;
 import com.pragmaticobjects.oo.tests.junit5.TestsSuite;

diff --git a/...objects/oo/memoized/chm/package-info.java → ...objects/oo/memoized/chm/package-info.java b/...objects/oo/memoized/chm/package-info.java → ...objects/oo/memoized/chm/package-info.java
@@ -1,6 +1,6 @@
 /*-
  * ===========================================================================
- * memoized-chm
+ * memoized-assertions
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Copyright (C) 2019 - 2022 Kapralov Sergey
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/oo-memoized/pom.xml b/oo-memoized/pom.xml
@@ -38,6 +38,7 @@
     <modules>
         <module>memoized-core</module>
         <module>memoized-chm</module>
+        <module>memoized-tests</module>
     </modules>
 
     <dependencyManagement>
@@ -47,6 +48,16 @@
                 <artifactId>memoized-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.pragmaticobjects.oo.memoized</groupId>
+                <artifactId>memoized-assertions</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.pragmaticobjects.oo.memoized</groupId>
+                <artifactId>memoized-chm</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.pragmaticobjects.oo.tests</groupId>
                 <artifactId>tests-junit5</artifactId>