Reduce use of mocks and clean up code (#2356)

Author: sualeh

schemacrawler-commandline/src/main/java/schemacrawler/tools/commandline/command/CommandLineHelpCommand.java

@@ -137,7 +137,7 @@ private void showHelpForSubcommand(final CommandLine parent, final String comman
       if (isAvailabilityCommand) {
         final CommandSpec commandSpec = subCommand.getCommandSpec();
         final Object userObject = commandSpec.userObject();
-        if (userObject instanceof Runnable runnable) {
+        if (userObject instanceof final Runnable runnable) {
           runnable.run();
         }
       }

schemacrawler-commandline/src/main/java/schemacrawler/tools/commandline/command/ConnectCommand.java

@@ -99,10 +99,10 @@ public void run() {
           DatabaseConnectorRegistry.getDatabaseConnectorRegistry();
       final DatabaseConnector databaseConnector;
 
-      if (connectionOptions instanceof DatabaseUrlConnectionOptions options1) {
+      if (connectionOptions instanceof final DatabaseUrlConnectionOptions options1) {
         final String connectionUrl = options1.connectionUrl();
         databaseConnector = databaseConnectorRegistry.findDatabaseConnectorFromUrl(connectionUrl);
-      } else if (connectionOptions instanceof DatabaseServerHostConnectionOptions options) {
+      } else if (connectionOptions instanceof final DatabaseServerHostConnectionOptions options) {
         final String databaseSystemIdentifier = options.databaseSystemIdentifier();
         if (!databaseConnectorRegistry.hasDatabaseSystemIdentifier(databaseSystemIdentifier)) {
           throw new ConfigurationException(

schemacrawler-commandline/src/test/java/schemacrawler/test/commandline/command/SystemCommandTest.java

@@ -12,7 +12,7 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.matchesPattern;
-import static org.mockito.Mockito.mock;
+import static schemacrawler.test.utility.crawl.LightCatalogUtility.lightCatalog;
 import static schemacrawler.tools.commandline.utility.CommandLineUtility.newCommandLine;
 import static us.fatehi.test.utility.extensions.FileHasContent.classpathResource;
 import static us.fatehi.test.utility.extensions.FileHasContent.contentsOf;
@@ -24,7 +24,6 @@
 import java.util.regex.Pattern;
 import org.junit.jupiter.api.Test;
 import picocli.CommandLine;
-import schemacrawler.schema.Catalog;
 import schemacrawler.test.utility.DisableLogging;
 import schemacrawler.test.utility.WithTestDatabase;
 import schemacrawler.tools.commandline.shell.SystemCommand;
@@ -106,7 +105,7 @@ public void showLoaded(final CapturedSystemStreams streams) {
     final String[] args = {"-L"};
 
     final ShellState state = new ShellState();
-    state.setCatalog(mock(Catalog.class));
+    state.setCatalog(lightCatalog());
     executeSystemCommand(state, args);
 
     // Error stream may have some messages on Java 21, due to how tests are set up

schemacrawler-commandline/src/test/java/schemacrawler/test/utility/CommandlineTestUtility.java

@@ -159,7 +159,7 @@ public int handleExecutionException(
           final CommandLine.ParseResult parseResult)
           throws Exception {
         lastException = ex;
-        if (ex instanceof PicocliException picocliException) {
+        if (ex instanceof final PicocliException picocliException) {
           if (picocliException.getCause() != null) {
             lastException = picocliException.getCause();
           }

schemacrawler-diagram/src/main/java/schemacrawler/tools/command/text/diagram/DiagramRenderer.java

@@ -121,8 +121,7 @@ public boolean usesConnection() {
 
   private String extractErrorMessage(final Exception e) {
     final String errorMessage;
-    final boolean isSchemaCrawlerException = e instanceof SchemaCrawlerException;
-    if (isSchemaCrawlerException) {
+    if (e instanceof SchemaCrawlerException) {
       errorMessage = e.getMessage();
     } else {
       errorMessage = "Could not generate diagram" + e.getMessage();

schemacrawler-hsqldb/src/test/java/schemacrawler/integration/test/MatchSchemaRetrievalOptionsTest.java

@@ -12,7 +12,6 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.sql.Connection;
@@ -27,6 +26,7 @@
 import us.fatehi.test.utility.TestObjectUtility;
 import us.fatehi.test.utility.extensions.WithSystemProperty;
 import us.fatehi.utility.datasource.DatabaseConnectionSource;
+import us.fatehi.utility.datasource.DatabaseConnectionSources;
 import us.fatehi.utility.datasource.DatabaseServerType;
 
 @WithTestDatabase
@@ -104,8 +104,8 @@ private DatabaseConnectionSource mockConnectionForUrl(
     final Connection connection = TestObjectUtility.mockConnection();
     when(connection.getMetaData()).thenReturn(databaseMetaData);
     when(connection.toString()).thenReturn(toString);
-    final DatabaseConnectionSource connectionSource = mock(DatabaseConnectionSource.class);
-    when(connectionSource.get()).thenReturn(connection);
+    final DatabaseConnectionSource connectionSource =
+        DatabaseConnectionSources.fromConnection(connection);
     return connectionSource;
   }
 }

schemacrawler-lint/src/test/java/schemacrawler/tools/lint/LintersTest.java

@@ -13,7 +13,6 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.is;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
@@ -30,12 +29,12 @@
 import schemacrawler.schema.ForeignKey;
 import schemacrawler.schema.Index;
 import schemacrawler.schema.IndexColumn;
-import schemacrawler.schema.PrimaryKey;
 import schemacrawler.schema.Table;
-import schemacrawler.schema.TableConstraintColumn;
 import schemacrawler.schemacrawler.SchemaReference;
 import schemacrawler.test.utility.crawl.LightCatalogUtility;
+import schemacrawler.test.utility.crawl.LightColumn;
 import schemacrawler.test.utility.crawl.LightForeignKey;
+import schemacrawler.test.utility.crawl.LightPrimaryKey;
 import schemacrawler.test.utility.crawl.LightTable;
 import schemacrawler.tools.lint.config.LinterConfig;
 import schemacrawler.tools.linter.LinterProviderCatalogSql;
@@ -508,12 +507,11 @@ public void testTableWithNoSurrogatePrimaryKey() {
         new LinterProviderTableWithNoSurrogatePrimaryKey().newLinter(lintCollector);
     linter.configure(linterConfig);
 
-    final LightTable table = spy(new LightTable(new SchemaReference(), "TEST_TABLE"));
-    final PrimaryKey pk = mock(PrimaryKey.class);
-    final TableConstraintColumn col1 = mock(TableConstraintColumn.class);
-    final TableConstraintColumn col2 = mock(TableConstraintColumn.class);
-    when(pk.getConstrainedColumns()).thenReturn(List.of(col1, col2));
-    when(table.getPrimaryKey()).thenReturn(pk);
+    final LightTable table = new LightTable(new SchemaReference(), "TEST_TABLE");
+    final LightColumn column = table.addColumn("COL11");
+    final Column[] columns = {table.addColumn("PK11"), table.addColumn("PK2")};
+    final LightPrimaryKey pk = new LightPrimaryKey(columns);
+    table.setPrimaryKey(pk);
 
     ((BaseLinter) linter).lint(table, connection);
 
@@ -529,13 +527,9 @@ public void testTableWithPrimaryKeyNotFirst() {
     final Linter linter = new LinterProviderTableWithPrimaryKeyNotFirst().newLinter(lintCollector);
     linter.configure(linterConfig);
 
-    final LightTable table = spy(new LightTable(new SchemaReference(), "TEST_TABLE"));
-    final PrimaryKey pk = mock(PrimaryKey.class);
-    final TableConstraintColumn col = mock(TableConstraintColumn.class);
-    when(col.getTableConstraintOrdinalPosition()).thenReturn(1);
-    when(col.getOrdinalPosition()).thenReturn(3);
-    when(pk.getConstrainedColumns()).thenReturn(List.of(col));
-    when(table.getPrimaryKey()).thenReturn(pk);
+    final LightTable table = new LightTable(new SchemaReference(), "TEST_TABLE");
+    final LightPrimaryKey pk = new LightPrimaryKey(null, null, table.addColumn("COL3"));
+    table.setPrimaryKey(pk);
 
     ((BaseLinter) linter).lint(table, connection);
 

schemacrawler-scripting/src/test/java/schemacrawler/test/script/CrawlInfoSupportTest.java

@@ -11,14 +11,13 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import schemacrawler.schema.CrawlInfo;
+import schemacrawler.schemacrawler.Version;
+import schemacrawler.test.utility.crawl.LightCrawlInfo;
 import schemacrawler.tools.command.script.CrawlInfoSupport;
-import us.fatehi.utility.property.BaseProductVersion;
 
 public class CrawlInfoSupportTest {
 
@@ -32,35 +31,29 @@ public void constructorRejectsNullCrawlInfo() {
   @Test
   public void databaseVersion() {
     final CrawlInfoSupport support = new CrawlInfoSupport(crawlInfo);
-    assertThat(support.databaseVersion(), is("TestDB 2.0"));
+    assertThat(support.databaseVersion(), is("TestDB v1.0"));
   }
 
   @Test
   public void databaseVersionStripsQuotes() {
-    when(crawlInfo.getDatabaseVersion())
-        .thenReturn(new BaseProductVersion("\"Quoted DB\"", "\"3.0\""));
     final CrawlInfoSupport support = new CrawlInfoSupport(crawlInfo);
-    assertThat(support.databaseVersion(), is("Quoted DB 3.0"));
+    assertThat(support.databaseVersion(), is("TestDB v1.0"));
   }
 
   @Test
   public void schemacrawlerVersion() {
     final CrawlInfoSupport support = new CrawlInfoSupport(crawlInfo);
-    assertThat(support.schemacrawlerVersion(), is("SchemaCrawler 17.10.1"));
+    assertThat(support.schemacrawlerVersion(), is(Version.version().toString()));
   }
 
   @BeforeEach
   public void setUp() {
-    crawlInfo = mock(CrawlInfo.class);
-    when(crawlInfo.getDatabaseVersion()).thenReturn(new BaseProductVersion("TestDB", "2.0"));
-    when(crawlInfo.getSchemaCrawlerVersion())
-        .thenReturn(new BaseProductVersion("SchemaCrawler", "17.10.1"));
-    when(crawlInfo.getCrawlTimestamp()).thenReturn("2026-04-18 21:00:00");
+    crawlInfo = new LightCrawlInfo();
   }
 
   @Test
   public void timestamp() {
     final CrawlInfoSupport support = new CrawlInfoSupport(crawlInfo);
-    assertThat(support.timestamp(), is("2026-04-18 21:00:00"));
+    assertThat(support.timestamp(), is("1970-01-01 00:00:00"));
   }
 }

schemacrawler-scripting/src/test/java/schemacrawler/test/script/ScriptSupportTest.java

@@ -26,6 +26,7 @@
 import schemacrawler.schema.Table;
 import schemacrawler.test.utility.crawl.LightColumn;
 import schemacrawler.test.utility.crawl.LightForeignKey;
+import schemacrawler.test.utility.crawl.LightPrimaryKey;
 import schemacrawler.test.utility.crawl.LightTable;
 import schemacrawler.tools.command.script.ScriptSupport;
 
@@ -95,8 +96,7 @@ public void columns() {
 
     // Positive test for columns(PrimaryKey)
     final LightColumn pkCol = table.addColumn("PK_COL");
-    final PrimaryKey primaryKey = mock(PrimaryKey.class);
-    when(primaryKey.getConstrainedColumns()).thenReturn((List) List.of(pkCol));
+    final PrimaryKey primaryKey = new LightPrimaryKey(pkCol);
     assertThat(support.columns(primaryKey), containsString("PK_COL"));
   }
 
@@ -142,8 +142,8 @@ public void hasName() {
 
     assertThat(support.hasName(fk), is(true));
 
-    final PrimaryKey pk = mock(PrimaryKey.class);
-    when(pk.getName()).thenReturn("PK_TABLE");
+    final LightTable table = new LightTable("PK_TABLE");
+    final PrimaryKey pk = new LightPrimaryKey(table.addColumn("PKCOL"));
 
     assertThat(support.hasName(pk), is(true));
   }
@@ -162,8 +162,7 @@ public void nonPrimaryIndexes() {
     when(tableWithNullIndexes.getIndexes()).thenReturn(null);
     assertThat(support.nonPrimaryIndexes(tableWithNullIndexes).isEmpty(), is(true));
 
-    final Table tableWithNoIndexes = mock(Table.class);
-    when(tableWithNoIndexes.getIndexes()).thenReturn(List.of());
+    final Table tableWithNoIndexes = new LightTable("TABLE1");
     assertThat(support.nonPrimaryIndexes(tableWithNoIndexes).isEmpty(), is(true));
 
     // Use LightColumn (raw cast) so isColumnDataTypeKnown() returns true for all
@@ -181,8 +180,7 @@ public void nonPrimaryIndexes() {
     assertThat(support.nonPrimaryIndexes(tableWithoutPrimaryKey), is(List.of(indexNoPk)));
 
     // pkEquivalentIndex shares the same column (COL1) as the primary key
-    final PrimaryKey primaryKey = mock(PrimaryKey.class);
-    when(primaryKey.getConstrainedColumns()).thenReturn((List) List.of(col1));
+    final PrimaryKey primaryKey = new LightPrimaryKey(col1);
 
     final Index pkEquivalentIndex = mock(Index.class);
     when(pkEquivalentIndex.getColumns()).thenReturn((List) List.of(col1));