monetdb-java: tests/OnClientTester.java annotate

annotate tests/OnClientTester.java @ 594:613f94a13ad6

Show hexdumps in the File Transfer encoding tests to track down elusive Windows problem

author	Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date	Thu, 25 Nov 2021 14:58:22 +0100 (2021-11-25)
parents	b58f6f26fab0
children	c2581dbd1dbf

rev	line source
542 d462000fc410 Various changes suggested by Martin van Dinther Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	1 /*
d462000fc410 Various changes suggested by Martin van Dinther Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	2 * This Source Code Form is subject to the terms of the Mozilla Public
d462000fc410 Various changes suggested by Martin van Dinther Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	3 * License, v. 2.0. If a copy of the MPL was not distributed with this
d462000fc410 Various changes suggested by Martin van Dinther Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	4 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
d462000fc410 Various changes suggested by Martin van Dinther Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	5 *
d462000fc410 Various changes suggested by Martin van Dinther Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	6 * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V.
d462000fc410 Various changes suggested by Martin van Dinther Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	7 */
d462000fc410 Various changes suggested by Martin van Dinther Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	8
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	9 import org.monetdb.jdbc.MonetConnection;
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	10 import org.monetdb.jdbc.MonetConnection.UploadHandler;
31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	11 import org.monetdb.jdbc.MonetConnection.DownloadHandler;
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	12 import org.monetdb.util.FileTransferHandler;
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	13
520 b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	14 import java.io.*;
594 613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	15 import java.lang.Character.UnicodeBlock;
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	16 import java.nio.charset.Charset;
526 6060ca8c5c1a Add test for uploadFrom methods Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 525 diff changeset	17 import java.nio.charset.StandardCharsets;
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	18 import java.nio.file.FileVisitResult;
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	19 import java.nio.file.Files;
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	20 import java.nio.file.Path;
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	21 import java.nio.file.SimpleFileVisitor;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	22 import java.nio.file.attribute.BasicFileAttributes;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	23 import java.sql.Connection;
589 718492fb8714 Answer to question. Please test if it works for your system. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 581 diff changeset	24 import java.sql.DriverManager;
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	25 import java.sql.ResultSet;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	26 import java.sql.ResultSetMetaData;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	27 import java.sql.Statement;
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	28 import java.sql.SQLException;
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	29 import java.util.List;
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	30
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	31 import static java.nio.file.StandardOpenOption.CREATE_NEW;
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	32
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	33
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	34 /**
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	35 * Program to test MonetDB JDBC Driver in combination with SQL:
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	36 * COPY ... INTO ... ON CLIENT
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	37 * commands.
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	38 * This allows Java programmers to locally (so ON CLIENT) stream csv data
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	39 * to and from the MonetDB server for fast bulk data import / export.
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	40 *
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	41 * Specifically it tests the MonetDB specific extensions to register upload and download handlers
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	42 * see {@link org.monetdb.jdbc.MonetConnection#setUploadHandler(UploadHandler)}
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	43 * see {@link org.monetdb.jdbc.MonetConnection#setUploadHandler(DownloadHandler)}
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	44 * and streaming of csv data to and from the MonetDB server using MAPI protocol.
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	45 *
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	46 * It also tests reading / writing data from / to a local file using
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	47 * {@link org.monetdb.util.FileTransferHandler}
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	48 *
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	49 * @author JvR
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	50 * @version 0.1
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	51 */
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	52 public final class OnClientTester {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	53 public static final int VERBOSITY_NONE = 0;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	54 public static final int VERBOSITY_ON = 1;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	55 public static final int VERBOSITY_SHOW_ALL = 2;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	56
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	57 private final String jdbcUrl;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	58 private final int verbosity;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	59 private String currentTestName;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	60 private long startTime;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	61 private MonetConnection conn;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	62 private Statement stmt;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	63 private StringBuilder outBuffer;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	64 private Path tmpDir;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	65
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	66 public OnClientTester(String jdbcUrl, int verbosity) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	67 this.jdbcUrl = jdbcUrl;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	68 this.verbosity = verbosity;
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	69 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	70
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	71 public static void main(String[] args) {
524 71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	72 String jdbcUrl = null;
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	73 int verbosity = 0;
545 79393647d7fb Call Class.forName("...MonetDriver") from main() in OnClientTester Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 544 diff changeset	74
525 70ff796c42f7 Run subset of tests based on prefix Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 524 diff changeset	75 for (String arg : args) {
524 71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	76 if (arg.equals("-v"))
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	77 verbosity++;
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	78 else if (arg.equals("-vv"))
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	79 verbosity += 2;
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	80 else if (jdbcUrl == null)
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	81 jdbcUrl = arg;
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	82 else {
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	83 System.err.println("Unexpected argument " + arg);
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	84 System.exit(2);
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	85 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	86 }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	87 if (jdbcUrl == null \|\| jdbcUrl.isEmpty()) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	88 System.err.println("Missing required startup argument: JDBC_connection_URL");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	89 System.exit(1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	90 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	91
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	92 OnClientTester tester = new OnClientTester(jdbcUrl, verbosity);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	93 int failures = tester.runTests();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	94 if (failures > 0)
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	95 System.exit(-1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	96 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	97
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	98 public int runTests() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	99 if (! openConnection())
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	100 return 1; // failed to open JDBC connection to MonetDB
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	101
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	102 outBuffer = new StringBuilder(1024);
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	103
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	104 int failures = 0;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	105 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	106 // all test methods start with test_ and have no arguments
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	107 test_BugFixLevel();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	108 test_Upload();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	109 test_ClientRefusesUpload();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	110 test_Offset0();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	111 test_Offset1();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	112 test_Offset5();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	113 test_ServerStopsReading();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	114 test_Download();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	115 test_ClientRefusesDownload();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	116 test_LargeUpload();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	117 test_LargeDownload();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	118 test_UploadFromStream();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	119 test_UploadFromReader();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	120 test_UploadFromReaderOffset();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	121 test_FailUploadLate();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	122 test_FailUploadLate2();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	123 test_FailDownloadLate();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	124 test_FileTransferHandlerUploadUtf8();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	125 test_FileTransferHandlerUploadLatin1();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	126 test_FileTransferHandlerUploadNull();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	127 test_FileTransferHandlerUploadRefused();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	128 test_FileTransferHandlerDownloadUtf8();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	129 test_FileTransferHandlerDownloadLatin1();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	130 test_FileTransferHandlerDownloadNull();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	131 test_FileTransferHandlerDownloadRefused();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	132 } catch (Failure e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	133 failures++;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	134 System.err.println();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	135 System.err.println("Test " + currentTestName + " failed");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	136 dumpOutput();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	137 } catch (Exception e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	138 failures++;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	139 System.err.println();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	140 System.err.println("Test " + currentTestName + " failed:");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	141 e.printStackTrace(System.err);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	142 dumpOutput();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	143 // Show the inner bits of the exception again, they may have scrolled off screen
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	144 Throwable t = e;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	145 while (t.getCause() != null) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	146 t = t.getCause();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	147 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	148 System.err.println("Innermost cause was " + t);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	149 if (t.getStackTrace().length > 0) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	150 System.err.println(" at " + t.getStackTrace()[0]);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	151 }
592 b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	152 } finally {
b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	153 try {
b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	154 // cleanup created test table
b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	155 execute("DROP TABLE IF EXISTS foo");
b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	156 } catch (SQLException e) { /* ignore */ }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	157 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	158 closeConnection();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	159 return failures;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	160 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	161
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	162 private boolean openConnection() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	163 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	164 // make a connection to MonetDB, its reused for all tests
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	165 final Connection genericConnection = DriverManager.getConnection(jdbcUrl);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	166 conn = genericConnection.unwrap(MonetConnection.class);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	167 stmt = conn.createStatement();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	168 return true;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	169 } catch (SQLException e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	170 System.err.println("Failed to connect using JDBC URL: " + jdbcUrl);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	171 System.err.println(e);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	172 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	173 return false;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	174 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	175
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	176 private void closeConnection() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	177 if (stmt != null) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	178 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	179 stmt.close();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	180 } catch (SQLException e) { /* ignore */ }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	181 stmt = null;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	182 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	183 if (conn != null) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	184 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	185 conn.close();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	186 } catch (Exception e) { /* ignore */ }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	187 conn = null;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	188 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	189 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	190
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	191 private void initTest(final String name) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	192 currentTestName = name;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	193 outBuffer.setLength(0); // clear the output log buffer
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	194 startTime = System.currentTimeMillis();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	195 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	196
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	197 private void exitTest() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	198 if (verbosity > VERBOSITY_ON)
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	199 System.err.println();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	200 if (verbosity >= VERBOSITY_ON) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	201 final long duration = System.currentTimeMillis() - startTime;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	202 System.err.println("Test " + currentTestName + " succeeded in " + duration + "ms");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	203 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	204 if (verbosity >= VERBOSITY_SHOW_ALL)
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	205 dumpOutput();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	206
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	207 if (conn.isClosed())
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	208 openConnection(); // restore connection for next test
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	209 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	210
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	211 private void dumpOutput() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	212 final String output = outBuffer.toString();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	213 if (output.isEmpty()) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	214 System.err.println("(Test " + currentTestName + " did not produce any output)");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	215 } else {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	216 System.err.println("------ Accumulated output for test " + currentTestName + ":");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	217 System.err.println(output);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	218 System.err.println("------ End of accumulated output");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	219 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	220 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	221
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	222 /// Some tests have to work limitations of the protocol or bugs in the server.
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	223 /// This Enum is used to indicate the possibilities.
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	224 private enum BugFixLevel {
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	225 /// Only those tests that work with older MonetDB versions
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	226 Baseline(0, 0, 0),
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	227
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	228 /// Connection keeps working after download request has been refused by client
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	229 CanRefuseDownload(11, 41, 12),
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	230
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	231 ;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	232
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	233 private final int major;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	234 private final int minor;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	235 private final int micro;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	236
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	237 BugFixLevel(int major, int minor, int micro) {
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	238 this.major = major;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	239 this.minor = minor;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	240 this.micro = micro;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	241 }
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	242
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	243 boolean includesVersion(int major, int minor, int micro) {
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	244 if (major > this.major)
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	245 return true;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	246 if (major < this.major)
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	247 return false;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	248 if (minor > this.minor)
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	249 return true;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	250 if (minor < this.minor)
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	251 return false;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	252 return micro >= this.micro;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	253 }
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	254
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	255 static BugFixLevel forVersion(String version) {
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	256 String[] parts = version.split("[.]", 3);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	257 assert parts.length == 3;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	258 int major = Integer.parseInt(parts[0]);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	259 int minor = Integer.parseInt(parts[1]);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	260 int micro = Integer.parseInt(parts[2]);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	261
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	262 return BugFixLevel.forVersion(major, minor, micro);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	263 }
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	264
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	265 static BugFixLevel forVersion(int major, int minor, int micro) {
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	266 BugFixLevel lastValid = Baseline;
594 613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	267 for (BugFixLevel level : BugFixLevel.values()) {
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	268 if (level.includesVersion(major, minor, micro))
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	269 lastValid = level;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	270 else
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	271 break;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	272 }
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	273 return lastValid;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	274 }
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	275 }
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	276
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	277 private void prepare() throws SQLException {
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	278 execute("DROP TABLE IF EXISTS foo");
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	279 execute("CREATE TABLE foo (i INT, t CLOB)");
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	280 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	281
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	282 private BugFixLevel getLevel() throws SQLException, Failure {
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	283 String version = queryString("SELECT value FROM environment WHERE name = 'monet_version'");
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	284 BugFixLevel level = BugFixLevel.forVersion(version);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	285 outBuffer.append(" NOTE: version ").append(version).append(" means level = ").append(level).append("\n");
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	286 return level;
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	287 }
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	288
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	289 private void test_BugFixLevel() throws Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	290 initTest("test_BugFixLevel");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	291
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	292 assertEq("Baseline includes 0.0.0", true, BugFixLevel.Baseline.includesVersion(0, 0, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	293 assertEq("Baseline includes 11.41.11", true, BugFixLevel.Baseline.includesVersion(11, 41, 11));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	294 assertEq("Baseline includes 11.41.12", true, BugFixLevel.Baseline.includesVersion(11, 41, 12));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	295
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	296 assertEq("CanRefuseDownload includes 0.0.0", false, BugFixLevel.CanRefuseDownload.includesVersion(0, 0, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	297
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	298 assertEq("CanRefuseDownload includes 11.0.0", false, BugFixLevel.CanRefuseDownload.includesVersion(11, 0, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	299 assertEq("CanRefuseDownload includes 12.0.0", true, BugFixLevel.CanRefuseDownload.includesVersion(12, 0, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	300
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	301 assertEq("CanRefuseDownload includes 11.41.0", false, BugFixLevel.CanRefuseDownload.includesVersion(11, 41, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	302 assertEq("CanRefuseDownload includes 11.42.0", true, BugFixLevel.CanRefuseDownload.includesVersion(11, 42, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	303
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	304 assertEq("CanRefuseDownload includes 11.41.11", false, BugFixLevel.CanRefuseDownload.includesVersion(11, 41, 11));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	305 assertEq("CanRefuseDownload includes 11.41.12", true, BugFixLevel.CanRefuseDownload.includesVersion(11, 41, 12));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	306
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	307 assertEq("Level for 0.0.0", BugFixLevel.Baseline, BugFixLevel.forVersion(0, 0, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	308 assertEq("Level for 11.0.0", BugFixLevel.Baseline, BugFixLevel.forVersion(11, 0, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	309 assertEq("Level for 11.41.0", BugFixLevel.Baseline, BugFixLevel.forVersion(11, 41, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	310 assertEq("Level for 11.41.11", BugFixLevel.Baseline, BugFixLevel.forVersion(11, 41, 11));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	311 assertEq("Level for 11.41.12", BugFixLevel.CanRefuseDownload, BugFixLevel.forVersion(11, 41, 12));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	312 assertEq("Level for 11.42.0", BugFixLevel.CanRefuseDownload, BugFixLevel.forVersion(11, 42, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	313 assertEq("Level for 12.0.0", BugFixLevel.CanRefuseDownload, BugFixLevel.forVersion(12, 0, 0));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	314
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	315 assertEq("Level for \"11.41.11\"", BugFixLevel.Baseline, BugFixLevel.forVersion("11.41.11"));
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	316 assertEq("Level for \"11.41.12\"", BugFixLevel.CanRefuseDownload, BugFixLevel.forVersion("11.41.12"));
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	317
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	318 exitTest();
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	319 }
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	320
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	321 private void test_Upload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	322 initTest("test_Upload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	323 prepare();
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	324 MyUploadHandler handler = new MyUploadHandler(100);
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	325 conn.setUploadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	326 update("COPY INTO foo FROM 'banana' ON CLIENT");
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	327 assertEq("cancellation callback called", false, handler.isCancelled());
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	328 assertQueryInt("SELECT COUNT(*) FROM foo", 100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	329 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	330 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	331
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	332 private void test_ClientRefusesUpload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	333 initTest("test_ClientRefusesUpload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	334 prepare();
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	335 MyUploadHandler handler = new MyUploadHandler("immediate error");
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	336 conn.setUploadHandler(handler);
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	337 expectError("COPY INTO foo FROM 'banana' ON CLIENT", "immediate error");
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	338 assertEq("cancellation callback called", false, handler.isCancelled());
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	339 assertQueryInt("SELECT COUNT(*) FROM foo", 0);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	340 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	341 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	342
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	343 private void test_Offset0() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	344 initTest("test_Offset0");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	345 prepare();
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	346 MyUploadHandler handler = new MyUploadHandler(100);
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	347 conn.setUploadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	348 update("COPY OFFSET 0 INTO foo FROM 'banana' ON CLIENT");
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	349 assertEq("cancellation callback called", false, handler.isCancelled());
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	350 assertQueryInt("SELECT MIN(i) FROM foo", 1);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	351 assertQueryInt("SELECT MAX(i) FROM foo", 100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	352 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	353 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	354
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	355 private void test_Offset1() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	356 initTest("test_Offset1");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	357 prepare();
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	358 MyUploadHandler handler = new MyUploadHandler(100);
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	359 conn.setUploadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	360 update("COPY OFFSET 1 INTO foo FROM 'banana' ON CLIENT");
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	361 assertEq("cancellation callback called", false, handler.isCancelled());
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	362 assertQueryInt("SELECT MIN(i) FROM foo", 1);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	363 assertQueryInt("SELECT MAX(i) FROM foo", 100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	364 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	365 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	366
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	367 private void test_Offset5() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	368 initTest("test_Offset5");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	369 prepare();
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	370 MyUploadHandler handler = new MyUploadHandler(100);
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	371 conn.setUploadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	372 update("COPY OFFSET 5 INTO foo FROM 'banana' ON CLIENT");
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	373 assertEq("cancellation callback called", false, handler.isCancelled());
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	374 assertQueryInt("SELECT MIN(i) FROM foo", 5);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	375 assertQueryInt("SELECT MAX(i) FROM foo", 100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	376 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	377 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	378
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	379 private void test_ServerStopsReading() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	380 initTest("test_ServerStopsReading");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	381 prepare();
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	382 MyUploadHandler handler = new MyUploadHandler(100);
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	383 conn.setUploadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	384 update("COPY 10 RECORDS INTO foo FROM 'banana' ON CLIENT");
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	385 assertEq("cancellation callback called", true, handler.isCancelled());
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	386 assertEq("handler encountered write error", true, handler.encounteredWriteError());
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	387 // connection is still alive
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	388 assertQueryInt("SELECT COUNT(i) FROM foo", 10);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	389 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	390 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	391
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	392 private void test_Download(int n) throws SQLException, Failure {
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	393 prepare();
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	394 MyDownloadHandler handler = new MyDownloadHandler();
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	395 conn.setDownloadHandler(handler);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	396 String q = "INSERT INTO foo SELECT value as i, 'number' \|\| value AS t FROM sys.generate_series(0, " + n + ")";
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	397 update(q);
08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	398 update("COPY (SELECT * FROM foo) INTO 'banana' ON CLIENT");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	399 assertEq("download attempts", 1, handler.countAttempts());
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	400 assertEq("lines downloaded", n, handler.lineCount());
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	401 // connection is still alive
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	402 assertQueryInt("SELECT COUNT(*) FROM foo", n);
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	403 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	404
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	405 private void test_Download() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	406 initTest("test_Download");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	407 test_Download(100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	408 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	409 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	410
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	411 private void test_ClientRefusesDownload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	412 initTest("test_ClientRefusesDownload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	413 prepare();
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	414 BugFixLevel level = getLevel();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	415 MyDownloadHandler handler = new MyDownloadHandler("download refused");
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	416 conn.setDownloadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	417 update("INSERT INTO foo SELECT value as i, 'number' \|\| value AS t FROM sys.generate_series(0, 100)");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	418 expectError("COPY (SELECT * FROM foo) INTO 'banana' ON CLIENT", "download refused");
534 b437529144f1 Learn to live with server closing connection if client refuses Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	419 // Wish it were different but the server closes the connection
b437529144f1 Learn to live with server closing connection if client refuses Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	420 expectError("SELECT 42 -- check if the connection still works", "Connection to server lost!");
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	421 if (level.compareTo(BugFixLevel.CanRefuseDownload) >= 0) {
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	422 // connection is still alive
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	423 assertQueryInt("SELECT COUNT(*) FROM foo", 100);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	424 }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	425 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	426 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	427
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	428 private void test_LargeUpload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	429 initTest("test_LargeUpload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	430 prepare();
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	431 int n = 4_000_000;
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	432 MyUploadHandler handler = new MyUploadHandler(n);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	433 conn.setUploadHandler(handler);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	434 handler.setChunkSize(1024 * 1024);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	435 update("COPY INTO foo FROM 'banana' ON CLIENT");
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	436 assertEq("cancellation callback called", false, handler.isCancelled());
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	437 // connection is still alive
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	438 assertQueryInt("SELECT COUNT(DISTINCT i) FROM foo", n);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	439 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	440 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	441
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	442 private void test_LargeDownload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	443 initTest("test_LargeDownload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	444 test_Download(4_000_000);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	445 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	446 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	447
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	448 private void test_UploadFromStream() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	449 initTest("test_UploadFromStream");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	450 prepare();
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	451 UploadHandler handler = new UploadHandler() {
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	452 final String data = "1\|one\n2\|two\n3\|three\n";
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	453
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	454 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	455 public void handleUpload(MonetConnection.Upload handle, String name, boolean textMode, long linesToSkip) throws IOException {
5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	456 // ignoring linesToSkip as it's not used in this test
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	457 ByteArrayInputStream s = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8));
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	458 handle.uploadFrom(s);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	459 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	460 };
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	461 conn.setUploadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	462 update("COPY INTO foo FROM 'banana' ON CLIENT");
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	463 // connection is still alive
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	464 assertQueryInt("SELECT i FROM foo WHERE t = 'three'", 3);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	465 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	466 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	467
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	468 private void test_UploadFromReader() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	469 initTest("test_UploadFromReader");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	470 prepare();
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	471 UploadHandler handler = new UploadHandler() {
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	472 final String data = "1\|one\n2\|two\n3\|three\n";
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	473
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	474 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	475 public void handleUpload(MonetConnection.Upload handle, String name, boolean textMode, long linesToSkip) throws IOException {
5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	476 // ignoring linesToSkip as it's not used in this test
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	477 StringReader r = new StringReader(data);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	478 handle.uploadFrom(r);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	479 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	480 };
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	481 conn.setUploadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	482 update("COPY INTO foo FROM 'banana' ON CLIENT");
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	483 assertQueryInt("SELECT i FROM foo WHERE t = 'three'", 3);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	484 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	485 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	486
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	487 private void test_UploadFromReaderOffset() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	488 initTest("test_UploadFromReaderOffset");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	489 prepare();
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	490 UploadHandler handler = new UploadHandler() {
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	491 final String data = "1\|one\n2\|two\n3\|three\n";
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	492
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	493 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	494 public void handleUpload(MonetConnection.Upload handle, String name, boolean textMode, long linesToSkip) throws IOException {
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	495 BufferedReader r = new BufferedReader(new StringReader(data));
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	496 handle.uploadFrom(r, linesToSkip);
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	497 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	498 };
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	499 conn.setUploadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	500 update("COPY OFFSET 2 INTO foo FROM 'banana' ON CLIENT");
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	501 assertQueryInt("SELECT i FROM foo WHERE t = 'three'", 3);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	502 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	503 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	504
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	505 private void test_FailUploadLate() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	506 initTest("test_FailUploadLate");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	507 prepare();
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	508 MyUploadHandler handler = new MyUploadHandler(100, 50, "i don't like line 50");
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	509 conn.setUploadHandler(handler);
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	510 expectError("COPY INTO foo FROM 'banana' ON CLIENT", "i don't like");
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	511 assertEq("cancellation callback called", false, handler.isCancelled());
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	512 assertEq("connection is closed", true, conn.isClosed());
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	513 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	514 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	515
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	516 private void test_FailUploadLate2() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	517 initTest("test_FailUploadLate2");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	518 // Here we send empty lines only, to check if the server detects it properly instead
544 c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	519 // of simply complaining about an incomplete file.
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	520 prepare();
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	521 UploadHandler handler = new UploadHandler() {
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	522 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	523 public void handleUpload(MonetConnection.Upload handle, String name, boolean textMode, long linesToSkip) throws IOException {
5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	524 // ignoring linesToSkip as it's not used in this test
544 c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	525 PrintStream stream = handle.getStream();
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	526 for (int i = 1; i <= 20_000; i++)
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	527 stream.println();
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	528 stream.flush();
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	529 throw new IOException("exception after all");
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	530 }
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	531 };
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	532 conn.setUploadHandler(handler);
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	533 expectError("COPY INTO foo(t) FROM 'banana'(t) ON CLIENT", "after all");
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	534 assertEq("connection is closed", true, conn.isClosed());
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	535 // Cannot check the server log, but at the time I checked, it said "prematurely stopped client", which is fine.
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	536 exitTest();
544 c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	537 }
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	538
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	539 private void test_FailDownloadLate() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	540 initTest("test_FailDownloadLate");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	541 prepare();
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	542 MyDownloadHandler handler = new MyDownloadHandler(200, "download refused");
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	543 conn.setDownloadHandler(handler);
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	544 update("INSERT INTO foo SELECT value as i, 'number' \|\| value AS t FROM sys.generate_series(0, 100)");
548 d1f6678f92c5 Test that throwing an IO Exception in the download handler invalidates the connection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 545 diff changeset	545 expectError("COPY (SELECT * FROM sys.generate_series(0,200)) INTO 'banana' ON CLIENT", "download refused");
d1f6678f92c5 Test that throwing an IO Exception in the download handler invalidates the connection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 545 diff changeset	546 // Exception closes the connection
d1f6678f92c5 Test that throwing an IO Exception in the download handler invalidates the connection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 545 diff changeset	547 assertEq("connection is closed", conn.isClosed(), true);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	548 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	549 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	550
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	551 private void test_FileTransferHandlerUploadUtf8() throws IOException, SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	552 initTest("test_FileTransferHandlerUploadUtf8");
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	553 testFileTransferHandlerUpload(StandardCharsets.UTF_8, "UTF-8");
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	554 exitTest();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	555 }
13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	556
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	557 private void test_FileTransferHandlerUploadLatin1() throws IOException, SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	558 initTest("test_FileTransferHandlerUploadLatin1");
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	559 testFileTransferHandlerUpload(Charset.forName("latin1"), "latin1");
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	560 exitTest();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	561 }
13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	562
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	563 private void test_FileTransferHandlerUploadNull() throws IOException, SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	564 initTest("test_FileTransferHandlerUploadNull");
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	565 testFileTransferHandlerUpload(null, Charset.defaultCharset().name());
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	566 exitTest();
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	567 }
5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	568
594 613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	569 private String hexdump(String s)
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	570 {
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	571 StringBuilder buf = new StringBuilder();
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	572 char[] chars = s.toCharArray();
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	573 for (char c: chars) {
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	574 buf.append(' ');
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	575 buf.append((int)c);
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	576
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	577 UnicodeBlock b = UnicodeBlock.of(c);
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	578 if (!Character.isISOControl(c) && b != null) {
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	579 if (b != UnicodeBlock.HIGH_SURROGATES && b != UnicodeBlock.LOW_SURROGATES && b != UnicodeBlock.SPECIALS) {
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	580 buf.append("='");
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	581 buf.append(c);
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	582 buf.append("'");
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	583 }
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	584 }
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	585 }
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	586
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	587 return "<" + buf.toString().trim() + ">";
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	588 }
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	589
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	590 private void testFileTransferHandlerUpload(Charset handlerEncoding, String fileEncoding) throws IOException, SQLException, Failure {
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	591 prepare();
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	592 Path d = getTmpDir(currentTestName);
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	593 Path f = d.resolve("data.txt");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	594 OutputStream s = Files.newOutputStream(f, CREATE_NEW);
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	595 PrintStream ps = new PrintStream(s, false, fileEncoding);
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	596 ps.println("1\|one");
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	597 ps.println("2\|tw??");
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	598 ps.println("3\|three");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	599 ps.close();
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	600 conn.setUploadHandler(new FileTransferHandler(d, handlerEncoding));
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	601 update("COPY INTO foo FROM 'data.txt' ON CLIENT");
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	602 assertQueryInt("SELECT SUM(i) FROM foo", 6);
594 613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	603 final String result = queryString("SELECT t FROM foo WHERE i = 2");
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	604 String two = "tw??";
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	605 //
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	606 String hexTwo = hexdump(two);
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	607 String hexResult = hexdump(result);
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	608 assertEq("query result hexdump", hexTwo, hexResult);
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	609 assertEq("query result", two, result);
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	610 }
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	611
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	612 private void test_FileTransferHandlerUploadRefused() throws IOException, SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	613 initTest("test_FileTransferHandlerUploadRefused");
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	614 prepare();
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	615 Path d = getTmpDir(currentTestName);
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	616 Path f = d.resolve("data.txt");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	617 OutputStream s = Files.newOutputStream(f, CREATE_NEW);
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	618 PrintStream ps = new PrintStream(s, false, "UTF-8");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	619 ps.println("1\|one");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	620 ps.println("2\|two");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	621 ps.println("3\|three");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	622 ps.close();
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	623
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	624 Path d2 = getTmpDir(currentTestName + "2");
578 687034945b3f Pass expected encoding as a constructor parameter to FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 575 diff changeset	625 conn.setUploadHandler(new FileTransferHandler(d2, StandardCharsets.UTF_8));
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	626 String quoted = f.toAbsolutePath().toString().replaceAll("'", "''");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	627 expectError("COPY INTO foo FROM R'"+ quoted + "' ON CLIENT", "not in upload directory");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	628 // connection is still alive
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	629 assertQueryInt("SELECT SUM(i) FROM foo", 0);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	630 exitTest();
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	631 }
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	632
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	633 private void test_FileTransferHandlerDownloadUtf8() throws SQLException, Failure, IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	634 initTest("test_FileTransferHandlerDownloadUtf8");
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	635 testFileTransferHandlerDownload(StandardCharsets.UTF_8, StandardCharsets.UTF_8);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	636 exitTest();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	637 }
13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	638
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	639 private void test_FileTransferHandlerDownloadLatin1() throws SQLException, Failure, IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	640 initTest("test_FileTransferHandlerDownloadLatin1");
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	641 Charset latin1 = Charset.forName("latin1");
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	642 testFileTransferHandlerDownload(latin1, latin1);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	643 exitTest();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	644 }
13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	645
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	646 private void test_FileTransferHandlerDownloadNull() throws SQLException, Failure, IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	647 initTest("test_FileTransferHandlerDownloadNull");
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	648 testFileTransferHandlerDownload(null, Charset.defaultCharset());
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	649 exitTest();
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	650 }
5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	651
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	652 private void testFileTransferHandlerDownload(Charset handlerEncoding, Charset fileEncoding) throws SQLException, Failure, IOException {
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	653 prepare();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	654 update("INSERT INTO foo VALUES (42, 'forty-tw??')");
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	655 Path d = getTmpDir(currentTestName);
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	656 conn.setDownloadHandler(new FileTransferHandler(d, handlerEncoding));
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	657 update("COPY SELECT * FROM foo INTO 'data.txt' ON CLIENT");
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	658 List<String> lines = Files.readAllLines(d.resolve("data.txt"), fileEncoding);
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	659 assertEq("lines written", lines.size(), 1);
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	660 assertEq("line content", lines.get(0), "42\|\"forty-tw??\"");
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	661 // connection is still alive
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	662 assertQueryInt("SELECT SUM(i) FROM foo", 42);
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	663 }
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	664
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	665 private void test_FileTransferHandlerDownloadRefused() throws SQLException, Failure, IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	666 initTest("test_FileTransferHandlerDownloadRefused");
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	667 prepare();
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	668 BugFixLevel level = getLevel();
575 08c9918177b2 Do not check the updated row count, it varies between server versions Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 574 diff changeset	669 update("INSERT INTO foo VALUES (42, 'forty-two')");
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	670 Path d = getTmpDir(currentTestName);
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	671 Path d2 = getTmpDir(currentTestName + "2");
578 687034945b3f Pass expected encoding as a constructor parameter to FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 575 diff changeset	672 conn.setDownloadHandler(new FileTransferHandler(d2, StandardCharsets.UTF_8));
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	673 String quoted = d.resolve("data.txt").toAbsolutePath().toString().replaceAll("'", "''");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	674 expectError("COPY SELECT * FROM foo INTO R'" + quoted + "' ON CLIENT", "not in download directory");
574 3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	675 if (level.compareTo(BugFixLevel.CanRefuseDownload) >= 0) {
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	676 // connection is still alive
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	677 assertQueryInt("SELECT SUM(i) FROM foo", 42);
3370027aeb7f Test more systematically that the connection is still alive after file transfer Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 571 diff changeset	678 }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	679 exitTest();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	680 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	681
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	682
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	683 /* utility methods */
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	684 private void fail(String message) throws Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	685 outBuffer.append("FAILURE: ").append(message).append("\n");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	686 throw new Failure(message);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	687 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	688
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	689 private void checked(String quantity, Object actual) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	690 outBuffer.append(" CHECKED: <").append(quantity).append("> is ").append(actual).append(" as expected").append("\n");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	691 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	692
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	693 private void assertEq(String quantity, Object expected, Object actual) throws Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	694 if (expected.equals(actual)) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	695 checked(quantity, actual);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	696 } else {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	697 fail("Expected <" + quantity + "> to be " + expected + " got " + actual);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	698 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	699 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	700
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	701 private boolean execute(String query) throws SQLException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	702 outBuffer.append("EXECUTE: ").append(query).append("\n");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	703 final boolean result = stmt.execute(query);
592 b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	704 outBuffer.append(" OK");
b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	705 if (!result) {
b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	706 outBuffer.append(", updated ").append(stmt.getUpdateCount()).append(" rows");
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	707 }
592 b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	708 outBuffer.append("\n");
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	709 return result;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	710 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	711
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	712 private void update(String query) throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	713 execute(query);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	714 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	715
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	716 private void expectError(String query, String expectedError) throws SQLException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	717 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	718 execute(query);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	719 } catch (SQLException e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	720 if (e.getMessage().contains(expectedError)) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	721 outBuffer.append(" GOT EXPECTED EXCEPTION: ").append(e.getMessage()).append("\n");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	722 } else {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	723 throw e;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	724 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	725 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	726 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	727
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	728 private void assertQueryInt(String query, int expected) throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	729 if (execute(query) == false) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	730 fail("Query does not return a result set");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	731 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	732 final ResultSet rs = stmt.getResultSet();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	733 final ResultSetMetaData metaData = rs.getMetaData();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	734 assertEq("column count", 1, metaData.getColumnCount());
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	735 if (!rs.next()) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	736 fail("Result set is empty");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	737 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	738 final int result = rs.getInt(1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	739 if (rs.next()) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	740 fail("Result set has more than one row");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	741 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	742 rs.close();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	743 checked("row count", 1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	744 assertEq("query result", expected, result);
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	745 }
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	746
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	747 private void assertQueryString(String query, String expected) throws SQLException, Failure {
592 b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	748 final String result = queryString(query);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	749 assertEq("query result", expected, result);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	750 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	751
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	752 private String queryString(String query) throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	753 if (execute(query) == false) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	754 fail("Query does not return a result set");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	755 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	756 final ResultSet rs = stmt.getResultSet();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	757 final ResultSetMetaData metaData = rs.getMetaData();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	758 assertEq("column count", 1, metaData.getColumnCount());
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	759 if (!rs.next()) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	760 fail("Result set is empty");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	761 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	762 final String result = rs.getString(1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	763 if (rs.next()) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	764 fail("Result set has more than one row");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	765 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	766 rs.close();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	767 checked("row count", 1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	768 return result;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	769 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	770
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	771 private synchronized Path getTmpDir(String name) throws IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	772 if (tmpDir == null) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	773 tmpDir = Files.createTempDirectory("testMonetDB");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	774 Runtime.getRuntime().addShutdownHook(new Thread(() -> {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	775 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	776 Files.walkFileTree(tmpDir, new SimpleFileVisitor<Path>() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	777 @Override
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	778 public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	779 Files.delete(file);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	780 return FileVisitResult.CONTINUE;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	781 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	782
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	783 @Override
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	784 public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	785 Files.delete(dir);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	786 return FileVisitResult.CONTINUE;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	787 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	788 });
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	789 } catch (IOException e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	790 // we do this on a best effort basis
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	791 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	792 }));
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	793 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	794 final Path p = tmpDir.resolve(name);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	795 Files.createDirectory(p);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	796 return p;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	797 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	798
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	799 /**
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	800 * Implementation of an UploadHandler
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	801 */
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	802 static class MyUploadHandler implements UploadHandler {
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	803 private final long rows;
5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	804 private final long errorAt;
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	805 private final String errorMessage;
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	806 private boolean encounteredWriteError = false;
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	807 private boolean cancelled = false;
522 279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	808
279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	809 private int chunkSize = 100; // small number to trigger more bugs
279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	810
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	811 MyUploadHandler(long rows, long errorAt, String errorMessage) {
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	812 this.rows = rows;
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	813 this.errorAt = errorAt;
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	814 this.errorMessage = errorMessage;
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	815 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	816
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	817 MyUploadHandler(long rows) {
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	818 this(rows, -1, null);
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	819 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	820
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	821 MyUploadHandler(String errorMessage) {
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	822 this(0, -1, errorMessage);
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	823 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	824
522 279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	825 public void setChunkSize(int chunkSize) {
279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	826 this.chunkSize = chunkSize;
279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	827 }
279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	828
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	829 @Override
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	830 public void uploadCancelled() {
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	831 cancelled = true;
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	832 }
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	833
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	834 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	835 public void handleUpload(MonetConnection.Upload handle, String name, boolean textMode, long linesToSkip) throws IOException {
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	836 if (errorAt == -1 && errorMessage != null) {
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	837 handle.sendError(errorMessage);
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	838 return;
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	839 }
522 279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	840 handle.setChunkSize(chunkSize);
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	841 PrintStream stream = handle.getStream();
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	842 for (long i = linesToSkip; i < rows; i++) {
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	843 if (i == errorAt) {
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	844 throw new IOException(errorMessage);
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	845 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	846 stream.printf("%d\|%d%n", i + 1, i + 1);
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	847 if (i % 25 == 0 && stream.checkError()) {
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	848 encounteredWriteError = true;
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	849 break;
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	850 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	851 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	852 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	853
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	854 public Object encounteredWriteError() {
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	855 return encounteredWriteError;
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 531 diff changeset	856 }
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	857
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	858 public boolean isCancelled() {
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	859 return cancelled;
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	860 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	861 }
520 b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	862
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	863 /**
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	864 * Implementation of a DownloadHandler
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	865 */
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	866 static class MyDownloadHandler implements DownloadHandler {
520 b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	867 private final int errorAtByte;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	868 private final String errorMessage;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	869 private int attempts = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	870 private int bytesSeen = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	871 private int lineEndingsSeen = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	872 private int startOfLine = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	873
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	874 MyDownloadHandler(int errorAtByte, String errorMessage) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	875 this.errorAtByte = errorAtByte;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	876 this.errorMessage = errorMessage;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	877 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	878
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	879 MyDownloadHandler(String errorMessage) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	880 this(-1, errorMessage);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	881 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	882
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	883 MyDownloadHandler() {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	884 this(-1, null);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	885 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	886
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	887 @Override
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	888 public void handleDownload(MonetConnection.Download handle, String name, boolean textMode) throws IOException {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	889 attempts++;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	890 bytesSeen = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	891 lineEndingsSeen = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	892 startOfLine = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	893
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	894 if (errorMessage != null && errorAtByte < 0) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	895 handle.sendError(errorMessage);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	896 return;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	897 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	898
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	899 InputStream stream = handle.getStream();
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	900 byte[] buffer = new byte[1024];
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	901 while (true) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	902 int toRead = buffer.length;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	903 if (errorMessage != null && errorAtByte >= 0) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	904 if (bytesSeen == errorAtByte) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	905 throw new IOException(errorMessage);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	906 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	907 toRead = Integer.min(toRead, errorAtByte - bytesSeen);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	908 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	909 int nread = stream.read(buffer, 0, toRead);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	910 if (nread < 0)
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	911 break;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	912 for (int i = 0; i < nread; i++) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	913 if (buffer[i] == '\n') {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	914 lineEndingsSeen += 1;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	915 startOfLine = bytesSeen + i + 1;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	916 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	917 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	918 bytesSeen += nread;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	919 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	920 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	921
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	922 public int countAttempts() {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	923 return attempts;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	924 }
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	925
520 b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	926 public int lineCount() {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	927 int lines = lineEndingsSeen;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	928 if (startOfLine != bytesSeen)
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	929 lines++;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	930 return lines;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	931 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	932 }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	933
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	934 static class Failure extends Exception {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	935 static final long serialVersionUID = 3387516993124229948L;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	936
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	937 public Failure(String message) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	938 super(message);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	939 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	940
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	941 public Failure(String message, Throwable cause) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	942 super(message, cause);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	943 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	944 }
526 6060ca8c5c1a Add test for uploadFrom methods Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 525 diff changeset	945 }

Mercurial > hg > monetdb-java

annotate tests/OnClientTester.java @ 594:613f94a13ad6