(#106) Fix ObjectsFromServerTest, fix Qulice's warnings, added equals…

…, hashCode implementations at some base classes.
rocket-3 · Jan 9, 2022 · 136a422 · 136a422 · 0pdd · Jan 9, 2022
1 parent 195200d
commit 136a422
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 32 deletions.
diff --git a/src/main/java/org/fusionsoft/database/snapshot/data/DataObjectOfMappingAndTable.java b/src/main/java/org/fusionsoft/database/snapshot/data/DataObjectOfMappingAndTable.java
@@ -64,7 +64,7 @@ public DataObjectOfMappingAndTable(
         final DbdDataMapping mapping,
         final DbObject<DbdTableMapping> table
     ) {
-        this(mapping, new ObjectNameOfScalar(()->table.signature().name()));
+        this(mapping, new ObjectNameOfScalar(() -> table.signature().name()));
     }
 
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/data/InlineRowsDataObjectOfConnection.java b/src/main/java/org/fusionsoft/database/snapshot/data/InlineRowsDataObjectOfConnection.java
@@ -20,8 +20,8 @@
 import org.fusionsoft.database.snapshot.DbObject;
 
 /**
- * The {@link DataObjectOfMappingAndTable} with {@link InlineRowsDataMappingOfConnection}, can be constructed of
- *  {@link Connection} and parent {@link DbObject} of {@link DbdTableMapping}.
+ * The {@link DataObjectOfMappingAndTable} with {@link InlineRowsDataMappingOfConnection},
+ *  can be constructed of {@link Connection} and parent {@link DbObject} of {@link DbdTableMapping}.
  * @since 0.1
  */
 public class InlineRowsDataObjectOfConnection extends DataObjectOfMappingAndTable {

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/DefaultObject.java b/src/main/java/org/fusionsoft/database/snapshot/objects/DefaultObject.java
@@ -48,4 +48,19 @@ public final YamlNode asYaml() {
         return this.object.asYaml();
     }
 
+    @Override
+    public final boolean equals(final Object other) {
+        return this.object.equals(other);
+    }
+
+    @Override
+    public final int hashCode() {
+        return this.object.hashCode();
+    }
+
+    @Override
+    public final String toString() {
+        return this.object.toString();
+    }
+
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObject.java b/src/main/java/org/fusionsoft/database/snapshot/objects/SimpleDbObject.java
@@ -17,6 +17,8 @@
 
 import com.amihaiemil.eoyaml.YamlMapping;
 import java.text.MessageFormat;
+import org.cactoos.text.Repeated;
+import org.cactoos.text.UncheckedText;
 import org.fusionsoft.database.SimpleYamlRepresentative;
 import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.ObjectSignature;
@@ -52,10 +54,13 @@ public final ObjectSignature signature() {
 
     @Override
     public final String toString() {
+        final int length = 10;
         return MessageFormat.format(
-            "\n=   =   =   =\n{0}\n-   -   -   -\n{1}",
+            "\n{2}\n{0}\n{3}\n{1}",
             this.sig.asString(),
-            this.asYaml().toString()
+            this.asYaml().toString(),
+            new UncheckedText(new Repeated("=  ", length)).asString(),
+            new UncheckedText(new Repeated("-  ", length)).asString()
         );
     }
 

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectType.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/ObjectType.java
@@ -38,4 +38,11 @@ public interface ObjectType<T extends YamlNode> extends Text {
      */
     String asString();
 
+    /**
+     * Equality of types.
+     * @param other The other {@link ObjectType}.
+     * @return The boolean.
+     */
+    boolean equalsTo(ObjectType<?> other);
+
 }
diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/SimpleObjectSignature.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/SimpleObjectSignature.java
@@ -59,7 +59,7 @@ public final ObjectType<?> type() {
     @Override
     public final String asString() {
         return MessageFormat.format(
-            "{1} {0}",
+            "{0}: {1}",
             new UncheckedText(this.name()).asString(),
             new UncheckedText(this.type()).asString()
         );

diff --git a/src/main/java/org/fusionsoft/database/snapshot/objects/signature/type/SimpleObjectType.java b/src/main/java/org/fusionsoft/database/snapshot/objects/signature/type/SimpleObjectType.java
@@ -16,6 +16,7 @@
 package org.fusionsoft.database.snapshot.objects.signature.type;
 
 import com.amihaiemil.eoyaml.YamlNode;
+import java.util.Objects;
 import org.cactoos.Func;
 import org.cactoos.func.UncheckedFunc;
 import org.fusionsoft.database.snapshot.objects.signature.ObjectType;
@@ -57,4 +58,25 @@ public final String asString() {
         return this.text;
     }
 
+    @Override
+    public final boolean equalsTo(final ObjectType<?> other) {
+        return this.asString().equals(other.asString());
+    }
+
+    @Override
+    public final boolean equals(final Object other) {
+        boolean equal = false;
+        if (this == other) {
+            equal = true;
+        } else if (other instanceof ObjectType) {
+            equal = this.equalsTo((SimpleObjectType<?>) other);
+        }
+        return equal;
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(this.text);
+    }
+
 }
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsOfDbdRootMappingTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/ObjectsOfDbdRootMappingTest.java
@@ -16,16 +16,14 @@
 package org.fusionsoft.database.snapshot.objects;
 
 import org.cactoos.iterable.Filtered;
-import org.cactoos.scalar.And;
-import org.cactoos.scalar.Unchecked;
-import org.cactoos.set.SetOf;
 import org.fusionsoft.database.mapping.MappingOfExampleYaml;
 import org.fusionsoft.database.mapping.dbd.DbdRootMapping;
-import org.fusionsoft.database.snapshot.DbObject;
 import org.fusionsoft.database.snapshot.objects.ofdbd.ObjectsOfDbdRootMapping;
 import org.fusionsoft.database.snapshot.objects.signature.type.ObjectTypeTable;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.llorllale.cactoos.matchers.Assertion;
+import org.llorllale.cactoos.matchers.HasSize;
+import org.llorllale.cactoos.matchers.HasValuesMatching;
 
 /**
  * The test for {@link ObjectsOfDbdRootMapping} class.
@@ -40,25 +38,39 @@ class ObjectsOfDbdRootMappingTest {
      */
     @Test
     public void getsFourTablesOfExampleYaml() {
-        Assertions.assertTrue(
-            new Unchecked<>(
-                new And(
-                    new Filtered<>(
-                        o -> o.signature().type().equals(new ObjectTypeTable()),
-                        new ObjectsOfDbdRootMapping(
-                            new DbdRootMapping(
-                                new MappingOfExampleYaml()
-                            )
-                        )
-                    ),
-                    (Iterable<DbObject<?>> itrb) -> new SetOf<>(itrb).size() == 4,
-                    (Iterable<DbObject<?>> itrb) -> new And(
-                        item -> !item.asYaml().toString().isEmpty(),
-                        itrb
-                    ).value()
+        new Assertion<>(
+            "Should get 4 tables of example DBD yaml",
+            new Filtered<>(
+                o -> o.signature().type().equals(new ObjectTypeTable()),
+                new ObjectsOfDbdRootMapping(
+                    new DbdRootMapping(
+                        new MappingOfExampleYaml()
+                    )
                 )
-            ).value()
-        );
+            ),
+            new HasSize(4)
+        ).affirm();
+    }
+
+    /**
+     * Returns four tables of example yaml.
+     */
+    @Test
+    public void getsCorrectTablesOfExampleYaml() {
+        new Assertion<>(
+            "Should get non-empty tables of example DBD yaml",
+            new Filtered<>(
+                o -> o.signature().type().equals(new ObjectTypeTable()),
+                new ObjectsOfDbdRootMapping(
+                    new DbdRootMapping(
+                        new MappingOfExampleYaml()
+                    )
+                )
+            ),
+            new HasValuesMatching<>(
+                val -> !val.asYaml().toString().isEmpty()
+            )
+        ).affirm();
     }
 
 }
diff --git a/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServerTest.java b/src/test/java/org/fusionsoft/database/snapshot/objects/ofdbms/ObjectsFromServerTest.java
@@ -17,9 +17,11 @@
 
 import com.amihaiemil.eoyaml.YamlMapping;
 import java.io.File;
+import java.util.Comparator;
 import org.cactoos.Text;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterable.Mapped;
+import org.cactoos.iterable.Sorted;
 import org.cactoos.map.MapOf;
 import org.cactoos.text.TextOf;
 import org.fusionsoft.database.Folder;
@@ -65,7 +67,7 @@ class ObjectsFromServerTest {
      */
     @Test
     public void worksWithPagilla() {
-        final int size = 171;
+        final int size = 174;
         new Assertion<>(
             "Has expected object list size from 'pagilla' database",
             new ObjectsFromServer(
@@ -158,12 +160,12 @@ public void createsCorrectDbd() {
     }
 
     /**
-     * Show me.
+     * Show me individual object's data.
      */
     @Test
     @Disabled
     @SuppressWarnings("PMD")
-    public void showMe() {
+    public void showIndividual() {
         for (final DbObject<? extends YamlMapping> object : new ObjectsFromServer(
             new DbdServerMappingWithCredentials(
                 new UrlOfPgGitLabDatabaseV11(this.database),
@@ -174,6 +176,26 @@ public void showMe() {
         }
     }
 
+    /**
+     * Show me the names only.
+     */
+    @Test
+    @Disabled
+    @SuppressWarnings("PMD")
+    public void showNames() {
+        for (final DbObject<? extends YamlMapping> object : new Sorted<>(
+            Comparator.comparing(x -> x.signature().name().asString()),
+            new ObjectsFromServer(
+                new DbdServerMappingWithCredentials(
+                    new UrlOfPgGitLabDatabaseV11(this.database),
+                    new CredsOfPgTestDatabase()
+                )
+            )
+        )) {
+            System.out.println(object.signature().asString());
+        }
+    }
+
     /**
      * The Dbd created can be rendered.
      */