X-Git-Url: http://jaekl.net/gitweb/?p=squelch.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fjaekl%2Fsquelch%2FSquelchTest.java;h=44b7de96c854819adc16cd49521ef6faa53c39b4;hp=be533d875a56bbf73a8f21f601c131f4423f2ff3;hb=5c97ab69edb44c0f1a7dc416ffaf1b934f7a3d7d;hpb=dde7f6828b7e2fc479d2285754e4a150be7958a5 diff --git a/src/test/java/net/jaekl/squelch/SquelchTest.java b/src/test/java/net/jaekl/squelch/SquelchTest.java index be533d8..44b7de9 100644 --- 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