import java.sql.Connection;
import java.sql.SQLException;
-import net.jaekl.squelch.db.ConnectionMock;
import net.jaekl.squelch.db.DbDriver;
import net.jaekl.squelch.db.MsSqlDriver;
import net.jaekl.squelch.db.MySqlDriver;
import net.jaekl.squelch.db.OracleDriver;
import net.jaekl.squelch.db.PostgresqlDriver;
+import net.jaekl.squelch.sql.ConnectionMock;
import net.jaekl.squelch.util.ConsoleInputMock;
import org.junit.Test;
}
@Override
- Connection getConnection() throws ClassNotFoundException, SQLException, SquelchException
+ Connection getConnection(DbDriver driver, String jdbcUrl)
+ throws ClassNotFoundException, SQLException, SquelchException
{
return m_conn;
}
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