Add coverage and refactor tests

schemacrawler-api/src/test/java/schemacrawler/crawl/EqualsTest.java

@@ -40,7 +40,6 @@
 import schemacrawler.schema.TableType;
 import schemacrawler.schemacrawler.SchemaInfoLevel;
 import schemacrawler.schemacrawler.SchemaReference;
-import us.fatehi.utility.graph.DirectedEdge;
 import us.fatehi.utility.graph.Vertex;
 import us.fatehi.utility.property.AbstractProperty;
 
@@ -74,11 +73,6 @@ class TestDatabaseObject extends AbstractDatabaseObject {
         .verify();
   }
 
-  @Test
-  public void directedEdge() {
-    EqualsVerifier.forClass(DirectedEdge.class).verify();
-  }
-
   @Test
   public void grants() {
 

schemacrawler-diagram/src/test/java/schemacrawler/integration/test/DiagramAlternateKeysTest.java

@@ -28,23 +28,31 @@
 
 package schemacrawler.integration.test;
 
-import static schemacrawler.tools.command.text.diagram.options.DiagramOutputFormat.htmlx;
-import static schemacrawler.tools.command.text.diagram.options.DiagramOutputFormat.scdot;
-
-import java.util.Arrays;
-import java.util.stream.Stream;
-
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import schemacrawler.test.AbstractAlternateKeysTest;
 import schemacrawler.test.utility.ResolveTestContext;
+import schemacrawler.test.utility.TestContext;
 import schemacrawler.test.utility.WithTestDatabase;
+import schemacrawler.tools.command.text.diagram.options.DiagramOutputFormat;
 import schemacrawler.tools.options.OutputFormat;
+import us.fatehi.utility.datasource.DatabaseConnectionSource;
 
 @WithTestDatabase
 @ResolveTestContext
 public class DiagramAlternateKeysTest extends AbstractAlternateKeysTest {
 
-  @Override
-  protected Stream<OutputFormat> outputFormats() {
-    return Arrays.stream(new OutputFormat[] {scdot, htmlx});
+  @DisplayName("Alternate keys loaded from catalog attributes file")
+  @ParameterizedTest(name = "with output to {0}")
+  @EnumSource(
+      value = DiagramOutputFormat.class,
+      names = {"scdot", "htmlx"})
+  public void alternateKeys_01(
+      final OutputFormat outputFormat,
+      final TestContext testContext,
+      final DatabaseConnectionSource dataSource)
+      throws Exception {
+    assertAlternateKeys(testContext, dataSource, outputFormat);
   }
 }

schemacrawler-diagram/src/test/java/schemacrawler/integration/test/DiagramWeakAssociationsTest.java

@@ -28,23 +28,74 @@
 
 package schemacrawler.integration.test;
 
-import static schemacrawler.tools.command.text.diagram.options.DiagramOutputFormat.htmlx;
-import static schemacrawler.tools.command.text.diagram.options.DiagramOutputFormat.scdot;
-
-import java.util.Arrays;
-import java.util.stream.Stream;
-
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import schemacrawler.test.AbstractWeakAssociationsTest;
 import schemacrawler.test.utility.ResolveTestContext;
+import schemacrawler.test.utility.TestContext;
 import schemacrawler.test.utility.WithTestDatabase;
+import schemacrawler.tools.command.text.diagram.options.DiagramOutputFormat;
 import schemacrawler.tools.options.OutputFormat;
+import us.fatehi.utility.datasource.DatabaseConnectionSource;
 
 @WithTestDatabase
 @ResolveTestContext
 public class DiagramWeakAssociationsTest extends AbstractWeakAssociationsTest {
 
   @Override
-  protected Stream<OutputFormat> outputFormats() {
-    return Arrays.stream(new OutputFormat[] {scdot, htmlx});
+  @DisplayName("Inferred weak associations")
+  @ParameterizedTest(name = "with output to {0}")
+  @EnumSource(
+      value = DiagramOutputFormat.class,
+      names = {"scdot", "htmlx"})
+  public void weakAssociations_00(
+      final OutputFormat outputFormat,
+      final TestContext testContext,
+      final DatabaseConnectionSource dataSource)
+      throws Exception {
+    super.weakAssociations_00(outputFormat, testContext, dataSource);
+  }
+
+  @Override
+  @DisplayName("Weak associations loaded from catalog attributes file")
+  @ParameterizedTest(name = "with output to {0}")
+  @EnumSource(
+      value = DiagramOutputFormat.class,
+      names = {"scdot", "htmlx"})
+  public void weakAssociations_01(
+      final OutputFormat outputFormat,
+      final TestContext testContext,
+      final DatabaseConnectionSource dataSource)
+      throws Exception {
+    super.weakAssociations_01(outputFormat, testContext, dataSource);
+  }
+
+  @Override
+  @DisplayName("Weak associations loaded with remarks")
+  @ParameterizedTest(name = "with output to {0}")
+  @EnumSource(
+      value = DiagramOutputFormat.class,
+      names = {"scdot", "htmlx"})
+  public void weakAssociations_02(
+      final OutputFormat outputFormat,
+      final TestContext testContext,
+      final DatabaseConnectionSource dataSource)
+      throws Exception {
+    super.weakAssociations_02(outputFormat, testContext, dataSource);
+  }
+
+  @Override
+  @DisplayName("Weak associations loaded with remarks, but hiding remarks")
+  @ParameterizedTest(name = "with output to {0}")
+  @EnumSource(
+      value = DiagramOutputFormat.class,
+      names = {"scdot", "htmlx"})
+  public void weakAssociations_03(
+      final OutputFormat outputFormat,
+      final TestContext testContext,
+      final DatabaseConnectionSource dataSource)
+      throws Exception {
+    super.weakAssociations_03(outputFormat, testContext, dataSource);
   }
 }