Add "Describe" command, with support for describing both (a) specific table(s) and...

[squelch.git] / src / test / java / net / jaekl / squelch / SquelchTest.java

diff --git a/src/test/java/net/jaekl/squelch/SquelchTest.java b/src/test/java/net/jaekl/squelch/SquelchTest.java
index be533d875a56bbf73a8f21f601c131f4423f2ff3..44b7de96c854819adc16cd49521ef6faa53c39b4 100644 (file)
--- a/src/test/java/net/jaekl/squelch/SquelchTest.java
+++ b/src/test/java/net/jaekl/squelch/SquelchTest.java
@@ -32,7 +32,8 @@ public class SquelchTest {
                }
                
                @Override
-               Connection getConnection() throws ClassNotFoundException, SQLException, SquelchException 
+               Connection getConnection(DbDriver driver, String jdbcUrl) 
+                       throws ClassNotFoundException, SQLException, SquelchException 
                {
                        return m_conn;
                }
@@ -140,11 +141,11 @@ public class SquelchTest {
                String[] simpleSelect = { "SELECT * FROM Fred WHERE wife='Wilma';", "QUIT" };
                consoleOutput = runPump(squelch, simpleSelect);
                assertEquals(  Squelch.PROMPT + simpleSelect[0] + "\n"
-                                        + "0 row(s) returned.\n"
+                                        + "No rows returned.\n"
                                     + Squelch.PROMPT + simpleSelect[1] + "\n", consoleOutput);
                
                ConnectionMock cm = squelch.mock_getConnectionMock();
-               assertTrue(cm.mock_queryWasExecuted(simpleSelect[0]));
+               assertTrue(cm.mock_queryWasExecuted(simpleSelect[0].substring(0, simpleSelect[0].length() - 1)));
        }
        
        private String runPump(Squelch squelch, String[] lines) throws IOException, ClassNotFoundException, SQLException, SquelchException