monetdb-java: tests/OnClientTester.java annotate

annotate tests/OnClientTester.java @ 615:34a15cd8cfc2

Fix doc link

author	Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date	Wed, 19 Jan 2022 12:45:05 +0100 (2022-01-19)
parents	2eb21a7167f9
children	65641a7cea31

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 *
610 6aa38e8c0f2d Updated Copyright year. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 607 diff changeset	6 * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V.
542 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;
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	29 import java.util.ArrayList;
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	30 import java.util.List;
604 8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	31 import java.util.zip.GZIPOutputStream;
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	32
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	33 import static java.nio.file.StandardOpenOption.CREATE_NEW;
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	34
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	35
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	36 /**
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	37 * 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	38 * COPY ... INTO ... ON CLIENT
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	39 * commands.
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	40 * 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	41 * 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	42 *
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	43 * 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	44 * see {@link org.monetdb.jdbc.MonetConnection#setUploadHandler(UploadHandler)}
615 34a15cd8cfc2 Fix doc link Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 614 diff changeset	45 * see {@link org.monetdb.jdbc.MonetConnection#setDownloadHandler(DownloadHandler)}
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	46 * 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	47 *
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	48 * 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	49 * {@link org.monetdb.util.FileTransferHandler}
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	50 *
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	51 * @author JvR
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	52 * @version 0.1
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	53 */
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	54 public final class OnClientTester {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	55 public static final int VERBOSITY_NONE = 0;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	56 public static final int VERBOSITY_ON = 1;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	57 public static final int VERBOSITY_SHOW_ALL = 2;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	58
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	59 private final String jdbcUrl;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	60 private final int verbosity;
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	61 private final ArrayList<String> selectedTests;
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	62 private String currentTestName;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	63 private long startTime;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	64 private MonetConnection conn;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	65 private Statement stmt;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	66 private StringBuilder outBuffer;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	67 private Path tmpDir;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	68
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	69 public OnClientTester(String jdbcUrl, int verbosity) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	70 this.jdbcUrl = jdbcUrl;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	71 this.verbosity = verbosity;
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	72 this.selectedTests = null;
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	73 }
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	74
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	75 public OnClientTester(String jdbcUrl, int verbosity, ArrayList<String> selectedTests) {
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	76 this.jdbcUrl = jdbcUrl;
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	77 this.verbosity = verbosity;
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	78 this.selectedTests = selectedTests;
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	79 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	80
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	81 public static void main(String[] args) {
524 71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	82 String jdbcUrl = null;
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	83 int verbosity = 0;
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	84 ArrayList<String> selectedTests = new ArrayList<>();
545 79393647d7fb Call Class.forName("...MonetDriver") from main() in OnClientTester Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 544 diff changeset	85
525 70ff796c42f7 Run subset of tests based on prefix Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 524 diff changeset	86 for (String arg : args) {
524 71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	87 if (arg.equals("-v"))
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	88 verbosity++;
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	89 else if (arg.equals("-vv"))
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	90 verbosity += 2;
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	91 else if (jdbcUrl == null)
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	92 jdbcUrl = arg;
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	93 else if (arg.startsWith("-")){
524 71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	94 System.err.println("Unexpected argument " + arg);
71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	95 System.exit(2);
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	96 } else {
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	97 selectedTests.add(arg);
524 71644dc873fe Manage verbosity Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 523 diff changeset	98 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	99 }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	100 if (jdbcUrl == null \|\| jdbcUrl.isEmpty()) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	101 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	102 System.exit(1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	103 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	104
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	105 OnClientTester tester = new OnClientTester(jdbcUrl, verbosity, selectedTests);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	106 int failures = tester.runTests();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	107 if (failures > 0)
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	108 System.exit(-1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	109 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	110
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	111 boolean isSelected(String name) {
602 662e8de9b002 Fix selection criterium Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 601 diff changeset	112 return selectedTests == null \|\| selectedTests.isEmpty() \|\| selectedTests.contains(name);
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	113 }
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	114
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	115 public int runTests() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	116 if (! openConnection())
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	117 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	118
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	119 outBuffer = new StringBuilder(1024);
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	120
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	121 int failures = 0;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	122 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	123 // all test methods start with test_ and have no arguments
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	124 if (isSelected("BugFixLevel"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	125 test_BugFixLevel();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	126 if (isSelected("Upload"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	127 test_Upload();
613 9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	128 if (isSelected("UploadCrLf"))
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	129 test_UploadCrLf();
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	130 if (isSelected("NormalizeCrLf"))
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	131 test_NormalizeCrLf();
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	132 if (isSelected("ClientRefusesUpload"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	133 test_ClientRefusesUpload();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	134 if (isSelected("Offset0"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	135 test_Offset0();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	136 if (isSelected("Offset1"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	137 test_Offset1();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	138 if (isSelected("Offset5"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	139 test_Offset5();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	140 if (isSelected("ServerStopsReading"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	141 test_ServerStopsReading();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	142 if (isSelected("Download"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	143 test_Download();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	144 if (isSelected("ClientRefusesDownload"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	145 test_ClientRefusesDownload();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	146 if (isSelected("LargeUpload"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	147 test_LargeUpload();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	148 if (isSelected("LargeDownload"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	149 test_LargeDownload();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	150 if (isSelected("UploadFromStream"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	151 test_UploadFromStream();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	152 if (isSelected("UploadFromReader"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	153 test_UploadFromReader();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	154 if (isSelected("UploadFromReaderOffset"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	155 test_UploadFromReaderOffset();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	156 if (isSelected("FailUploadLate"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	157 test_FailUploadLate();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	158 if (isSelected("FailUploadLate2"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	159 test_FailUploadLate2();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	160 if (isSelected("FailDownloadLate"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	161 test_FailDownloadLate();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	162 if (isSelected("FileTransferHandlerUploadUtf8"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	163 test_FileTransferHandlerUploadUtf8();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	164 if (isSelected("FileTransferHandlerUploadLatin1"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	165 test_FileTransferHandlerUploadLatin1();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	166 if (isSelected("FileTransferHandlerUploadNull"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	167 test_FileTransferHandlerUploadNull();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	168 if (isSelected("FileTransferHandlerUploadRefused"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	169 test_FileTransferHandlerUploadRefused();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	170 if (isSelected("FileTransferHandlerDownloadUtf8"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	171 test_FileTransferHandlerDownloadUtf8();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	172 if (isSelected("FileTransferHandlerDownloadLatin1"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	173 test_FileTransferHandlerDownloadLatin1();
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	174 if (isSelected("FileTransferHandlerDownloadNull"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	175 test_FileTransferHandlerDownloadNull();
604 8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	176 if (isSelected("test_FileTransferHandlerUploadNotCompressed"))
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	177 test_FileTransferHandlerUploadNotCompressed();
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	178 if (isSelected("test_FileTransferHandlerUploadNotCompressedSkip"))
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	179 test_FileTransferHandlerUploadNotCompressedSkip();
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	180 if (isSelected("test_FileTransferHandlerUploadCompressed"))
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	181 test_FileTransferHandlerUploadCompressed();
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	182 if (isSelected("test_FileTransferHandlerUploadCompressedSkip"))
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	183 test_FileTransferHandlerUploadCompressedSkip();
601 2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	184 if (isSelected("FileTransferHandlerDownloadRefused"))
2b5516ed0d92 Allow to select specific OnClient tests from command line Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 600 diff changeset	185 test_FileTransferHandlerDownloadRefused();
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	186 } catch (Failure e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	187 failures++;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	188 System.err.println();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	189 System.err.println("Test " + currentTestName + " failed");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	190 dumpOutput();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	191 } catch (Exception e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	192 failures++;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	193 System.err.println();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	194 System.err.println("Test " + currentTestName + " failed:");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	195 e.printStackTrace(System.err);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	196 dumpOutput();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	197 // 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	198 Throwable t = e;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	199 while (t.getCause() != null) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	200 t = t.getCause();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	201 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	202 System.err.println("Innermost cause was " + t);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	203 if (t.getStackTrace().length > 0) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	204 System.err.println(" at " + t.getStackTrace()[0]);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	205 }
592 b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	206 } finally {
b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	207 try {
b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	208 // 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	209 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	210 } catch (SQLException e) { /* ignore */ }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	211 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	212 closeConnection();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	213 return failures;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	214 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	215
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	216 private boolean openConnection() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	217 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	218 // 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	219 final Connection genericConnection = DriverManager.getConnection(jdbcUrl);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	220 conn = genericConnection.unwrap(MonetConnection.class);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	221 stmt = conn.createStatement();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	222 return true;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	223 } catch (SQLException e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	224 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	225 System.err.println(e);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	226 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	227 return false;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	228 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	229
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	230 private void closeConnection() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	231 if (stmt != null) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	232 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	233 stmt.close();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	234 } catch (SQLException e) { /* ignore */ }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	235 stmt = null;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	236 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	237 if (conn != null) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	238 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	239 conn.close();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	240 } catch (Exception e) { /* ignore */ }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	241 conn = null;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	242 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	243 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	244
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	245 private void initTest(final String name) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	246 currentTestName = name;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	247 outBuffer.setLength(0); // clear the output log buffer
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	248 startTime = System.currentTimeMillis();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	249 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	250
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	251 private void exitTest() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	252 if (verbosity > VERBOSITY_ON)
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	253 System.err.println();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	254 if (verbosity >= VERBOSITY_ON) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	255 final long duration = System.currentTimeMillis() - startTime;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	256 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	257 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	258 if (verbosity >= VERBOSITY_SHOW_ALL)
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	259 dumpOutput();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	260
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	261 if (conn.isClosed())
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	262 openConnection(); // restore connection for next test
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	263 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	264
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	265 private void dumpOutput() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	266 final String output = outBuffer.toString();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	267 if (output.isEmpty()) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	268 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	269 } else {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	270 System.err.println("------ Accumulated output for test " + currentTestName + ":");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	271 System.err.println(output);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	272 System.err.println("------ End of accumulated output");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	273 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	274 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	275
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	276 /// 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	277 /// 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	278 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	279 /// 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	280 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	281
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 /// 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	283 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	284
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	285 ;
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
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 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	288 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	289 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	290
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	291 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	292 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	293 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	294 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	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
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 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	298 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	299 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	300 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	301 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	302 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	303 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	304 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	305 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	306 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	307 }
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
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 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	310 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	311 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	312 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	313 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	314 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	315
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 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	317 }
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	318
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 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	320 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	321 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	322 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	323 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	324 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	325 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	326 }
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	327 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	328 }
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	329 }
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	330
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	331 private void prepare() throws SQLException {
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	332 execute("DROP TABLE IF EXISTS foo");
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	333 execute("CREATE TABLE foo (i INT, t CLOB)");
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	334 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	335
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	336 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	337 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	338 BugFixLevel level = BugFixLevel.forVersion(version);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	339 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	340 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	341 }
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	342
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	343 private void test_BugFixLevel() throws Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	344 initTest("test_BugFixLevel");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	345
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	346 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	347 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	348 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	349
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 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	351
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	352 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	353 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	354
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	355 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	356 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	357
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	358 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	359 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	360
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	361 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	362 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	363 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	364 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	365 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	366 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	367 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	368
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	369 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	370 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	371
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	372 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	373 }
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
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	375 private void test_Upload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	376 initTest("test_Upload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	377 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	378 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	379 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	380 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	381 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	382 assertQueryInt("SELECT COUNT(*) FROM foo", 100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	383 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	384 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	385
613 9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	386 private void test_UploadCrLf() throws SQLException, Failure {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	387 initTest("test_UploadCrLf");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	388 prepare();
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	389 MonetConnection.UploadHandler handler = new MonetConnection.UploadHandler() {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	390 @Override
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	391 public void handleUpload(MonetConnection.Upload handle, String name, boolean textMode, long linesToSkip) throws IOException {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	392 String contentText = "100\|foo\r\n10\|bar\r\n1\|baz\r\n";
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	393 byte[] contentBytes = contentText.getBytes(StandardCharsets.UTF_8);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	394 ByteArrayInputStream contentStream = new ByteArrayInputStream(contentBytes);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	395 handle.uploadFrom(contentStream);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	396 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	397 };
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	398 conn.setUploadHandler(handler);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	399 update("COPY INTO foo FROM 'banana' ON CLIENT");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	400 assertQueryInt("SELECT SUM(i * LENGTH(t)) FROM foo", 333);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	401 exitTest();
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	402 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	403
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	404 private void test_NormalizeCrLf() throws Failure, IOException {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	405 initTest("test_NormalizeCrLf");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	406 String[] fragments = {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	407 /* does not end in pending cr */ "\r\naaa\n\n\r\n",
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	408 /* ends in pending cr */ "\n\r\naaa\r",
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	409 /* clears it */ "\n",
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	410 /* means call the single-argument write(), cr now pending */ "13",
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	411 /* again, should flush the pending one and remain pending */ "13",
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	412 /* now the pending cr should be dropped */ "10",
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	413 /* same as above, but with arrays */ "\r", "\r", "\n",
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	414 /* empty write should not clear the pending */ "\r", "", "\n",
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	415 /* trailing \r */ "\r",
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	416 };
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	417
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	418 ByteArrayOutputStream out0 = new ByteArrayOutputStream();
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	419 MonetConnection.StripCrLfStream out = new MonetConnection.StripCrLfStream(out0);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	420 ByteArrayOutputStream ref = new ByteArrayOutputStream();
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	421 ArrayList<Integer> fragmentPositions = new ArrayList();
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	422 ArrayList<Boolean> wasPending = new ArrayList();
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	423 for (String f : fragments) {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	424 int pos = out0.toByteArray().length;
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	425 boolean pending = out.pending();
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	426 fragmentPositions.add(pos);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	427 wasPending.add(pending);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	428 if (!f.isEmpty() && Character.isDigit(f.charAt(0))) {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	429 int n = Integer.parseInt(f);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	430 ref.write(n);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	431 out.write(n);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	432 } else {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	433 byte[] bytes = f.getBytes(StandardCharsets.UTF_8);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	434 ref.write(bytes);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	435 out.write(bytes);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	436 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	437 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	438 out.close();
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	439
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	440 String data = new String(out0.toByteArray());
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	441 String refData = new String(ref.toByteArray()).replaceAll("\r\n", "\n");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	442
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	443 outBuffer.append("GOT\t\tEXPECTED\n");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	444 int fragNo = 0;
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	445 boolean different = false;
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	446 for (int i = 0; i < data.length() \|\| i < refData.length(); i++) {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	447 while (fragNo < fragmentPositions.size() && i == fragmentPositions.get(fragNo)) {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	448 outBuffer.append("(Start of fragment ");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	449 outBuffer.append(fragNo);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	450 if (wasPending.get(fragNo)) {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	451 outBuffer.append(", cr pending");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	452 } else {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	453 outBuffer.append(", cr not pending");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	454 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	455 outBuffer.append(':');
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	456 String frag = fragments[fragNo];
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	457 if (!frag.isEmpty() && Character.isDigit(frag.charAt(0))) {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	458 outBuffer.append(Integer.parseInt(frag));
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	459 } else {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	460 for (int k = 0; k < frag.length(); k++) {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	461 int c = frag.charAt(k);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	462 outBuffer.append(' ');
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	463 outBuffer.append(c);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	464 if (c == '\n' && k != frag.length() - 1)
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	465 outBuffer.append(" ");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	466 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	467 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	468 outBuffer.append(")\n");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	469 fragNo++;
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	470 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	471 int left = i < data.length() ? data.charAt(i) : 0;
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	472 int right = i < refData.length() ? refData.charAt(i) : 0;
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	473 outBuffer.append(left);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	474 outBuffer.append("\t\t");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	475 outBuffer.append(right);
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	476 if (!different && left != right) {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	477 outBuffer.append("\t\t <---------------------- first difference found!");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	478 different = true;
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	479 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	480 outBuffer.append('\n');
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	481 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	482
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	483 if (different) {
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	484 fail("Normalized text is different than expected");
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	485 }
614 2eb21a7167f9 Add missing call to exitTest Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 613 diff changeset	486 exitTest();
613 9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	487 }
9397c0b487f8 Normalize CRLF on upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	488
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	489 private void test_ClientRefusesUpload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	490 initTest("test_ClientRefusesUpload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	491 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	492 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	493 conn.setUploadHandler(handler);
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	494 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	495 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	496 assertQueryInt("SELECT COUNT(*) FROM foo", 0);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	497 exitTest();
531 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
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	500 private void test_Offset0() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	501 initTest("test_Offset0");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	502 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	503 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	504 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	505 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	506 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	507 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	508 assertQueryInt("SELECT MAX(i) FROM foo", 100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	509 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	510 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	511
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	512 private void test_Offset1() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	513 initTest("test_Offset1");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	514 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	515 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	516 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	517 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	518 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	519 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	520 assertQueryInt("SELECT MAX(i) FROM foo", 100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	521 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	522 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	523
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	524 private void test_Offset5() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	525 initTest("test_Offset5");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	526 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	527 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	528 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	529 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	530 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	531 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	532 assertQueryInt("SELECT MAX(i) FROM foo", 100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	533 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	534 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	535
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	536 private void test_ServerStopsReading() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	537 initTest("test_ServerStopsReading");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	538 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	539 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	540 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	541 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	542 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	543 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	544 // 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	545 assertQueryInt("SELECT COUNT(i) FROM foo", 10);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	546 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	547 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	548
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	549 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	550 prepare();
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	551 MyDownloadHandler handler = new MyDownloadHandler();
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	552 conn.setDownloadHandler(handler);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	553 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	554 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	555 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	556 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	557 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	558 // 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	559 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	560 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	561
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	562 private void test_Download() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	563 initTest("test_Download");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	564 test_Download(100);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	565 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	566 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	567
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	568 private void test_ClientRefusesDownload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	569 initTest("test_ClientRefusesDownload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	570 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	571 BugFixLevel level = getLevel();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	572 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	573 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	574 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	575 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	576 // 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	577 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	578 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	579 // 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	580 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	581 }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	582 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	583 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	584
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	585 private void test_LargeUpload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	586 initTest("test_LargeUpload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	587 prepare();
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	588 int n = 4_000_000;
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	589 MyUploadHandler handler = new MyUploadHandler(n);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	590 conn.setUploadHandler(handler);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	591 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	592 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	593 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	594 // 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	595 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	596 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	597 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	598
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	599 private void test_LargeDownload() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	600 initTest("test_LargeDownload");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	601 test_Download(4_000_000);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	602 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	603 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	604
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	605 private void test_UploadFromStream() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	606 initTest("test_UploadFromStream");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	607 prepare();
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	608 UploadHandler handler = new UploadHandler() {
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	609 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	610
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	611 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	612 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	613 // 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	614 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	615 handle.uploadFrom(s);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	616 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	617 };
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	618 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	619 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	620 // 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	621 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	622 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	623 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	624
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	625 private void test_UploadFromReader() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	626 initTest("test_UploadFromReader");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	627 prepare();
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	628 UploadHandler handler = new UploadHandler() {
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	629 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	630
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	631 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	632 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	633 // 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	634 StringReader r = new StringReader(data);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	635 handle.uploadFrom(r);
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	636 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	637 };
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	638 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	639 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	640 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	641 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	642 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	643
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	644 private void test_UploadFromReaderOffset() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	645 initTest("test_UploadFromReaderOffset");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	646 prepare();
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	647 UploadHandler handler = new UploadHandler() {
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	648 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	649
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	650 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	651 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	652 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	653 handle.uploadFrom(r, linesToSkip);
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	654 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	655 };
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	656 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	657 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	658 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	659 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	660 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	661
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	662 private void test_FailUploadLate() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	663 initTest("test_FailUploadLate");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	664 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	665 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	666 conn.setUploadHandler(handler);
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	667 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	668 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	669 assertEq("connection is closed", true, conn.isClosed());
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	670 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	671 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	672
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	673 private void test_FailUploadLate2() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	674 initTest("test_FailUploadLate2");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	675 // 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	676 // 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	677 prepare();
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	678 UploadHandler handler = new UploadHandler() {
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	679 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	680 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	681 // 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	682 PrintStream stream = handle.getStream();
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	683 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	684 stream.println();
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	685 stream.flush();
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	686 throw new IOException("exception after all");
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	687 }
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	688 };
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	689 conn.setUploadHandler(handler);
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	690 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	691 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	692 // 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	693 exitTest();
544 c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	694 }
c71ce17fa724 Add another error handling test Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 542 diff changeset	695
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	696 private void test_FailDownloadLate() throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	697 initTest("test_FailDownloadLate");
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	698 prepare();
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	699 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	700 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	701 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	702 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	703 // 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	704 assertEq("connection is closed", conn.isClosed(), true);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	705 exitTest();
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	706 }
53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	707
604 8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	708 private void test_FileTransferHandlerUploadNotCompressed() throws IOException, SQLException, Failure {
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	709 initTest("FileTransferHandlerUploadNotCompressed");
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	710 testFileTransferHandlerUploadCompressed(StandardCharsets.UTF_8, false, 0);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	711 exitTest();
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	712 }
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	713
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	714 private void test_FileTransferHandlerUploadNotCompressedSkip() throws IOException, SQLException, Failure {
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	715 initTest("FileTransferHandlerUploadNotCompressedSkip");
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	716 testFileTransferHandlerUploadCompressed(StandardCharsets.UTF_8, false, 2);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	717 exitTest();
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	718 }
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	719
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	720 private void test_FileTransferHandlerUploadCompressed() throws IOException, SQLException, Failure {
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	721 initTest("FileTransferHandlerUploadCompressed");
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	722 testFileTransferHandlerUploadCompressed(StandardCharsets.UTF_8, true, 0);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	723 exitTest();
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	724 }
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	725
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	726 private void test_FileTransferHandlerUploadCompressedSkip() throws IOException, SQLException, Failure {
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	727 initTest("FileTransferHandlerUploadCompressedSkip");
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	728 testFileTransferHandlerUploadCompressed(StandardCharsets.UTF_8, true, 2);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	729 exitTest();
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	730 }
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	731
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	732 private void test_FileTransferHandlerUploadUtf8() throws IOException, SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	733 initTest("test_FileTransferHandlerUploadUtf8");
604 8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	734 testFileTransferHandlerUploadEncoding(StandardCharsets.UTF_8, "UTF-8");
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	735 exitTest();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	736 }
13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	737
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	738 private void test_FileTransferHandlerUploadLatin1() throws IOException, SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	739 initTest("test_FileTransferHandlerUploadLatin1");
604 8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	740 testFileTransferHandlerUploadEncoding(Charset.forName("latin1"), "latin1");
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	741 exitTest();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	742 }
13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	743
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	744 private void test_FileTransferHandlerUploadNull() throws IOException, SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	745 initTest("test_FileTransferHandlerUploadNull");
604 8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	746 testFileTransferHandlerUploadEncoding(null, Charset.defaultCharset().name());
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	747 exitTest();
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	748 }
5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	749
594 613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	750 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	751 {
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	752 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	753 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	754 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	755 buf.append(' ');
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	756 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	757
600 c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	758 // UnicodeBlock b = UnicodeBlock.of(c);
c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	759 // if (!Character.isISOControl(c) && b != null) {
c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	760 // if (b != UnicodeBlock.HIGH_SURROGATES && b != UnicodeBlock.LOW_SURROGATES && b != UnicodeBlock.SPECIALS) {
c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	761 // buf.append("='");
c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	762 // buf.append(c);
c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	763 // buf.append("'");
c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	764 // }
c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	765 // }
594 613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	766 }
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	767
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	768 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	769 }
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	770
604 8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	771 private void testFileTransferHandlerUploadEncoding(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	772 prepare();
600 c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	773 outBuffer.append("Default encoding is " + Charset.defaultCharset().displayName() + "\n");
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	774 Path d = getTmpDir(currentTestName);
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	775 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	776 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	777 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	778 ps.println("1\|one");
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	779 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	780 ps.println("3\|three");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	781 ps.close();
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	782 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	783 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	784 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	785 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	786 String two = "tw??";
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	787 //
613f94a13ad6 Show hexdumps in the File Transfer encoding tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 592 diff changeset	788 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	789 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	790 assertEq("query result hexdump", hexTwo, hexResult);
600 c2581dbd1dbf Change test output to make it more informative on Windows Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 594 diff changeset	791 // 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	792 }
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	793
604 8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	794 private void testFileTransferHandlerUploadCompressed(Charset encoding, boolean compressed, int skipLines) throws IOException, SQLException, Failure {
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	795 prepare();
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	796 Path d = getTmpDir(currentTestName);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	797 String fileName = "data.txt";
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	798 if (compressed)
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	799 fileName += ".gz";
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	800 Path f = d.resolve(fileName);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	801 OutputStream s = Files.newOutputStream(f, CREATE_NEW);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	802 if (compressed) {
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	803 s = new GZIPOutputStream(s);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	804 }
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	805 Writer w = new OutputStreamWriter(s, encoding);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	806 PrintWriter ps = new PrintWriter(w);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	807 String[] words = { "one", "tw??", "three" };
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	808 int i = 0;
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	809 int expectedSum = 0;
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	810 for (String word: words) {
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	811 int n = i + 1;
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	812 ps.println("" + n + "\|" + word);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	813 if (i >= skipLines) {
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	814 expectedSum += n;
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	815 }
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	816 i += 1;
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	817 }
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	818 ps.close();
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	819 conn.setUploadHandler(new FileTransferHandler(d, encoding));
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	820 String query = "COPY OFFSET " + (skipLines + 1) + " INTO foo FROM '" + fileName + "' ON CLIENT";
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	821 update(query);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	822 assertQueryInt("SELECT SUM(i) FROM foo", expectedSum);
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	823 }
8e5dbe2ebe7d Test uploading compressed files in FileTransferHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 602 diff changeset	824
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	825 private void test_FileTransferHandlerUploadRefused() throws IOException, SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	826 initTest("test_FileTransferHandlerUploadRefused");
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	827 prepare();
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	828 Path d = getTmpDir(currentTestName);
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	829 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	830 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	831 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	832 ps.println("1\|one");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	833 ps.println("2\|two");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	834 ps.println("3\|three");
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	835 ps.close();
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	836
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	837 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	838 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	839 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	840 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	841 // 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	842 assertQueryInt("SELECT SUM(i) FROM foo", 0);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	843 exitTest();
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	844 }
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	845
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	846 private void test_FileTransferHandlerDownloadUtf8() throws SQLException, Failure, IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	847 initTest("test_FileTransferHandlerDownloadUtf8");
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	848 testFileTransferHandlerDownload(StandardCharsets.UTF_8, StandardCharsets.UTF_8);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	849 exitTest();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	850 }
13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	851
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	852 private void test_FileTransferHandlerDownloadLatin1() throws SQLException, Failure, IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	853 initTest("test_FileTransferHandlerDownloadLatin1");
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	854 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	855 testFileTransferHandlerDownload(latin1, latin1);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	856 exitTest();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	857 }
13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	858
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	859 private void test_FileTransferHandlerDownloadNull() throws SQLException, Failure, IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	860 initTest("test_FileTransferHandlerDownloadNull");
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	861 testFileTransferHandlerDownload(null, Charset.defaultCharset());
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	862 exitTest();
581 5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	863 }
5aef0ea654b1 Take null to mean the default charset Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 580 diff changeset	864
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	865 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	866 prepare();
580 13134a44dfc8 Test FileTransferHandler with multiple encodings Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 578 diff changeset	867 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	868 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	869 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	870 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	871 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	872 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	873 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	874 // 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	875 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	876 }
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	877
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	878 private void test_FileTransferHandlerDownloadRefused() throws SQLException, Failure, IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	879 initTest("test_FileTransferHandlerDownloadRefused");
571 8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	880 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	881 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	882 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	883 Path d = getTmpDir(currentTestName);
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	884 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	885 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	886 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	887 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	888 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	889 // 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	890 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	891 }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	892 exitTest();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	893 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	894
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	895
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	896 /* utility methods */
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	897 private void fail(String message) throws Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	898 outBuffer.append("FAILURE: ").append(message).append("\n");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	899 throw new Failure(message);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	900 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	901
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	902 private void checked(String quantity, Object actual) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	903 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	904 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	905
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	906 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	907 if (expected.equals(actual)) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	908 checked(quantity, actual);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	909 } else {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	910 fail("Expected <" + quantity + "> to be " + expected + " got " + actual);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	911 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	912 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	913
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	914 private boolean execute(String query) throws SQLException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	915 outBuffer.append("EXECUTE: ").append(query).append("\n");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	916 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	917 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	918 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	919 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	920 }
592 b58f6f26fab0 Add removal of used table foo. Also eliminated duplicate code. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 591 diff changeset	921 outBuffer.append("\n");
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	922 return result;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	923 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	924
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	925 private void update(String query) throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	926 execute(query);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	927 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	928
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	929 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	930 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	931 execute(query);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	932 } catch (SQLException e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	933 if (e.getMessage().contains(expectedError)) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	934 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	935 } else {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	936 throw e;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	937 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	938 }
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 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	942 if (execute(query) == false) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	943 fail("Query does not return a result set");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	944 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	945 final ResultSet rs = stmt.getResultSet();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	946 final ResultSetMetaData metaData = rs.getMetaData();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	947 assertEq("column count", 1, metaData.getColumnCount());
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	948 if (!rs.next()) {
607 69b0bcf5f62d On failure do not forget to close the resultset resource first. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 604 diff changeset	949 rs.close();
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	950 fail("Result set is empty");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	951 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	952 final int result = rs.getInt(1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	953 if (rs.next()) {
607 69b0bcf5f62d On failure do not forget to close the resultset resource first. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 604 diff changeset	954 rs.close();
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	955 fail("Result set has more than one row");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	956 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	957 rs.close();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	958 checked("row count", 1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	959 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	960 }
8a4e6c82815a Fix problems with FileTransferHandler and add tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 557 diff changeset	961
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	962 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	963 final String result = queryString(query);
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	964 assertEq("query result", expected, result);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	965 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	966
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	967 private String queryString(String query) throws SQLException, Failure {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	968 if (execute(query) == false) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	969 fail("Query does not return a result set");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	970 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	971 final ResultSet rs = stmt.getResultSet();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	972 final ResultSetMetaData metaData = rs.getMetaData();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	973 assertEq("column count", 1, metaData.getColumnCount());
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	974 if (!rs.next()) {
607 69b0bcf5f62d On failure do not forget to close the resultset resource first. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 604 diff changeset	975 rs.close();
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	976 fail("Result set is empty");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	977 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	978 final String result = rs.getString(1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	979 if (rs.next()) {
607 69b0bcf5f62d On failure do not forget to close the resultset resource first. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 604 diff changeset	980 rs.close();
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	981 fail("Result set has more than one row");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	982 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	983 rs.close();
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	984 checked("row count", 1);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	985 return result;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	986 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	987
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	988 private synchronized Path getTmpDir(String name) throws IOException {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	989 if (tmpDir == null) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	990 tmpDir = Files.createTempDirectory("testMonetDB");
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	991 Runtime.getRuntime().addShutdownHook(new Thread(() -> {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	992 try {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	993 Files.walkFileTree(tmpDir, new SimpleFileVisitor<Path>() {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	994 @Override
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	995 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	996 Files.delete(file);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	997 return FileVisitResult.CONTINUE;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	998 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	999
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1000 @Override
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1001 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	1002 Files.delete(dir);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1003 return FileVisitResult.CONTINUE;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1004 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1005 });
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1006 } catch (IOException e) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1007 // we do this on a best effort basis
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1008 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1009 }));
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1010 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1011 final Path p = tmpDir.resolve(name);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1012 Files.createDirectory(p);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1013 return p;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1014 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1015
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1016 /**
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1017 * Implementation of an UploadHandler
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1018 */
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	1019 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	1020 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	1021 private final long errorAt;
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1022 private final String errorMessage;
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1023 private boolean encounteredWriteError = false;
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1024 private boolean cancelled = false;
522 279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	1025
279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	1026 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	1027
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	1028 MyUploadHandler(long rows, long errorAt, String errorMessage) {
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1029 this.rows = rows;
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1030 this.errorAt = errorAt;
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1031 this.errorMessage = errorMessage;
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1032 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1033
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	1034 MyUploadHandler(long rows) {
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1035 this(rows, -1, null);
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1036 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1037
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1038 MyUploadHandler(String errorMessage) {
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1039 this(0, -1, errorMessage);
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1040 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1041
522 279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	1042 public void setChunkSize(int chunkSize) {
279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	1043 this.chunkSize = chunkSize;
279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	1044 }
279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	1045
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1046 @Override
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1047 public void uploadCancelled() {
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1048 cancelled = true;
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1049 }
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1050
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1051 @Override
551 5ce6a942aff3 Last minute API fix: 'int offset' -> 'long linesToSkip' Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 548 diff changeset	1052 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	1053 if (errorAt == -1 && errorMessage != null) {
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1054 handle.sendError(errorMessage);
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1055 return;
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1056 }
522 279414178dc6 Also test larger up- and downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 520 diff changeset	1057 handle.setChunkSize(chunkSize);
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1058 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	1059 for (long i = linesToSkip; i < rows; i++) {
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1060 if (i == errorAt) {
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1061 throw new IOException(errorMessage);
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1062 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1063 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	1064 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	1065 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	1066 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	1067 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1068 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1069 }
04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1070
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	1071 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	1072 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	1073 }
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1074
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1075 public boolean isCancelled() {
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1076 return cancelled;
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1077 }
519 04a72c5bde80 Add OnclientTester.java Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: diff changeset	1078 }
520 b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1079
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1080 /**
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1081 * Implementation of a DownloadHandler
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1082 */
541 31df6a12fd41 Make the MonetUploadHandler and MonetDownloadHandler interfaces part of MonetConnection Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 534 diff changeset	1083 static class MyDownloadHandler implements DownloadHandler {
520 b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1084 private final int errorAtByte;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1085 private final String errorMessage;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1086 private int attempts = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1087 private int bytesSeen = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1088 private int lineEndingsSeen = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1089 private int startOfLine = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1090
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1091 MyDownloadHandler(int errorAtByte, String errorMessage) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1092 this.errorAtByte = errorAtByte;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1093 this.errorMessage = errorMessage;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1094 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1095
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1096 MyDownloadHandler(String errorMessage) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1097 this(-1, errorMessage);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1098 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1099
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1100 MyDownloadHandler() {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1101 this(-1, null);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1102 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1103
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1104 @Override
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1105 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	1106 attempts++;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1107 bytesSeen = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1108 lineEndingsSeen = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1109 startOfLine = 0;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1110
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1111 if (errorMessage != null && errorAtByte < 0) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1112 handle.sendError(errorMessage);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1113 return;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1114 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1115
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1116 InputStream stream = handle.getStream();
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1117 byte[] buffer = new byte[1024];
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1118 while (true) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1119 int toRead = buffer.length;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1120 if (errorMessage != null && errorAtByte >= 0) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1121 if (bytesSeen == errorAtByte) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1122 throw new IOException(errorMessage);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1123 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1124 toRead = Integer.min(toRead, errorAtByte - bytesSeen);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1125 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1126 int nread = stream.read(buffer, 0, toRead);
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1127 if (nread < 0)
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1128 break;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1129 for (int i = 0; i < nread; i++) {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1130 if (buffer[i] == '\n') {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1131 lineEndingsSeen += 1;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1132 startOfLine = bytesSeen + i + 1;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1133 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1134 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1135 bytesSeen += nread;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1136 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1137 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1138
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1139 public int countAttempts() {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1140 return attempts;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1141 }
531 53dc4349ace9 Extract OnClientTester infrastructure into separate class Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 530 diff changeset	1142
520 b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1143 public int lineCount() {
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1144 int lines = lineEndingsSeen;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1145 if (startOfLine != bytesSeen)
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1146 lines++;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1147 return lines;
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1148 }
b4c7816e3592 Add more tests Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 519 diff changeset	1149 }
591 b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1150
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1151 static class Failure extends Exception {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1152 static final long serialVersionUID = 3387516993124229948L;
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1153
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1154 public Failure(String message) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1155 super(message);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1156 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1157
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1158 public Failure(String message, Throwable cause) {
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1159 super(message, cause);
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1160 }
b2cd3b828967 Simplify OnClientTester program. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 589 diff changeset	1161 }
526 6060ca8c5c1a Add test for uploadFrom methods Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 525 diff changeset	1162 }

Mercurial > hg > monetdb-java

annotate tests/OnClientTester.java @ 615:34a15cd8cfc2